ARM: ux500: Correct Ux500 family names usage

PATCH New Linus Walleij 2 participants 2 messages Sep 3, 2012 – Sep 5, 2012

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/nomadik/Ux500 architectures

lore

Share & tools

lore

Linus Walleij

author

2012-09-03 13:10 UTC #0 lore raw

PATCH 1/1 ARM: ux500: Correct Ux500 family names usage

From: Loic PALLARDY <[email protected]>

Update users with cpu_is_ux540_family() to keep x540 family functional.

Signed-off-by Loic Pallardy <[email protected]>

Signed-off-by Linus Walleij <[email protected]>

---
Hi Arnd, Olof:

This patch goes on top of the ux500-asicid patches pulled earlier, into your ux500/asic-id branch, it'd be best if you just applied this one on top manually. If you prefer I can send a new pull request from the same branch.

Linus

---
 arch/arm/mach-ux500/clock.c   | 2 +-
 arch/arm/mach-ux500/platsmp.c | 2 +-
 arch/arm/mach-ux500/timer.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

arch/arm/mach-ux500/clock.c +1 -1

index 8d73b06..bc5a516 100644
@@ -149,7 +149,7 @@ static unsigned long clk_mtu_get_rate(struct clk *clk)
 	unsigned long mturate;
 	unsigned long retclk;
 
-	if (cpu_is_u8500_family())
+	if (cpu_is_u8500_family() || cpu_is_ux540_family())
 		addr = __io_address(U8500_PRCMU_BASE);
 	else
 		ux500_unknown_soc();

arch/arm/mach-ux500/platsmp.c +1 -1

index cb35897..a5dda684 100644
@@ -118,7 +118,7 @@ static void __init wakeup_secondary(void)
 {
 	void __iomem *backupram;
 
-	if (cpu_is_u8500_family())
+	if (cpu_is_u8500_family() || cpu_is_ux540_family())
 		backupram = __io_address(U8500_BACKUPRAM0_BASE);
 	else
 		ux500_unknown_soc();

arch/arm/mach-ux500/timer.c +1 -1

index 66e7f00..6f39731 100644
@@ -54,7 +54,7 @@ static void __init ux500_timer_init(void)
 	void __iomem *tmp_base;
 	struct device_node *np;
 
-	if (cpu_is_u8500_family()) {
+	if (cpu_is_u8500_family() || cpu_is_ux540_family()) {
 		mtu_timer_base = __io_address(U8500_MTU0_BASE);
 		prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE);
 	} else {

Signature · 1 line

1.7.11.3

Olof Johansson

2012-09-05 04:38 UTC #1 lore raw

PATCH 1/1 ARM: ux500: Correct Ux500 family names usage

Quoted 7 lines · Linus Walleij

From: Loic PALLARDY <[email protected]>
Update users with cpu_is_ux540_family() to keep x540 family functional.
Signed-off-by Loic Pallardy <[email protected]>
Signed-off-by Linus Walleij <[email protected]>

Quoted 7 lines

---
Hi Arnd, Olof:
This patch goes on top of the ux500-asicid patches pulled earlier, into your ux500/asic-id branch, it'd be best if you just applied this one on top manually. If you prefer I can send a new pull request from the same branch.

Sure, applied.

-Olof