Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79964bcd authored Sep 03, 2012 by Loic PALLARDY Committed by Olof Johansson Sep 04, 2012

ARM: ux500: Correct Ux500 family names usage



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

Signed-off-by: Loic Pallardy <loic.pallardy@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

parent 1d3266ec

arch/arm/mach-ux500/clock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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 {