From patchwork Mon Feb 18 20:33:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2160111 Return-Path: X-Original-To: patchwork-linux-sh@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 5BD9EDF25A for ; Mon, 18 Feb 2013 19:33:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754317Ab3BRTc7 (ORCPT ); Mon, 18 Feb 2013 14:32:59 -0500 Received: from mail-lb0-f170.google.com ([209.85.217.170]:43335 "EHLO mail-lb0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753058Ab3BRTc7 (ORCPT ); Mon, 18 Feb 2013 14:32:59 -0500 Received: by mail-lb0-f170.google.com with SMTP id ge1so4551069lbb.15 for ; Mon, 18 Feb 2013 11:32:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:to:subject:from:organization:date:mime-version :content-type:content-transfer-encoding:message-id :x-gm-message-state; bh=c2HpIAGiTZtGpqT5lFYz5sxujqgh+Rji4o01q250+qo=; b=CWy15eis8pyw55WZHsWUWRU9U6WXJZYriqbuzbhc84rCfgJYQ1YviAoiiSOoVmW9vv wQamG6pWlCbpoerjQ/MmhNOD2TO0Xw4EN5J9YBoDTuXPJabfX1XqeVwlV8/YTEWEEeHg +MaBhy0UkYiLU8MfAI+LE7DigH5Y9jxNyvPDsKJQ5MKfC70PMwtk4NftH9uKyuBOpIrV WXXtAGCSNT9dLXd+9TaRuoH+CgNjT5X3bEfwFAEL4casbDfTtftxIf2mpsDG7BPmyTKg bAWHtKb8p397sMzqkkTrMVByCJNBEm79SZPpjmsP43U8oXG8aXUYuCcPWigaXXUQDyvW 3DsA== X-Received: by 10.152.109.112 with SMTP id hr16mr11802799lab.38.1361215977608; Mon, 18 Feb 2013 11:32:57 -0800 (PST) Received: from wasted.dev.rtsoft.ru (ppp91-79-66-25.pppoe.mtu-net.ru. [91.79.66.25]) by mx.google.com with ESMTPS id tm10sm35670128lab.10.2013.02.18.11.32.55 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 18 Feb 2013 11:32:56 -0800 (PST) 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, vladimir.barinov@cogentembedded.com Subject: [PATCH v2 3/4] ARM: mach-shmobile: r8a7779: add SATA support From: Sergei Shtylyov Organization: Cogent Embedded Date: Mon, 18 Feb 2013 23:33:25 +0300 MIME-Version: 1.0 Message-Id: <201302182333.25630.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQkryOI9Hl01eSNk/7b756FK3DUrtoqpkILk76VdX9LNofpe7GRGLypET9fuiUOsnjL4JYAM Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Vladimir Barinov Add SATA clock for r8a7779 SoC (for both device tree and usual cases). Register SATA controller as a "late" platform device on r8a7779 SoC. Signed-off-by: Vladimir Barinov Signed-off-by: Sergei Shtylyov --- Changes since v1: - added new clock entry for the device tree case instead of the entry in r8a7779_auxdata_lookup[]; - initialized sata_device.dev.[coherent_]dma_mask; - created r8a7779_late_devices[], add SATA device there, and register "late" devices from r8a7779_add_standard_devices(); Sorry for the previous empty posting -- hit the wrong button. :-( arch/arm/mach-shmobile/clock-r8a7779.c | 4 ++++ arch/arm/mach-shmobile/setup-r8a7779.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) -- 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-r8a7779.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/clock-r8a7779.c +++ renesas/arch/arm/mach-shmobile/clock-r8a7779.c @@ -87,6 +87,7 @@ static struct clk div4_clks[DIV4_NR] = { }; enum { MSTP323, MSTP322, MSTP321, MSTP320, + MSTP115, MSTP101, MSTP100, MSTP030, MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021, @@ -99,6 +100,7 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP322] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 22, 0), /* SDHI1 */ [MSTP321] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 21, 0), /* SDHI2 */ [MSTP320] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 20, 0), /* SDHI3 */ + [MSTP115] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 15, 0), /* SATA */ [MSTP101] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 1, 0), /* USB2 */ [MSTP100] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 0, 0), /* USB0/1 */ [MSTP030] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 30, 0), /* I2C0 */ @@ -156,6 +158,8 @@ static struct clk_lookup lookups[] = { CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]), /* MSTP32 clocks */ + CLKDEV_DEV_ID("sata_rcar", &mstp_clks[MSTP115]), /* SATA */ + CLKDEV_DEV_ID("fc600000.sata", &mstp_clks[MSTP115]), /* SATA w/DT */ 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/setup-r8a7779.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/setup-r8a7779.c +++ renesas/arch/arm/mach-shmobile/setup-r8a7779.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -322,6 +323,30 @@ static struct platform_device i2c3_devic .num_resources = ARRAY_SIZE(rcar_i2c3_res), }; +static struct resource sata_resources[] = { + [0] = { + .name = "rcar-sata", + .start = 0xfc600000, + .end = 0xfc601fff, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = gic_spi(100), + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device sata_device = { + .name = "sata_rcar", + .id = -1, + .resource = sata_resources, + .num_resources = ARRAY_SIZE(sata_resources), + .dev = { + .dma_mask = &sata_device.dev.coherent_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, +}; + static struct platform_device *r8a7779_early_devices_dt[] __initdata = { &scif0_device, &scif1_device, @@ -340,6 +365,10 @@ static struct platform_device *r8a7779_e &i2c3_device, }; +static struct platform_device *r8a7779_late_devices[] __initdata = { + &sata_device, +}; + void __init r8a7779_add_standard_devices(void) { #ifdef CONFIG_CACHE_L2X0 @@ -354,6 +383,8 @@ void __init r8a7779_add_standard_devices ARRAY_SIZE(r8a7779_early_devices_dt)); platform_add_devices(r8a7779_early_devices, ARRAY_SIZE(r8a7779_early_devices)); + platform_add_devices(r8a7779_late_devices, + ARRAY_SIZE(r8a7779_late_devices)); } /* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */