[PATCH 2/6 v3] ARM: integrator: check PL010 base address from resource

[PATCH 2/6 v3] ARM: integrator: check PL010 base address from resource

[Linus Walleij]

In the PL010 UART callback a comparison against the location of the
statically allocated PL010 device is done to figure out which UART
is doing the callback. This does not play well with dynamic devices
such as in device tree, so let's check the base address of the
memory resource inside the amba_device instead.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v2->v3:
- Check for the base address of the physical memory resource instead
  of checking for the device name (which will also be dynamic when
  we use device tree).
---
 arch/arm/mach-integrator/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 5ba4bc8..268eadf 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -99,11 +99,14 @@ int __init integrator_init(bool is_cp)
 static void integrator_uart_set_mctrl(struct amba_device *dev, void __iomem *base, unsigned int mctrl)
 {
 	unsigned int ctrls = 0, ctrlc = 0, rts_mask, dtr_mask;
+	u32 phybase = dev->res.start;
 
-	if (dev == &uart0_device) {
+	if (phybase == INTEGRATOR_UART0_BASE) {
+		/* UART0 */
 		rts_mask = 1 << 4;
 		dtr_mask = 1 << 5;
 	} else {
+		/* UART1 */
 		rts_mask = 1 << 6;
 		dtr_mask = 1 << 7;
 	}
-- 
1.7.11.4

[PATCH 2/6 v3] ARM: integrator: check PL010 base address from resource

[Linus Walleij]

In the PL010 UART callback a comparison against the location of the
statically allocated PL010 device is done to figure out which UART
is doing the callback. This does not play well with dynamic devices
such as in device tree, so let's check the base address of the
memory resource inside the amba_device instead.

Signed-off-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
ChangeLog v2->v3:
- Check for the base address of the physical memory resource instead
  of checking for the device name (which will also be dynamic when
  we use device tree).
---
 arch/arm/mach-integrator/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 5ba4bc8..268eadf 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -99,11 +99,14 @@ int __init integrator_init(bool is_cp)
 static void integrator_uart_set_mctrl(struct amba_device *dev, void __iomem *base, unsigned int mctrl)
 {
 	unsigned int ctrls = 0, ctrlc = 0, rts_mask, dtr_mask;
+	u32 phybase = dev->res.start;
 
-	if (dev == &uart0_device) {
+	if (phybase == INTEGRATOR_UART0_BASE) {
+		/* UART0 */
 		rts_mask = 1 << 4;
 		dtr_mask = 1 << 5;
 	} else {
+		/* UART1 */
 		rts_mask = 1 << 6;
 		dtr_mask = 1 << 7;
 	}
-- 
1.7.11.4

[PATCH 2/6 v3] ARM: integrator: check PL010 base address from resource

[Arnd Bergmann]

On Monday 03 September 2012, Linus Walleij wrote:
> In the PL010 UART callback a comparison against the location of the
> statically allocated PL010 device is done to figure out which UART
> is doing the callback. This does not play well with dynamic devices
> such as in device tree, so let's check the base address of the
> memory resource inside the amba_device instead.
> 
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ChangeLog v2->v3:
> - Check for the base address of the physical memory resource instead
>   of checking for the device name (which will also be dynamic when
>   we use device tree).

Ok, looks good to me.

Acked-by: Arnd Bergmann <arnd@arndb.de>

Re: [PATCH 2/6 v3] ARM: integrator: check PL010 base address from resource

[Arnd Bergmann]

On Monday 03 September 2012, Linus Walleij wrote:
> In the PL010 UART callback a comparison against the location of the
> statically allocated PL010 device is done to figure out which UART
> is doing the callback. This does not play well with dynamic devices
> such as in device tree, so let's check the base address of the
> memory resource inside the amba_device instead.
> 
> Signed-off-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> ---
> ChangeLog v2->v3:
> - Check for the base address of the physical memory resource instead
>   of checking for the device name (which will also be dynamic when
>   we use device tree).

Ok, looks good to me.

Acked-by: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>