Drop ARCH_BCM2708 and ARCH_BCM2709

They are not necessary anymore since both are based on ARCH_BCM2835. Also use the compatible strings "brcm,bcm2835", "brcm,bcm2836" and "brcm,bcm2837". Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
raspberrypi · Dec 9, 2016 · 755079e · 755079e
1 parent 1fadee4
commit 755079e
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 62 deletions.
diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
@@ -3,7 +3,6 @@
 #include "bcm2708.dtsi"
 
 / {
-	compatible = "brcm,bcm2708";
 	model = "Raspberry Pi Model B+";
 };
 

diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts
@@ -3,7 +3,6 @@
 #include "bcm2708.dtsi"
 
 / {
-	compatible = "brcm,bcm2708";
 	model = "Raspberry Pi Model B";
 };
 

diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi
@@ -3,9 +3,6 @@
 #include "bcm2708-rpi.dtsi"
 
 / {
-	compatible = "brcm,bcm2708";
-	model = "BCM2708";
-
 	soc {
 		timer@7e003000 {
 			compatible = "brcm,bcm2835-system-timer";

diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
@@ -3,7 +3,6 @@
 #include "bcm2709.dtsi"
 
 / {
-	compatible = "brcm,bcm2709";
 	model = "Raspberry Pi 2 Model B";
 };
 

diff --git a/arch/arm/boot/dts/bcm2709.dtsi b/arch/arm/boot/dts/bcm2709.dtsi
@@ -3,9 +3,6 @@
 #include "bcm2708-rpi.dtsi"
 
 / {
-	compatible = "brcm,bcm2709";
-	model = "BCM2709";
-
 	soc {
 		ranges = <0x7e000000 0x3f000000 0x01000000>,
 		         <0x40000000 0x40000000 0x00040000>;

diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
@@ -7,7 +7,6 @@
 #include "bcm2710.dtsi"
 
 / {
-	compatible = "brcm,bcm2710","brcm,bcm2709";
 	model = "Raspberry Pi 3 Model B";
 };
 

diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
@@ -3,7 +3,6 @@
 #include "bcm2710.dtsi"
 
 / {
-	compatible = "brcm,bcm2710","brcm,bcm2709";
 	model = "Raspberry Pi Compute Module 3";
 };
 

diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi
@@ -3,8 +3,8 @@
 #include "bcm2708-rpi.dtsi"
 
 / {
-	compatible = "brcm,bcm2710","brcm,bcm2709";
-	model = "BCM2710";
+	compatible = "brcm,bcm2837", "brcm,bcm2836";
+	model = "BCM2837";
 
 	soc {
 		ranges = <0x7e000000 0x3f000000 0x01000000>,

diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
@@ -38,7 +38,7 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_MAC_PARTITION=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_ARCH_BCM=y
-CONFIG_ARCH_BCM2709=y
+CONFIG_ARCH_BCM2835=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y

diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
@@ -39,7 +39,7 @@ CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_ARCH_MULTI_V6=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_BCM=y
-CONFIG_ARCH_BCM2708=y
+CONFIG_ARCH_BCM2835=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
@@ -156,33 +156,18 @@ config ARCH_BCM2835
 	select FIQ
 	select PINCTRL
 	select PINCTRL_BCM2835
+	select MFD_SYSCON if ARCH_MULTI_V7
 	help
 	  This enables support for the Broadcom BCM2835 and BCM2836 SoCs.
 	  This SoC is used in the Raspberry Pi and Roku 2 devices.
 
 config MACH_BCM2708
 	bool "Enable optimized __copy_to_user and __copy_from_user"
-	depends on ARCH_BCM2708
+	depends on ARCH_BCM2835 && ARCH_MULTI_V6
 	default y
 	help
 	  Optimized versions of __copy_to_user and __copy_from_user for Pi1.
 
-config ARCH_BCM2708
-	bool "Broadcom BCM2708 family"
-	depends on ARCH_MULTI_V6
-	select ARCH_BCM2835
-	help
-	  This enables support for Broadcom BCM2708 boards.
-
-config ARCH_BCM2709
-	bool "Broadcom BCM2709 family"
-	depends on ARCH_MULTI_V7
-	select ARCH_BCM2835
-	select HAVE_SMP
-	select MFD_SYSCON
-	help
-	  This enables support for Broadcom BCM2709 boards.
-
 config ARCH_BCM_63XX
 	bool "Broadcom BCM63xx DSL SoC"
 	depends on ARCH_MULTI_V7

diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
@@ -66,31 +66,3 @@ DT_MACHINE_START(BCM2835, "BCM2835")
 	.init_early = bcm2835_init_early,
 	.dt_compat = bcm2835_compat
 MACHINE_END
-
-#ifdef CONFIG_ARCH_BCM2708
-static const char * const bcm2708_compat[] = {
-	"brcm,bcm2708",
-	NULL
-};
-
-DT_MACHINE_START(BCM2708, "BCM2708")
-	.init_machine = bcm2835_init,
-	.reserve = bcm2835_board_reserve,
-	.init_early = bcm2835_init_early,
-	.dt_compat = bcm2708_compat,
-MACHINE_END
-#endif
-
-#ifdef CONFIG_ARCH_BCM2709
-static const char * const bcm2709_compat[] = {
-	"brcm,bcm2709",
-	NULL
-};
-
-DT_MACHINE_START(BCM2709, "BCM2709")
-	.init_machine = bcm2835_init,
-	.reserve = bcm2835_board_reserve,
-	.init_early = bcm2835_init_early,
-	.dt_compat = bcm2709_compat,
-MACHINE_END
-#endif
diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
@@ -78,7 +78,7 @@ void notrace _fiq_print(enum fiq_debug_level dbg_lvl, volatile struct fiq_state
  * fiq_fsm_spin_lock() - ARMv6+ bare bones spinlock
  * Must be called with local interrupts and FIQ disabled.
  */
-#if defined(CONFIG_ARCH_BCM2709) && defined(CONFIG_SMP)
+#if defined(CONFIG_ARCH_BCM2835) && defined(CONFIG_SMP)
 inline void fiq_fsm_spin_lock(fiq_lock_t *lock)
 {
 	unsigned long tmp;
@@ -111,7 +111,7 @@ inline void fiq_fsm_spin_lock(fiq_lock_t *lock) { }
 /**
  * fiq_fsm_spin_unlock() - ARMv6+ bare bones spinunlock
  */
-#if defined(CONFIG_ARCH_BCM2709) && defined(CONFIG_SMP)
+#if defined(CONFIG_ARCH_BCM2835) && defined(CONFIG_SMP)
 inline void fiq_fsm_spin_unlock(fiq_lock_t *lock)
 {
 	smp_mb();