From patchwork Fri Apr 19 22:21:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2467271 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 5003D40148 for ; Fri, 19 Apr 2013 22:22:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934530Ab3DSWWa (ORCPT ); Fri, 19 Apr 2013 18:22:30 -0400 Received: from mail-la0-f52.google.com ([209.85.215.52]:34060 "EHLO mail-la0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934343Ab3DSWW2 (ORCPT ); Fri, 19 Apr 2013 18:22:28 -0400 Received: by mail-la0-f52.google.com with SMTP id fd20so131440lab.11 for ; Fri, 19 Apr 2013 15:22:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:to:subject:cc:from:organization:date:mime-version :content-type:content-transfer-encoding:message-id :x-gm-message-state; bh=lljQiix8T2WYAoJ91j0MfVgCrOhvMwcBfSr4UkG/VJY=; b=ODH5tRTxo6vBMSapAdwFZnWYKTXQZEqPjAAF/swe/wnS5IHubvp+zkRFQKCBEX5Nwx ubbMcbXssJ9rDAF5KJE8HqSprwPFrKxNZwmHM2+bYeE4jetgTkz33TKa/t+Eu9RgDRuB onSuDGJnV1Qzv+Dme1Hg7sR+lTtZGKYOWyR9uhqOYN9VvwuwdreNE+MOUTbXVIxEe3rY w/TkuvLAmNdgCSag/PM2zrpLvEeT9HwRuB5bY5soPr1oDto1konoiN/Q//WcbWn1BYOO kSH24aAESyfBZWxOGIW9AR5IxpEbUnfym86M6ECxgSjCkG7KgrHLAhUeocNbIWoBIPqq kHYg== X-Received: by 10.112.161.97 with SMTP id xr1mr9104088lbb.15.1366410146697; Fri, 19 Apr 2013 15:22:26 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-79-86-130.pppoe.mtu-net.ru. [91.79.86.130]) by mx.google.com with ESMTPS id rn10sm6519506lbb.16.2013.04.19.15.22.24 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 19 Apr 2013 15:22:25 -0700 (PDT) To: horms@verge.net.au, magnus.damm@gmail.com, linux@arm.linux.org.uk, linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/1] ARM: shmobile: r8a7778: add I2C support Cc: vladimir.barinov@cogentembedded.com From: Sergei Shtylyov Organization: Cogent Embedded Date: Sat, 20 Apr 2013 02:21:36 +0400 MIME-Version: 1.0 Message-Id: <201304200221.36928.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQkFvK/SMw0NQjj/yOk/S7W1j6xkKRgkEsm2X2/WkrtUREnLg98Xp0o197cxz3O66aZjYnl2 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Vladimir Barinov Add I2C clocks and platform devices for R8A7778 SoC. Don't forget to also add the peripheral clock which the I2C driver uses. Signed-off-by: Vladimir Barinov [Sergei: changed the registration function to platform_device_register_simple(), regrouped MSTPxxx *enum* members, added the copyright.] Signed-off-by: Sergei Shtylyov Acked-by: Kuninori Morimoto --- Changes since the original posting: - regrouped MSTPxxx *enum* members; - resolved reject in the 'clock-r8a7778.c' file, refreshed the patch; - added an ACK from Kuninori Morimoto. arch/arm/mach-shmobile/clock-r8a7778.c | 14 +++++++++++++- arch/arm/mach-shmobile/setup-r8a7778.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: renesas/arch/arm/mach-shmobile/clock-r8a7778.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/clock-r8a7778.c +++ renesas/arch/arm/mach-shmobile/clock-r8a7778.c @@ -3,6 +3,7 @@ * * Copyright (C) 2013 Renesas Solutions Corp. * Copyright (C) 2013 Kuninori Morimoto + * Copyright (C) 2013 Cogent Embedded, Inc. * * based on r8a7779 * @@ -106,7 +107,8 @@ enum { MSTP323, MSTP322, MSTP321, MSTP114, MSTP100, - MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021, + MSTP030, MSTP029, + MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021, MSTP016, MSTP015, MSTP_NR }; @@ -116,6 +118,10 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP321] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 21, 0), /* SDHI2 */ [MSTP114] = SH_CLK_MSTP32(&p_clk, MSTPCR1, 14, 0), /* Ether */ [MSTP100] = SH_CLK_MSTP32(&p_clk, MSTPCR1, 0, 0), /* USB0/1 */ + [MSTP030] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 30, 0), /* I2C0 */ + [MSTP029] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 29, 0), /* I2C1 */ + [MSTP028] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 28, 0), /* I2C2 */ + [MSTP027] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 27, 0), /* I2C3 */ [MSTP026] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 26, 0), /* SCIF0 */ [MSTP025] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 25, 0), /* SCIF1 */ [MSTP024] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 24, 0), /* SCIF2 */ @@ -127,6 +133,8 @@ static struct clk mstp_clks[MSTP_NR] = { }; static struct clk_lookup lookups[] = { + CLKDEV_CON_ID("peripheral_clk", &p_clk), + /* MSTP32 clocks */ CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP323]), /* SDHI0 */ CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */ @@ -134,6 +142,10 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP114]), /* Ether */ CLKDEV_DEV_ID("ehci-platform", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */ CLKDEV_DEV_ID("ohci-platform", &mstp_clks[MSTP100]), /* USB OHCI port0/1 */ + CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP030]), /* I2C0 */ + CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP029]), /* I2C1 */ + CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP028]), /* I2C2 */ + CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP027]), /* I2C3 */ CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */ CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */ CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */ Index: renesas/arch/arm/mach-shmobile/setup-r8a7778.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/setup-r8a7778.c +++ renesas/arch/arm/mach-shmobile/setup-r8a7778.c @@ -94,6 +94,33 @@ static struct sh_timer_config sh_tmu1_pl &sh_tmu##idx##_platform_data, \ sizeof(sh_tmu##idx##_platform_data)) +/* I2C */ +static struct resource i2c0_resources[] = { + DEFINE_RES_MEM(0xffc70000, 0x1000), + DEFINE_RES_IRQ(gic_iid(0x63)), +}; + +static struct resource i2c1_resources[] = { + DEFINE_RES_MEM(0xffc71000, 0x1000), + DEFINE_RES_IRQ(gic_iid(0x6e)), +}; + +static struct resource i2c2_resources[] = { + DEFINE_RES_MEM(0xffc72000, 0x1000), + DEFINE_RES_IRQ(gic_iid(0x6c)), +}; + +static struct resource i2c3_resources[] = { + DEFINE_RES_MEM(0xffc73000, 0x1000), + DEFINE_RES_IRQ(gic_iid(0x6d)), +}; + +#define r8a7778_register_i2c(idx) \ + platform_device_register_simple( \ + "i2c-rcar", idx, \ + i2c##idx##_resources, \ + ARRAY_SIZE(i2c##idx##_resources)) + /* USB PHY */ static struct resource usb_phy_resources[] = { DEFINE_RES_MEM(0xffe70800, 0x100), @@ -260,6 +287,11 @@ void __init r8a7778_add_standard_devices r8a7778_register_tmu(0); r8a7778_register_tmu(1); + + r8a7778_register_i2c(0); + r8a7778_register_i2c(1); + r8a7778_register_i2c(2); + r8a7778_register_i2c(3); } void __init r8a7778_init_late(void)