ARCH_BCM270X: Drop ATAGS support

arch/arm/Kconfig

@@ -330,6 +330,7 @@ config ARCH_BCM2708
 	select ARM_ERRATA_411920
 	select MACH_BCM2708
 	select MULTI_IRQ_HANDLER
+	select SPARSE_IRQ
 	select VC4
 	select FIQ
 	help
@@ -350,6 +351,10 @@ config ARCH_BCM2709
 	select MACH_BCM2709
 	select VC4
 	select FIQ
+	select USE_OF
+	select ARCH_REQUIRE_GPIOLIB
+	select PINCTRL
+	select PINCTRL_BCM2835
 	help
 	  This enables support for Broadcom BCM2709 boards.
 

arch/arm/Kconfig.debug

@@ -1248,8 +1248,8 @@ choice
 		  and will be soon removed.
 
 	config DEBUG_BCM2708_UART0
-		bool "Broadcom BCM2708 UART0 (PL011)"
-		depends on MACH_BCM2708
+		bool "Broadcom BCM270X UART0 (PL011)"
+		depends on ARCH_BCM2708 || ARCH_BCM2709
 		help
 		  Say Y here if you want the debug print routines to direct
 		  their output to UART 0. The port must have been initialised

arch/arm/boot/dts/Makefile

@@ -1,16 +1,16 @@
 ifeq ($(CONFIG_OF),y)
 
-dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b.dtb
-dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b-plus.dtb
-dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-cm.dtb
+dtb-$(CONFIG_ARCH_BCM2708) += bcm2708-rpi-b.dtb
+dtb-$(CONFIG_ARCH_BCM2708) += bcm2708-rpi-b-plus.dtb
+dtb-$(CONFIG_ARCH_BCM2708) += bcm2708-rpi-cm.dtb
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-cm.dtb
-dtb-$(CONFIG_BCM2709_DT) += bcm2709-rpi-2-b.dtb
+dtb-$(CONFIG_ARCH_BCM2709) += bcm2709-rpi-2-b.dtb
 
 # Raspberry Pi
-ifeq ($(CONFIG_BCM2708_DT),y)
+ifeq ($(CONFIG_ARCH_BCM2708),y)
    RPI_DT_OVERLAYS=y
 endif
-ifeq ($(CONFIG_BCM2709_DT),y)
+ifeq ($(CONFIG_ARCH_BCM2709),y)
    RPI_DT_OVERLAYS=y
 endif
 ifeq ($(CONFIG_ARCH_BCM2835),y)

arch/arm/boot/dts/overlays/Makefile

@@ -2,10 +2,10 @@ ifeq ($(CONFIG_OF),y)
 
 # Overlays for the Raspberry Pi platform
 
-ifeq ($(CONFIG_BCM2708_DT),y)
+ifeq ($(CONFIG_ARCH_BCM2708),y)
    RPI_DT_OVERLAYS=y
 endif
-ifeq ($(CONFIG_BCM2709_DT),y)
+ifeq ($(CONFIG_ARCH_BCM2709),y)
    RPI_DT_OVERLAYS=y
 endif
 ifeq ($(CONFIG_ARCH_BCM2835),y)
@@ -49,8 +49,6 @@ dtb-$(RPI_DT_OVERLAYS) += sdio-overlay.dtb
 dtb-$(RPI_DT_OVERLAYS) += smi-dev-overlay.dtb
 dtb-$(RPI_DT_OVERLAYS) += smi-nand-overlay.dtb
 dtb-$(RPI_DT_OVERLAYS) += smi-overlay.dtb
-dtb-$(RPI_DT_OVERLAYS) += spi-bcm2708-overlay.dtb
-dtb-$(RPI_DT_OVERLAYS) += spi-bcm2835-overlay.dtb
 dtb-$(RPI_DT_OVERLAYS) += spi-gpio35-39-overlay.dtb
 dtb-$(RPI_DT_OVERLAYS) += tinylcd35-overlay.dtb
 dtb-$(RPI_DT_OVERLAYS) += uart1-overlay.dtb

arch/arm/boot/dts/overlays/README

@@ -554,18 +554,6 @@ Load:   dtoverlay=smi-nand
 Params: <None>
 
 
-Name:   spi-bcm2708
-Info:   Selects the bcm2708-spi SPI driver
-Load:   dtoverlay=spi-bcm2708
-Params: <None>
-
-
-Name:   spi-bcm2835
-Info:   Selects the bcm2835-spi SPI driver
-Load:   dtoverlay=spi-bcm2835
-Params: <None>
-
-
 Name:   spi-gpio35-39
 Info:   move SPI function block to GPIO 35 to 39
 Load:   dtoverlay=spi-gpio35-39

arch/arm/configs/bcm2709_defconfig

@@ -39,7 +39,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_MAC_PARTITION=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_ARCH_BCM2709=y
-CONFIG_BCM2709_DT=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_SMP=y
 CONFIG_HAVE_ARM_ARCH_TIMER=y
@@ -55,6 +54,7 @@ CONFIG_ZSMALLOC=m
 CONFIG_PGTABLE_MAPPING=y
 CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_SECCOMP=y
+# CONFIG_ATAGS is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
@@ -584,14 +584,12 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_TTY_PRINTK=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_BCM2835=m
-CONFIG_HW_RANDOM_BCM2708=m
 CONFIG_RAW_DRIVER=y
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_BCM2708=m
 CONFIG_SPI=y
 CONFIG_SPI_BCM2835=m
-CONFIG_SPI_BCM2708=m
 CONFIG_SPI_SPIDEV=y
 CONFIG_PPS=m
 CONFIG_PPS_CLIENT_LDISC=m
@@ -626,7 +624,6 @@ CONFIG_SENSORS_SHTC1=m
 CONFIG_THERMAL=y
 CONFIG_THERMAL_BCM2835=y
 CONFIG_WATCHDOG=y
-CONFIG_BCM2708_WDT=m
 CONFIG_BCM2835_WDT=m
 CONFIG_UCB1400_CORE=m
 CONFIG_MFD_STMPE=y
@@ -831,7 +828,6 @@ CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_SOC=m
 CONFIG_SND_BCM2835_SOC_I2S=m
-CONFIG_SND_BCM2708_SOC_I2S=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m

arch/arm/configs/bcmrpi_defconfig

@@ -38,7 +38,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_MAC_PARTITION=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_ARCH_BCM2708=y
-CONFIG_BCM2708_DT=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_OABI_COMPAT=y
@@ -50,6 +49,7 @@ CONFIG_ZSMALLOC=m
 CONFIG_PGTABLE_MAPPING=y
 CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_SECCOMP=y
+# CONFIG_ATAGS is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
@@ -577,14 +577,12 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_TTY_PRINTK=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_BCM2835=m
-CONFIG_HW_RANDOM_BCM2708=m
 CONFIG_RAW_DRIVER=y
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_BCM2708=m
 CONFIG_SPI=y
 CONFIG_SPI_BCM2835=m
-CONFIG_SPI_BCM2708=m
 CONFIG_SPI_SPIDEV=y
 CONFIG_PPS=m
 CONFIG_PPS_CLIENT_LDISC=m
@@ -619,7 +617,6 @@ CONFIG_SENSORS_SHTC1=m
 CONFIG_THERMAL=y
 CONFIG_THERMAL_BCM2835=y
 CONFIG_WATCHDOG=y
-CONFIG_BCM2708_WDT=m
 CONFIG_BCM2835_WDT=m
 CONFIG_UCB1400_CORE=m
 CONFIG_MFD_STMPE=y
@@ -824,7 +821,6 @@ CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_SOC=m
 CONFIG_SND_BCM2835_SOC_I2S=m
-CONFIG_SND_BCM2708_SOC_I2S=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m

arch/arm/mach-bcm2708/Kconfig

@@ -6,27 +6,12 @@ config MACH_BCM2708
 	select NEED_MACH_MEMORY_H
 	select NEED_MACH_IO_H
 	select CPU_V6
-	help
-	  Include support for the Broadcom(R) BCM2708 platform.
-
-config BCM2708_DT
-	bool "BCM2708 Device Tree support"
-	depends on MACH_BCM2708
-	default n
 	select USE_OF
 	select ARCH_REQUIRE_GPIOLIB
 	select PINCTRL
 	select PINCTRL_BCM2835
 	help
-	  Enable Device Tree support for BCM2708
-
-config BCM2708_GPIO
-	bool "BCM2708 gpio support"
-	depends on MACH_BCM2708
-	select ARCH_REQUIRE_GPIOLIB
-        default y
-	help
-	  Include support for the Broadcom(R) BCM2708 gpio.
+	  Include support for the Broadcom(R) BCM2708 platform.
 
 config BCM2708_NOL2CACHE
 	bool "Videocore L2 cache disable"
@@ -35,11 +20,4 @@ config BCM2708_NOL2CACHE
         help
           Do not allow ARM to use GPU's L2 cache. Requires disable_l2cache in config.txt.
 
-config BCM2708_SPIDEV
-	bool "Bind spidev to SPI0 master"
-	depends on MACH_BCM2708
-	depends on SPI
-	default y
-	help
-	  Binds spidev driver to the SPI0 master
 endmenu

arch/arm/mach-bcm2708/Makefile

@@ -2,5 +2,4 @@
 # Makefile for the linux kernel.
 #
 
-obj-$(CONFIG_MACH_BCM2708) 	+= bcm2708.o armctrl.o
-obj-$(CONFIG_BCM2708_GPIO)	+= bcm2708_gpio.o
+obj-$(CONFIG_MACH_BCM2708) 	+= bcm2708.o