Commit daa56a06 authored by Olof Johansson's avatar Olof Johansson

Merge branch 'ux500/asic-id' into next/soc

* ux500/asic-id:
  ARM: ux500: Correct Ux500 family names usage
parents c1270363 79964bcd
......@@ -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();
......
......@@ -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();
......
......@@ -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 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment