| From horms@vergenet.net Thu Jun 21 17:52:36 2012 |
| From: Simon Horman <horms@verge.net.au> |
| Date: Fri, 22 Jun 2012 09:51:53 +0900 |
| Subject: [PATCH] ARM: shmobile: sh73a0: bugfix: SY-DMAC number |
| To: ltsi-dev@lists.linuxfoundation.org |
| Cc: Greg KH <gregkh@linuxfoundation.org> |
| Message-ID: <1340326313-1672-1-git-send-email-horms@verge.net.au> |
| |
| |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| |
| 681e1b3eeb3606e06a7c4984e8058df84296f8bb |
| (ARM: mach-shmobile: sh73a0 DMA Engine support for SY-DMAC) |
| adds SY-DMAC, but it is 218, not 318 |
| |
| This patch is based on v2.0 manual |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Acked-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> |
| (cherry picked from commit 32103c7ba7d274bcb3ace48bc3366e1df37ebb56) |
| |
| Conflicts: |
| arch/arm/mach-shmobile/clock-sh73a0.c |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| |
| --- |
| |
| Greg, this is a bugfix for the sh73a0 and thus my work on the KZM9G |
| (not the D!) board. |
| --- |
| arch/arm/mach-shmobile/clock-sh73a0.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c |
| index 012b284..a7ae9c3 100644 |
| --- a/arch/arm/mach-shmobile/clock-sh73a0.c |
| +++ b/arch/arm/mach-shmobile/clock-sh73a0.c |
| @@ -474,9 +474,9 @@ static struct clk *late_main_clks[] = { |
| |
| enum { MSTP001, |
| MSTP129, MSTP128, MSTP127, MSTP126, MSTP125, MSTP118, MSTP116, MSTP100, |
| - MSTP219, |
| + MSTP219, MSTP218, |
| MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200, |
| - MSTP331, MSTP329, MSTP328, MSTP325, MSTP323, MSTP318, |
| + MSTP331, MSTP329, MSTP328, MSTP325, MSTP323, |
| MSTP314, MSTP313, MSTP312, MSTP311, |
| MSTP303, MSTP302, MSTP301, MSTP300, |
| MSTP411, MSTP410, MSTP403, |
| @@ -496,6 +496,7 @@ static struct clk mstp_clks[MSTP_NR] = { |
| [MSTP116] = MSTP(&div4_clks[DIV4_HP], SMSTPCR1, 16, 0), /* IIC0 */ |
| [MSTP100] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 0, 0), /* LCDC0 */ |
| [MSTP219] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 19, 0), /* SCIFA7 */ |
| + [MSTP218] = MSTP(&div4_clks[DIV4_HP], SMSTPCR2, 18, 0), /* SY-DMAC */ |
| [MSTP207] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 7, 0), /* SCIFA5 */ |
| [MSTP206] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 6, 0), /* SCIFB */ |
| [MSTP204] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 4, 0), /* SCIFA0 */ |
| @@ -508,7 +509,6 @@ static struct clk mstp_clks[MSTP_NR] = { |
| [MSTP328] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 28, 0), /*FSI*/ |
| [MSTP325] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR3, 25, 0), /* IrDA */ |
| [MSTP323] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 23, 0), /* IIC1 */ |
| - [MSTP318] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 18, 0), /* SY-DMAC */ |
| [MSTP314] = MSTP(&div6_clks[DIV6_SDHI0], SMSTPCR3, 14, 0), /* SDHI0 */ |
| [MSTP313] = MSTP(&div6_clks[DIV6_SDHI1], SMSTPCR3, 13, 0), /* SDHI1 */ |
| [MSTP312] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 12, 0), /* MMCIF0 */ |
| @@ -552,6 +552,7 @@ static struct clk_lookup lookups[] = { |
| CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[MSTP116]), /* I2C0 */ |
| CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */ |
| CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP219]), /* SCIFA7 */ |
| + CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]), /* SY-DMAC */ |
| CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */ |
| CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */ |
| CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */ |
| @@ -564,7 +565,6 @@ static struct clk_lookup lookups[] = { |
| CLKDEV_DEV_ID("sh_fsi2", &mstp_clks[MSTP328]), /* FSI */ |
| CLKDEV_DEV_ID("sh_irda.0", &mstp_clks[MSTP325]), /* IrDA */ |
| CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), /* I2C1 */ |
| - CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP318]), /* SY-DMAC */ |
| CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), /* SDHI0 */ |
| CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), /* SDHI1 */ |
| CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP312]), /* MMCIF0 */ |
| -- |
| 1.7.10.2.484.gcd07cc5 |
| |