| From 99b1297e1b4eb5c54093eb855996af321b18d51d Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Wed, 24 Apr 2013 22:36:01 +0200 |
| Subject: ARM: shmobile: r8a7790: add TPU PWM support |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit aa9c185bbcd9cffdb0cda1ad24edd801f70178c5) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/clock-r8a7790.c | 11 +++++++++-- |
| 1 file changed, 9 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c |
| index bedd20ca..b393592e 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7790.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7790.c |
| @@ -48,6 +48,7 @@ |
| #define CPG_LEN 0x1000 |
| |
| #define SMSTPCR2 0xe6150138 |
| +#define SMSTPCR3 0xe615013c |
| #define SMSTPCR7 0xe615014c |
| |
| #define MODEMR 0xE6160060 |
| @@ -178,11 +179,17 @@ static struct clk div6_clks[DIV6_NR] = { |
| }; |
| |
| /* MSTP */ |
| -enum { MSTP721, MSTP720, |
| - MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP_NR }; |
| +enum { |
| + MSTP721, MSTP720, |
| + MSTP304, |
| + MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, |
| + MSTP_NR |
| +}; |
| + |
| static struct clk mstp_clks[MSTP_NR] = { |
| [MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */ |
| [MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */ |
| + [MSTP304] = SH_CLK_MSTP32(&cp_clk, SMSTPCR3, 4, 0), /* TPU0 */ |
| [MSTP216] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 16, 0), /* SCIFB2 */ |
| [MSTP207] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 7, 0), /* SCIFB1 */ |
| [MSTP206] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 6, 0), /* SCIFB0 */ |
| -- |
| 1.8.4.3.gca3854a |
| |
