diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-28 15:57:21 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-05-30 00:49:06 +0100 |
| commit | a048711c0b3701ee22efd74022cb1f548a52842c (patch) | |
| tree | ad09a866cf5d8ac7bd9c2b5f7c0bd05b1f32ea03 /arch/arm/mach-berlin/berlin.c | |
| parent | d458773fb3c456d0e2e860fece8602b062e2f7a0 (diff) | |
| download | blackbird-obmc-linux-a048711c0b3701ee22efd74022cb1f548a52842c.tar.gz blackbird-obmc-linux-a048711c0b3701ee22efd74022cb1f548a52842c.zip | |
ARM: l2c: berlin: convert to generic l2c OF initialisation
Remove the explicit call to l2x0_of_init(), converting to the generic
infrastructure instead. We can remove the explicit machine init too
as this becomes identical to the generic version.
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-berlin/berlin.c')
| -rw-r--r-- | arch/arm/mach-berlin/berlin.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/arch/arm/mach-berlin/berlin.c b/arch/arm/mach-berlin/berlin.c index 6709d2a6bec8..ac181c6797ee 100644 --- a/arch/arm/mach-berlin/berlin.c +++ b/arch/arm/mach-berlin/berlin.c @@ -18,16 +18,6 @@ #include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> -static void __init berlin_init_machine(void) -{ - /* - * with DT probing for L2CCs, berlin_init_machine can be removed. - * Note: 88DE3005 (Armada 1500-mini) uses pl310 l2cc - */ - l2x0_of_init(0x30c00000, 0xfeffffff); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); -} - static const char * const berlin_dt_compat[] = { "marvell,berlin", NULL, @@ -35,5 +25,10 @@ static const char * const berlin_dt_compat[] = { DT_MACHINE_START(BERLIN_DT, "Marvell Berlin") .dt_compat = berlin_dt_compat, - .init_machine = berlin_init_machine, + /* + * with DT probing for L2CCs, berlin_init_machine can be removed. + * Note: 88DE3005 (Armada 1500-mini) uses pl310 l2cc + */ + .l2c_aux_val = 0x30c00000, + .l2c_aux_mask = 0xfeffffff, MACHINE_END |
