From patchwork Wed Apr 17 22:13:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2456761 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 34C02DF2A1 for ; Wed, 17 Apr 2013 22:14:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966850Ab3DQWOG (ORCPT ); Wed, 17 Apr 2013 18:14:06 -0400 Received: from mail-la0-f46.google.com ([209.85.215.46]:39056 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966831Ab3DQWOF (ORCPT ); Wed, 17 Apr 2013 18:14:05 -0400 Received: by mail-la0-f46.google.com with SMTP id ea20so1978337lab.33 for ; Wed, 17 Apr 2013 15:14:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:organization:to:subject:date:user-agent:cc :references:in-reply-to:mime-version:content-type :content-transfer-encoding:message-id:x-gm-message-state; bh=zJHAJvPev/A6M1zhJ3NF0IX4mfpfVnF8CuqEWEqba3k=; b=Z8v6wr/AHqG+qH0JdH3AIvjMQf3C/w5mLG3wbjaKeeE2ZjvcZzODMu9j0+SAeOF7vC PKek52zVvQzVFYJInOQ6RVEKHYAyqliUg2pw+WvUcYq8oXxoGW8FWyOa8KXRWvaCfotq MNYz3wDLBGMJRTpbBKmvJarebeNMs4t6V5hPcNa8Fq82c+/9X1UTF+s4Lv93Cuh2xyEp JqitBrno5rd9dbLXEq7b+gmpothpjfjI43G/fFIucjJ6oDNNBvol3tLe4V6dlAXCLqCz i6KnqOpHjslY75GW8ApvOeE+QFV2KhqgSZYfGMCYafRC5HTXKmJdm51E0k6Yozg4Ovji hf7Q== X-Received: by 10.112.72.129 with SMTP id d1mr4531493lbv.73.1366236843788; Wed, 17 Apr 2013 15:14:03 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-79-88-26.pppoe.mtu-net.ru. [91.79.88.26]) by mx.google.com with ESMTPS id t20sm3291261lbi.5.2013.04.17.15.14.01 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 17 Apr 2013 15:14:02 -0700 (PDT) From: Sergei Shtylyov Organization: Cogent Embedded 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 2/4] ARM: shmobile: r8a7779: add VIN support Date: Thu, 18 Apr 2013 02:13:14 +0400 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.i686.PAE; KDE/4.4.5; i686; ; ) Cc: linux-media@vger.kernel.org, matsu@igel.co.jp References: <201304180206.39465.sergei.shtylyov@cogentembedded.com> In-Reply-To: <201304180206.39465.sergei.shtylyov@cogentembedded.com> MIME-Version: 1.0 Message-Id: <201304180213.15118.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQkbjEEno3ld/b0o1oDqA7+1NXnYEvDlxxwS48PZz7W5g95kirv9866bYX8NalWht7iutPeO Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Vladimir Barinov Add VIN clocks and platform devices for R8A7779 SoC; add function to register the VIN platform devices. Signed-off-by: Vladimir Barinov [Sergei: renamed some variables] Signed-off-by: Sergei Shtylyov --- arch/arm/mach-shmobile/clock-r8a7779.c | 10 +++++++ arch/arm/mach-shmobile/include/mach/r8a7779.h | 3 ++ arch/arm/mach-shmobile/setup-r8a7779.c | 36 ++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-media" 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-r8a7779.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/clock-r8a7779.c +++ renesas/arch/arm/mach-shmobile/clock-r8a7779.c @@ -112,7 +112,9 @@ static struct clk *main_clks[] = { }; enum { MSTP323, MSTP322, MSTP321, MSTP320, + MSTP120, MSTP116, MSTP115, MSTP114, + MSTP110, MSTP109, MSTP108, MSTP103, MSTP101, MSTP100, MSTP030, MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021, @@ -125,9 +127,13 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP322] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 22, 0), /* SDHI1 */ [MSTP321] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 21, 0), /* SDHI2 */ [MSTP320] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 20, 0), /* SDHI3 */ + [MSTP120] = SH_CLK_MSTP32(&clks_clk, MSTPCR1, 20, 0), /* VIN3 */ [MSTP116] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 16, 0), /* PCIe */ [MSTP115] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 15, 0), /* SATA */ [MSTP114] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 14, 0), /* Ether */ + [MSTP110] = SH_CLK_MSTP32(&clks_clk, MSTPCR1, 10, 0), /* VIN0 */ + [MSTP109] = SH_CLK_MSTP32(&clks_clk, MSTPCR1, 9, 0), /* VIN1 */ + [MSTP108] = SH_CLK_MSTP32(&clks_clk, MSTPCR1, 8, 0), /* VIN2 */ [MSTP103] = SH_CLK_MSTP32(&clks_clk, MSTPCR1, 3, 0), /* DU */ [MSTP101] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 1, 0), /* USB2 */ [MSTP100] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 0, 0), /* USB0/1 */ @@ -162,10 +168,14 @@ static struct clk_lookup lookups[] = { CLKDEV_CON_ID("peripheral_clk", &clkp_clk), /* MSTP32 clocks */ + CLKDEV_DEV_ID("rcar_vin.3", &mstp_clks[MSTP120]), /* VIN3 */ CLKDEV_DEV_ID("rcar-pcie", &mstp_clks[MSTP116]), /* PCIe */ CLKDEV_DEV_ID("sata_rcar", &mstp_clks[MSTP115]), /* SATA */ CLKDEV_DEV_ID("fc600000.sata", &mstp_clks[MSTP115]), /* SATA w/DT */ CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP114]), /* Ether */ + CLKDEV_DEV_ID("rcar_vin.0", &mstp_clks[MSTP110]), /* VIN0 */ + CLKDEV_DEV_ID("rcar_vin.1", &mstp_clks[MSTP109]), /* VIN1 */ + CLKDEV_DEV_ID("rcar_vin.2", &mstp_clks[MSTP108]), /* VIN2 */ CLKDEV_DEV_ID("ehci-platform.1", &mstp_clks[MSTP101]), /* USB EHCI port2 */ CLKDEV_DEV_ID("ohci-platform.1", &mstp_clks[MSTP101]), /* USB OHCI port2 */ CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */ Index: renesas/arch/arm/mach-shmobile/include/mach/r8a7779.h =================================================================== --- renesas.orig/arch/arm/mach-shmobile/include/mach/r8a7779.h +++ renesas/arch/arm/mach-shmobile/include/mach/r8a7779.h @@ -5,6 +5,7 @@ #include #include #include +#include struct platform_device; @@ -35,6 +36,8 @@ extern void r8a7779_add_standard_devices extern void r8a7779_add_standard_devices_dt(void); extern void r8a7779_add_ether_device(struct sh_eth_plat_data *pdata); extern void r8a7779_add_usb_phy_device(struct rcar_phy_platform_data *pdata); +extern void r8a7779_add_vin_device(int idx, + struct rcar_vin_platform_data *pdata); extern void r8a7779_init_late(void); extern void r8a7779_clock_init(void); extern void r8a7779_pinmux_init(void); Index: renesas/arch/arm/mach-shmobile/setup-r8a7779.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/setup-r8a7779.c +++ renesas/arch/arm/mach-shmobile/setup-r8a7779.c @@ -559,6 +559,33 @@ static struct resource ether_resources[] }, }; +#define R8A7779_VIN(idx) \ +static struct resource vin##idx##_resources[] = { \ + DEFINE_RES_MEM(0xffc50000 + 0x1000 * (idx), 0x1000), \ + DEFINE_RES_IRQ(gic_iid(0x5f + (idx))), \ +}; \ + \ +static struct platform_device_info vin##idx##_info = { \ + .parent = &platform_bus, \ + .name = "rcar_vin", \ + .id = idx, \ + .res = vin##idx##_resources, \ + .num_res = ARRAY_SIZE(vin##idx##_resources), \ + .dma_mask = DMA_BIT_MASK(32), \ +} + +R8A7779_VIN(0); +R8A7779_VIN(1); +R8A7779_VIN(2); +R8A7779_VIN(3); + +static struct platform_device_info *vin_info_table[] __initdata = { + &vin0_info, + &vin1_info, + &vin2_info, + &vin3_info, +}; + static struct platform_device *r8a7779_devices_dt[] __initdata = { &scif0_device, &scif1_device, @@ -610,6 +637,15 @@ void __init r8a7779_add_usb_phy_device(s pdata, sizeof(*pdata)); } +void __init r8a7779_add_vin_device(int id, + struct rcar_vin_platform_data *pdata) +{ + vin_info_table[id]->data = pdata; + vin_info_table[id]->size_data = sizeof(struct rcar_vin_platform_data); + + platform_device_register_full(vin_info_table[id]); +} + /* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */ void __init __weak r8a7779_register_twd(void) { }