Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7b9837c authored by Vladimir Barinov's avatar Vladimir Barinov Committed by Simon Horman
Browse files

ARM: mach-shmobile: r8a7779: add SATA support 



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: default avatarVladimir Barinov <vladimir.barinov@cogentembedded.com>
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 7840a65a

arch/arm/mach-shmobile/clock-r8a7779.c

+4 −0
Original line number Diff line number Diff line
@@ -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 */

arch/arm/mach-shmobile/setup-r8a7779.c

+26 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/serial_sci.h>

#include <linux/sh_intc.h>

#include <linux/sh_timer.h>

#include <linux/dma-mapping.h>

#include <mach/hardware.h>

#include <mach/irqs.h>

#include <mach/r8a7779.h>
@@ -322,6 +323,30 @@ static struct platform_device i2c3_device = { 
	.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_devices_dt[] __initdata = {

	&scif0_device,

	&scif1_device,
@@ -338,6 +363,7 @@ static struct platform_device *r8a7779_late_devices[] __initdata = { 
	&i2c1_device,

	&i2c2_device,

	&i2c3_device,

	&sata_device,

};



void __init r8a7779_add_standard_devices(void)