Skip to content
Permalink
Browse files

bcm270x: Drop bcm2835-aux-uart hack

The gated bcm2835-aux clock is now used to enable uart1 so drop this hack.

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  • Loading branch information...
notro committed Oct 10, 2016
1 parent 8255db7 commit 4d200f67341c551db8f683b5673f7d1dffdc7fb9
Showing with 2 additions and 28 deletions.
  1. +1 −14 arch/arm/mach-bcm2708/bcm2708.c
  2. +1 −14 arch/arm/mach-bcm2709/bcm2709.c
@@ -98,18 +98,7 @@ void __init bcm2708_map_io(void)
iotable_init(bcm2708_io_desc, ARRAY_SIZE(bcm2708_io_desc));
}

static void __init bcm2708_init_uart1(void)
{
struct device_node *np;

np = of_find_compatible_node(NULL, NULL, "brcm,bcm2835-aux-uart");
if (of_device_is_available(np)) {
pr_info("bcm2708: Mini UART enabled\n");
writel(1, __io_address(UART1_BASE + 0x4));
}
}

void __init bcm2708_init(void)
static void __init bcm2708_init(void)
{
int ret;

@@ -122,8 +111,6 @@ void __init bcm2708_init(void)
BUG();
}

bcm2708_init_uart1();

system_rev = boardrev;
system_serial_low = serial;
}
@@ -110,18 +110,7 @@ void __init bcm2709_map_io(void)
iotable_init(bcm2709_io_desc, ARRAY_SIZE(bcm2709_io_desc));
}

static void __init bcm2709_init_uart1(void)
{
struct device_node *np;

np = of_find_compatible_node(NULL, NULL, "brcm,bcm2835-aux-uart");
if (of_device_is_available(np)) {
pr_info("bcm2709: Mini UART enabled\n");
writel(1, __io_address(UART1_BASE + 0x4));
}
}

void __init bcm2709_init(void)
static void __init bcm2709_init(void)
{
int ret;

@@ -134,8 +123,6 @@ void __init bcm2709_init(void)
BUG();
}

bcm2709_init_uart1();

system_rev = boardrev;
system_serial_low = serial;
}

0 comments on commit 4d200f6

Please sign in to comment.
You can’t perform that action at this time.