ARM: pxa: add clk_set_rate()

Avoid to mismatch between NR_BUILTIN_GPIO and GPIO interrupt number

Signed-off-by Haojian Zhuang <[email protected]>

---
?arch/arm/mach-pxa/include/mach/gpio.h | ? ?2 +-
?1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/mach-pxa/include/mach/gpio.h +1 -2

index b024a8b..48ef925 100644
@@ -99,7 +99,7 @@
 ?#define GAFR(x) ? ? ? ? ? ? ? ?GPIO_REG(0x54 + (((x) & 0x70) >> 2))
 
 
-#define NR_BUILTIN_GPIO 128
+#define NR_BUILTIN_GPIO ? ? ? ? ? ? ? ?PXA_GPIO_IRQ_NUM
 
 ?#define gpio_to_bank(gpio) ? ? ((gpio) >> 5)
 ?#define gpio_to_irq(gpio) ? ? ?IRQ_GPIO(gpio)
--

1.5.6.5

UART3 is the default console in jasper, brownstone and avengers lite.

Change-Id: Iacfe665cc0e20a47d50e0b2ad8724097f28e7d2c

arch/arm/mach-mmp/include/mach/debug-macro.S +0 -0

index 7e2ebd3..b353785 100644
@@ -14,8 +14,14 @@
 		.macro	addruart, rp, rv

Quoted 3 lines · Haojian Zhuang

UART3 is the default console in jasper, brownstone and avengers lite.

Change-Id: Iacfe665cc0e20a47d50e0b2ad8724097f28e7d2c

Please don't include Change-Ids in patch submissions.

Quoted 13 lines

arch/arm/mach-mmp/include/mach/debug-macro.S +0 -0

index 7e2ebd3..b353785 100644
@@ -14,8 +14,14 @@

? ? ? ? ? ? ? .macro ?addruart, rp, rv
? ? ? ? ? ? ? ldr ? ? \rp, =APB_PHYS_BASE ? ? ? ? ? ? @ physical ? ? ? ? ? ? ? ldr ? ? \rv, =APB_VIRT_BASE ? ? ? ? ? ? @ virtual

arch/arm/mach-mmp/include/mach/debug-macro.S +5 -0

+#if defined(CONFIG_MACH_BROWNSTONE) || defined(CONFIG_MACH_MARVELL_JASPER) \
+ ? ? || defined(CONFIG_MACH_AVENGERS_LITE)
+ ? ? ? ? ? ? orr ? ? \rp, \rp, #0x00018000
+ ? ? ? ? ? ? orr ? ? \rv, \rv, #0x00018000
+#else

Quoted 3 lines

? ? ? ? ? ? ? orr ? ? \rp, \rp, #0x00017000
? ? ? ? ? ? ? orr ? ? \rv, \rv, #0x00017000
+#endif

It probably makes more sense to have this in the configuration scripts:

choice
? ? ? ?prompt "PXA debug uart"
? ? ? ?default DEBUG_PXA_UART0

config DEBUG_PXA_UART0
? ? ? ?bool "UART 0"

config DEBUG_PXA_UART1
? ? ? ?bool "UART 1"
? ? ? ?default y if MACH_BROWNSTONE || MACH_MARVELL_JASPER || MACH_AVENGERS_LITE

endchoice

and select the debug uart address using these symbols. ?That'd avoid the need to couple lots of platform specific stuff into the compiled files.

Alternatively, you could do more in the Kconfig like this:

config DEBUG_PXA_UART
? ? ? ?hex
? ? ? ?default 0x17000 if DEBUG_PXA_UART0
? ? ? ?default 0x18000 if DEBUG_PXA_UART1

and use CONFIG_DEBUG_PXA_UART in the assembly code, eliminating the need to change sourcecode for additional uarts. ?Or maybe combine the two ideas.

Bit[9:7] should always be zero in PXA168.

Signed-off-by Haojian Zhuang <[email protected]>

---
?arch/arm/mach-mmp/include/mach/mfp-pxa168.h | ? ?9 +++++++++ ?1 files changed, 9 insertions(+), 0 deletions(-)

arch/arm/mach-mmp/include/mach/mfp-pxa168.h +9 -0

index 4621067..713be15 100644
@@ -8,6 +8,15 @@
 ?#define MFP_DRIVE_MEDIUM ? ? ? (0x2 << 13)
 ?#define MFP_DRIVE_FAST ? ? ? ? (0x3 << 13)
 
+#undef MFP_CFG
+#undef MFP_CFG_DRV
+
+#define MFP_CFG(pin, af) ? ? ? ? ? ? ? \
+ ? ? ? (MFP_LPM_INPUT | MFP_PIN(MFP_PIN_##pin) | MFP_##af | MFP_DRIVE_MEDIUM)
+
+#define MFP_CFG_DRV(pin, af, drv) ? ? ?\
+ ? ? ? (MFP_LPM_INPUT | MFP_PIN(MFP_PIN_##pin) | MFP_##af | MFP_DRIVE_##drv)
+

?/* GPIO */
?#define GPIO0_GPIO ? ? ? ? ? ? MFP_CFG(GPIO0, AF5) ?#define GPIO1_GPIO ? ? ? ? ? ? MFP_CFG(GPIO1, AF5) --
1.5.6.5

Since there're mulitple clock rates in some device controllers, enable clk_set_rate() for this usage.

Signed-off-by Haojian Zhuang <[email protected]>

Acked-by Eric Miao <[email protected]>

---

?arch/arm/mach-mmp/clock.c | ? 15 +++++++++++++++
?arch/arm/mach-mmp/clock.h | ? ?1 +
?arch/arm/mach-pxa/clock.c | ? 15 +++++++++++++++
?arch/arm/mach-pxa/clock.h | ? ?1 +

?4 files changed, 32 insertions(+), 0 deletions(-)

arch/arm/mach-mmp/clock.c +15 -0

index 886e056..7c6f95f 100644
@@ -88,3 +88,18 @@ unsigned long clk_get_rate(struct clk *clk)
 ? ? ? ?return rate;
 ?}
 ?EXPORT_SYMBOL(clk_get_rate);
+
+int clk_set_rate(struct clk *clk, unsigned long rate)
+{
+ ? ? ? unsigned long flags;
+ ? ? ? int ret = -EINVAL;
+
+ ? ? ? if (clk->ops->setrate) {
+ ? ? ? ? ? ? ? spin_lock_irqsave(&clocks_lock, flags);
+ ? ? ? ? ? ? ? ret = clk->ops->setrate(clk, rate);
+ ? ? ? ? ? ? ? spin_unlock_irqrestore(&clocks_lock, flags);
+ ? ? ? }
+
+ ? ? ? return ret;
+}
+EXPORT_SYMBOL(clk_set_rate);

arch/arm/mach-mmp/clock.h +1 -0

index 9b027d7..3143e99 100644
@@ -12,6 +12,7 @@ struct clkops {
 ? ? ? ?void ? ? ? ? ? ? ? ? ? ?(*enable)(struct clk *);
 ? ? ? ?void ? ? ? ? ? ? ? ? ? ?(*disable)(struct clk *);
 ? ? ? ?unsigned long ? ? ? ? ? (*getrate)(struct clk *);
+ ? ? ? int ? ? ? ? ? ? ? ? ? ? (*setrate)(struct clk *, unsigned long);
 ?};
 
 ?struct clk {

arch/arm/mach-pxa/clock.c +15 -0

index d515222..4d46610 100644
@@ -53,6 +53,21 @@ unsigned long clk_get_rate(struct clk *clk)
 ?}
 ?EXPORT_SYMBOL(clk_get_rate);
 
+int clk_set_rate(struct clk *clk, unsigned long rate)
+{
+ ? ? ? unsigned long flags;
+ ? ? ? int ret = -EINVAL;
+
+ ? ? ? if (clk->ops->setrate) {
+ ? ? ? ? ? ? ? spin_lock_irqsave(&clocks_lock, flags);
+ ? ? ? ? ? ? ? ret = clk->ops->setrate(clk, rate);
+ ? ? ? ? ? ? ? spin_unlock_irqrestore(&clocks_lock, flags);
+ ? ? ? }
+
+ ? ? ? return ret;
+}
+EXPORT_SYMBOL(clk_set_rate);
+
 ?void clk_dummy_enable(struct clk *clk)
 ?{
 ?}

arch/arm/mach-pxa/clock.h +1 -1

index f9f349a..7373853 100644
@@ -5,6 +5,7 @@ struct clkops {
 ? ? ? ?void ? ? ? ? ? ? ? ? ? ?(*enable)(struct clk *);
 ? ? ? ?void ? ? ? ? ? ? ? ? ? ?(*disable)(struct clk *);
 ? ? ? ?unsigned long ? ? ? ? ? (*getrate)(struct clk *);
+ ? ? ? int ? ? ? ? ? ? ? ? ? ? (*setrate)(struct clk *, unsigned long);
 ?};
 
 ?struct clk {
--

1.5.6.5