| From 53bfac96de73bf08cbd70ecfa7f5724f84eccbe4 Mon Sep 17 00:00:00 2001 |
| From: Valentine Barshak <valentine.barshak@cogentembedded.com> |
| Date: Wed, 8 Jan 2014 20:31:25 +0400 |
| Subject: ARM: shmobile: r8a7790: Add SATA clocks |
| |
| This adds SATA[01] clock support to R8A7790 SoC. |
| |
| Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com> |
| [horms+renesas@verge.net.au: resolved trivial conflicts] |
| Acked-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| (cherry picked from commit 64b7f9aca549db8a8bbcf68c911e9bd24efe76f7) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/clock-r8a7790.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c |
| index b2b232335ceb..f25b43a1fd73 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7790.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7790.c |
| @@ -196,6 +196,7 @@ enum { |
| MSTP1009, MSTP1008, MSTP1007, MSTP1006, MSTP1005, |
| MSTP931, MSTP930, MSTP929, MSTP928, |
| MSTP917, |
| + MSTP815, MSTP814, |
| MSTP813, |
| MSTP811, MSTP810, MSTP809, MSTP808, |
| MSTP726, MSTP725, MSTP724, MSTP723, MSTP722, MSTP721, MSTP720, |
| @@ -226,6 +227,8 @@ static struct clk mstp_clks[MSTP_NR] = { |
| [MSTP929] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 29, MSTPSR9, 0), /* I2C2 */ |
| [MSTP928] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 28, MSTPSR9, 0), /* I2C3 */ |
| [MSTP917] = SH_CLK_MSTP32_STS(&qspi_clk, SMSTPCR9, 17, MSTPSR9, 0), /* QSPI */ |
| + [MSTP815] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR8, 15, MSTPSR8, 0), /* SATA0 */ |
| + [MSTP814] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR8, 14, MSTPSR8, 0), /* SATA1 */ |
| [MSTP813] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR8, 13, MSTPSR8, 0), /* Ether */ |
| [MSTP811] = SH_CLK_MSTP32_STS(&zg_clk, SMSTPCR8, 11, MSTPSR8, 0), /* VIN0 */ |
| [MSTP810] = SH_CLK_MSTP32_STS(&zg_clk, SMSTPCR8, 10, MSTPSR8, 0), /* VIN1 */ |
| @@ -340,6 +343,8 @@ static struct clk_lookup lookups[] = { |
| CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]), |
| CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]), |
| CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP704]), |
| + CLKDEV_DEV_ID("sata-r8a7790.0", &mstp_clks[MSTP815]), |
| + CLKDEV_DEV_ID("sata-r8a7790.1", &mstp_clks[MSTP814]), |
| |
| /* ICK */ |
| CLKDEV_ICK_ID("usbhs", "usb_phy_rcar_gen2", &mstp_clks[MSTP704]), |
| -- |
| 2.1.2 |
| |
