Skip to content
Permalink
Browse files

bcm270x: Use DT_MACHINE_START

We are all DT now so use DT_MACHINE_START.
Also drop the extra BCM2709-BCM2708 mix entry.

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  • Loading branch information...
notro committed Oct 10, 2016
1 parent b50787d commit 8b1d6e38794c5b1fbcc42cc0cab2a1c549e30dae
Showing with 2 additions and 14 deletions.
  1. +1 −2 arch/arm/mach-bcm2708/bcm2708.c
  2. +1 −10 arch/arm/mach-bcm2709/bcm2709.c
  3. +0 −2 arch/arm/tools/mach-types
@@ -22,7 +22,6 @@
#include <linux/module.h>
#include <linux/broadcom/vc_cma.h>

#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/system_info.h>

@@ -47,7 +46,7 @@ static const char * const bcm2708_compat[] = {
NULL
};

MACHINE_START(BCM2708, "BCM2708")
DT_MACHINE_START(BCM2708, "BCM2708")
/* Maintainer: Broadcom Europe Ltd. */
.init_machine = bcm2708_init,
.reserve = board_reserve,
@@ -22,7 +22,6 @@
#include <linux/module.h>
#include <linux/broadcom/vc_cma.h>

#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/system_info.h>

@@ -44,18 +43,10 @@ static void __init board_reserve(void)

static const char * const bcm2709_compat[] = {
"brcm,bcm2709",
"brcm,bcm2708", /* Could use bcm2708 in a pinch */
NULL
};

MACHINE_START(BCM2709, "BCM2709")
/* Maintainer: Broadcom Europe Ltd. */
.init_machine = bcm2709_init,
.reserve = board_reserve,
.dt_compat = bcm2709_compat,
MACHINE_END

MACHINE_START(BCM2708, "BCM2709")
DT_MACHINE_START(BCM2709, "BCM2709")
/* Maintainer: Broadcom Europe Ltd. */
.init_machine = bcm2709_init,
.reserve = board_reserve,
@@ -522,8 +522,6 @@ torbreck MACH_TORBRECK TORBRECK 3090
prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103
paz00 MACH_PAZ00 PAZ00 3128
acmenetusfoxg20 MACH_ACMENETUSFOXG20 ACMENETUSFOXG20 3129
bcm2708 MACH_BCM2708 BCM2708 3138
bcm2709 MACH_BCM2709 BCM2709 3139
ag5evm MACH_AG5EVM AG5EVM 3189
ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206
wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207

0 comments on commit 8b1d6e3

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