| From b7775ae3b628d980ced02b06a294fc66fe6e5687 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 26 Oct 2012 15:38:47 +0200 |
| Subject: ARM: shmobile: r8a7740: add TPU PWM support |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Tested-by: Simon Horman <horms@verge.net.au> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 58645fe9a81d517eb99a137868f11ac39aa71eb9) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/clock-r8a7740.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c |
| index ecdc0a4c..7fd32d60 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7740.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7740.c |
| @@ -461,7 +461,7 @@ enum { |
| |
| MSTP329, MSTP328, MSTP323, MSTP320, |
| MSTP314, MSTP313, MSTP312, |
| - MSTP309, |
| + MSTP309, MSTP304, |
| |
| MSTP416, MSTP415, MSTP407, MSTP406, |
| |
| @@ -499,6 +499,7 @@ static struct clk mstp_clks[MSTP_NR] = { |
| [MSTP313] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR3, 13, 0), /* SDHI1 */ |
| [MSTP312] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR3, 12, 0), /* MMC */ |
| [MSTP309] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR3, 9, 0), /* GEther */ |
| + [MSTP304] = SH_CLK_MSTP32(&div4_clks[DIV4_CP], SMSTPCR3, 4, 0), /* TPU0 */ |
| |
| [MSTP416] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR4, 16, 0), /* USBHOST */ |
| [MSTP415] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR4, 15, 0), /* SDHI2 */ |
| @@ -595,6 +596,7 @@ static struct clk_lookup lookups[] = { |
| CLKDEV_DEV_ID("e6bd0000.mmcif", &mstp_clks[MSTP312]), |
| CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP309]), |
| CLKDEV_DEV_ID("e9a00000.sh-eth", &mstp_clks[MSTP309]), |
| + CLKDEV_DEV_ID("renesas_tpu_pwm", &mstp_clks[MSTP304]), |
| |
| CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP415]), |
| CLKDEV_DEV_ID("e6870000.sdhi", &mstp_clks[MSTP415]), |
| -- |
| 1.8.4.3.gca3854a |
| |