ARM: EXYNOS: no more support non-DT for EXYNOS SoCs

As we discussed in mailing list, non-DT for EXYNOS SoCs will not be supported from v3.11. This patch removes regarding files for non-DT including board files and defconfig.

Cc Sylwester Nawrocki <[email protected]>

Cc Tomasz Figa <[email protected]>

Cc Thomas Abraham <[email protected]>

Cc Kyungmin Park <[email protected]>

Cc Arnd Bergmann <[email protected]>

Cc Olof Johansson <[email protected]>

Signed-off-by Kukjin Kim <[email protected]>

---

It's time to remove non-DT stuff for EXYNOS SoCs.
If no objection on this, this will be sent to arm-soc in a couple of days.

Quoted 13 lines · Kukjin Kim

As we discussed in mailing list, non-DT for EXYNOS SoCs will not be supported from v3.11. This patch removes regarding files for non-DT including board files and defconfig.

Cc Sylwester Nawrocki <[email protected]>

Cc Tomasz Figa <[email protected]>

Cc Thomas Abraham <[email protected]>

Cc Kyungmin Park <[email protected]>

Cc Arnd Bergmann <[email protected]>

Cc Olof Johansson <[email protected]>

Signed-off-by Kukjin Kim <[email protected]>

---

Quoted 2 lines

It's time to remove non-DT stuff for EXYNOS SoCs.
If no objection on this, this will be sent to arm-soc in a couple of days.

Please do. I think there are no excuses left this time ;-)

As we discussed in mailing list, non-DT for EXYNOS SoCs will not be supported from v3.11. This patch removes regarding files for non-DT including board files and defconfig.

Cc Sylwester Nawrocki <[email protected]>

Cc Tomasz Figa <[email protected]>

Cc Thomas Abraham <[email protected]>

Cc Kyungmin Park <[email protected]>

Cc Arnd Bergmann <[email protected]>

Cc Olof Johansson <[email protected]>

Signed-off-by Kukjin Kim <[email protected]>

---

It's time to remove non-DT stuff for EXYNOS SoCs.
If no objection on this, this will be sent to arm-soc in a couple of days.

arch/arm/mach-exynos/Makefile +0 -16

 obj-y					+= dev-uart.o
 obj-$(CONFIG_ARCH_EXYNOS4)		+= dev-audio.o
-obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-ahci.o
-obj-$(CONFIG_EXYNOS_DEV_DMA)		+= dma.o
-obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o
 
 obj-$(CONFIG_ARCH_EXYNOS)		+= setup-i2c0.o
-obj-$(CONFIG_EXYNOS4_SETUP_FIMC)	+= setup-fimc.o
-obj-$(CONFIG_EXYNOS4_SETUP_FIMD0)	+= setup-fimd0.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C1)	+= setup-i2c1.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C2)	+= setup-i2c2.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C3)	+= setup-i2c3.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C4)	+= setup-i2c4.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C5)	+= setup-i2c5.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C6)	+= setup-i2c6.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C7)	+= setup-i2c7.o
-obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)	+= setup-keypad.o
-obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
-obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)	+= setup-usb-phy.o
-obj-$(CONFIG_EXYNOS_SETUP_SPI)		+= setup-spi.o

(quoted diff) +0 -0

b/arch/arm/mach-exynos/common.c index 027c9e7..de7c7d3 100644

arch/arm/mach-exynos/common.c +0 -4

@@ -353,7 +353,6 @@ void __init exynos_init_late(void)
 	exynos_pm_late_initcall();
 }
 
-#ifdef CONFIG_OF
 int __init exynos_fdt_map_chipid(unsigned long node, const char *uname,
 int depth, void *data)
 {

@@ -376,7 +375,6 @@ int __init exynos_fdt_map_chipid(unsigned long node,
 const char *uname, iotable_init(&iodesc, 1);
 	return 1;
 }
-#endif
 
 /*
  * exynos_map_io

@@ -386,11 +384,9 @@ int __init exynos_fdt_map_chipid(unsigned long
 node, const char *uname,
 
 void __init exynos_init_io(struct map_desc *mach_desc, int size)
 {
-#ifdef CONFIG_OF
 	if (initial_boot_params)
 		of_scan_flat_dt(exynos_fdt_map_chipid, NULL);
 	else
-#endif
 		iotable_init(exynos_iodesc, ARRAY_SIZE(exynos_iodesc));
 

arch/arm/mach-exynos/common.c +0 -0

 	if (mach_desc)

arch/arm/mach-exynos/pm_domains.c +0 -7

 	},						\
 }
 
-#ifdef CONFIG_OF
 static void exynos_add_device_to_domain(struct exynos_pm_domain *pd,
 					 struct device *dev)
 {

@@ -193,12 +192,6 @@ static __init int exynos_pm_dt_parse_domains(void)
 
 	return 0;
 }
-#else
-static __init int exynos_pm_dt_parse_domains(void)
-{
-	return 0;
-}
-#endif /* CONFIG_OF */
 
 static __init __maybe_unused void exynos_pm_add_dev_to_genpd(struct
 platform_device *pdev, struct exynos_pm_domain *pd)

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-fimc.c deleted file mode 100644 index 6a45078..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-fimd0.c deleted file mode 100644 index 5665bb4..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c1.c deleted file mode 100644 index 8d2279c..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c2.c deleted file mode 100644 index 0ed62fc..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c3.c deleted file mode 100644 index 7787fd2..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c4.c deleted file mode 100644 index edc847f..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c5.c deleted file mode 100644 index d88af7f..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c6.c deleted file mode 100644 index c590286..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c7.c deleted file mode 100644 index 1bba755..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-keypad.c deleted file mode 100644 index 7862bfb..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-sdhci-gpio.c deleted file mode 100644 index d5b98c8..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-spi.c deleted file mode 100644 index 4999829..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-usb-phy.c deleted file mode 100644 index 6af4066..0000000

As we discussed in mailing list, non-DT for EXYNOS SoCs will not be supported from v3.11. This patch removes regarding files for non-DT including board files and defconfig.

Cc Sylwester Nawrocki <[email protected]>

Cc Tomasz Figa <[email protected]>

Cc Thomas Abraham <[email protected]>

Cc Kyungmin Park <[email protected]>

Cc Arnd Bergmann <[email protected]>

Cc Olof Johansson <[email protected]>

Signed-off-by Kukjin Kim <[email protected]>

---

It's time to remove non-DT stuff for EXYNOS SoCs.
If no objection on this, this will be sent to arm-soc in a couple of days.

- Kukjin

 arch/arm/configs/exynos4_defconfig         |   68 --
 arch/arm/mach-exynos/Kconfig               |  320 +------
 arch/arm/mach-exynos/Makefile              |   26 -
 arch/arm/mach-exynos/common.c              |   10 -
 arch/arm/mach-exynos/dev-ahci.c            |  255 -----
 arch/arm/mach-exynos/dev-ohci.c            |   52 --
 arch/arm/mach-exynos/dma.c                 |  322 -------
 arch/arm/mach-exynos/mach-armlex4210.c     |  207 -----
 arch/arm/mach-exynos/mach-nuri.c           | 1388
---------------------------- arch/arm/mach-exynos/mach-origen.c         | 
823 ----------------- arch/arm/mach-exynos/mach-smdk4x12.c       |  396
--------
 arch/arm/mach-exynos/mach-smdkv310.c       |  444 ---------
 arch/arm/mach-exynos/mach-universal_c210.c | 1159 -----------------------
 arch/arm/mach-exynos/pm_domains.c          |    7 -
 arch/arm/mach-exynos/setup-fimc.c          |   44 -
 arch/arm/mach-exynos/setup-fimd0.c         |   43 -
 arch/arm/mach-exynos/setup-i2c1.c          |   23 -
 arch/arm/mach-exynos/setup-i2c2.c          |   23 -
 arch/arm/mach-exynos/setup-i2c3.c          |   23 -
 arch/arm/mach-exynos/setup-i2c4.c          |   23 -
 arch/arm/mach-exynos/setup-i2c5.c          |   23 -
 arch/arm/mach-exynos/setup-i2c6.c          |   23 -
 arch/arm/mach-exynos/setup-i2c7.c          |   23 -
 arch/arm/mach-exynos/setup-keypad.c        |   36 -
 arch/arm/mach-exynos/setup-sdhci-gpio.c    |  152 ---
 arch/arm/mach-exynos/setup-spi.c           |   45 -
 arch/arm/mach-exynos/setup-usb-phy.c       |  223 -----
 27 files changed, 1 insertion(+), 6180 deletions(-)
 delete mode 100644 arch/arm/configs/exynos4_defconfig
 delete mode 100644 arch/arm/mach-exynos/dev-ahci.c
 delete mode 100644 arch/arm/mach-exynos/dev-ohci.c
 delete mode 100644 arch/arm/mach-exynos/dma.c
 delete mode 100644 arch/arm/mach-exynos/mach-armlex4210.c
 delete mode 100644 arch/arm/mach-exynos/mach-nuri.c
 delete mode 100644 arch/arm/mach-exynos/mach-origen.c
 delete mode 100644 arch/arm/mach-exynos/mach-smdk4x12.c
 delete mode 100644 arch/arm/mach-exynos/mach-smdkv310.c
 delete mode 100644 arch/arm/mach-exynos/mach-universal_c210.c
 delete mode 100644 arch/arm/mach-exynos/setup-fimc.c
 delete mode 100644 arch/arm/mach-exynos/setup-fimd0.c
 delete mode 100644 arch/arm/mach-exynos/setup-i2c1.c
 delete mode 100644 arch/arm/mach-exynos/setup-i2c2.c
 delete mode 100644 arch/arm/mach-exynos/setup-i2c3.c

 delete mode 100644 arch/arm/mach-exynos/setup-i2c4.c
 delete mode 100644 arch/arm/mach-exynos/setup-i2c5.c
 delete mode 100644 arch/arm/mach-exynos/setup-i2c6.c
 delete mode 100644 arch/arm/mach-exynos/setup-i2c7.c
 delete mode 100644 arch/arm/mach-exynos/setup-keypad.c
 delete mode 100644 arch/arm/mach-exynos/setup-sdhci-gpio.c
 delete mode 100644 arch/arm/mach-exynos/setup-spi.c
 delete mode 100644 arch/arm/mach-exynos/setup-usb-phy.c

(quoted diff) +0 -0

b/arch/arm/configs/exynos4_defconfig deleted file mode 100644 index bffe68e..0000000

arch/arm/mach-exynos/Kconfig +1 -319

index ff18fc2..41fd73f 100644
@@ -84,329 +84,11 @@ config SOC_EXYNOS5440
 	help
 	  Enable EXYNOS5440 SoC support
 
-config EXYNOS_ATAGS
-	bool "ATAGS based boot for EXYNOS (deprecated)"
-	depends on !ARCH_MULTIPLATFORM
-	depends on ATAGS
-	default y
-	help
-	  The EXYNOS platform is moving towards being completely probed
-	  through device tree. This enables support for board files using
-	  the traditional ATAGS boot format.
-	  Note that this option is not available for multiplatform builds.
-
-if EXYNOS_ATAGS
-
-config EXYNOS_DEV_DMA
-	bool
-	help
-	  Compile in amba device definitions for DMA controller
-
-config EXYNOS4_DEV_AHCI
-	bool
-	help
-	  Compile in platform device definitions for AHCI
-
-config EXYNOS4_SETUP_FIMD0
-	bool
-	help
-	  Common setup code for FIMD0.
-
-config EXYNOS4_DEV_USB_OHCI
-	bool
-	help
-	  Compile in platform device definition for USB OHCI
-
-config EXYNOS4_SETUP_I2C1
-	bool
-	help
-	  Common setup code for i2c bus 1.
-
-config EXYNOS4_SETUP_I2C2
-	bool
-	help
-	  Common setup code for i2c bus 2.
-
-config EXYNOS4_SETUP_I2C3
-	bool
-	help
-	  Common setup code for i2c bus 3.
-
-config EXYNOS4_SETUP_I2C4
-	bool
-	help
-	  Common setup code for i2c bus 4.
-
-config EXYNOS4_SETUP_I2C5
-	bool
-	help
-	  Common setup code for i2c bus 5.
-
-config EXYNOS4_SETUP_I2C6
-	bool
-	help
-	  Common setup code for i2c bus 6.
-
-config EXYNOS4_SETUP_I2C7
-	bool
-	help
-	  Common setup code for i2c bus 7.
-
-config EXYNOS4_SETUP_KEYPAD
-	bool
-	help
-	  Common setup code for keypad.
-
-config EXYNOS4_SETUP_SDHCI
-	bool
-	select EXYNOS4_SETUP_SDHCI_GPIO
-	help
-	  Internal helper functions for EXYNOS4 based SDHCI systems.
-
-config EXYNOS4_SETUP_SDHCI_GPIO
-	bool
-	help
-	  Common setup code for SDHCI gpio.
-
-config EXYNOS4_SETUP_FIMC
-	bool
-	help
-	  Common setup code for the camera interfaces.
-
-config EXYNOS4_SETUP_USB_PHY
-	bool
-	help
-	  Common setup code for USB PHY controller
-
-config EXYNOS_SETUP_SPI
-	bool
-	help
-	  Common setup code for SPI GPIO configurations.
-
-# machine support
-
-if ARCH_EXYNOS4
-
-comment "EXYNOS4210 Boards"
-
-config MACH_SMDKC210
-	bool "SMDKC210"
-	select MACH_SMDKV310
-	help
-	  Machine support for Samsung SMDKC210
-
-config MACH_SMDKV310
-	bool "SMDKV310"
-	select CPU_EXYNOS4210
-	select EXYNOS4_DEV_AHCI
-	select EXYNOS4_DEV_USB_OHCI
-	select EXYNOS4_SETUP_FIMD0
-	select EXYNOS4_SETUP_I2C1
-	select EXYNOS4_SETUP_KEYPAD
-	select EXYNOS4_SETUP_SDHCI
-	select EXYNOS4_SETUP_USB_PHY
-	select EXYNOS_DEV_DMA
-	select EXYNOS_DEV_SYSMMU
-	select S3C24XX_PWM
-	select S3C_DEV_HSMMC
-	select S3C_DEV_HSMMC1
-	select S3C_DEV_HSMMC2
-	select S3C_DEV_HSMMC3
-	select S3C_DEV_I2C1
-	select S3C_DEV_RTC
-	select S3C_DEV_USB_HSOTG
-	select S3C_DEV_WDT
-	select S5P_DEV_FIMC0
-	select S5P_DEV_FIMC1
-	select S5P_DEV_FIMC2
-	select S5P_DEV_FIMC3
-	select S5P_DEV_FIMD0
-	select S5P_DEV_G2D
-	select S5P_DEV_I2C_HDMIPHY
-	select S5P_DEV_JPEG
-	select S5P_DEV_MFC
-	select S5P_DEV_TV
-	select S5P_DEV_USB_EHCI
-	select SAMSUNG_DEV_BACKLIGHT
-	select SAMSUNG_DEV_KEYPAD
-	select SAMSUNG_DEV_PWM
-	help
-	  Machine support for Samsung SMDKV310
-
-config MACH_ARMLEX4210
-	bool "ARMLEX4210"
-	select CPU_EXYNOS4210
-	select EXYNOS4_DEV_AHCI
-	select EXYNOS4_SETUP_SDHCI
-	select EXYNOS_DEV_DMA
-	select S3C_DEV_HSMMC
-	select S3C_DEV_HSMMC2
-	select S3C_DEV_HSMMC3
-	select S3C_DEV_RTC
-	select S3C_DEV_WDT
-	help
-	  Machine support for Samsung ARMLEX4210 based on EXYNOS4210
-
-config MACH_UNIVERSAL_C210
-	bool "Mobile UNIVERSAL_C210 Board"
-	select CLKSRC_MMIO
-	select CLKSRC_SAMSUNG_PWM
-	select CPU_EXYNOS4210
-	select EXYNOS4_SETUP_FIMC
-	select EXYNOS4_SETUP_FIMD0
-	select EXYNOS4_SETUP_I2C1
-	select EXYNOS4_SETUP_I2C3
-	select EXYNOS4_SETUP_I2C5
-	select EXYNOS4_SETUP_SDHCI
-	select EXYNOS4_SETUP_USB_PHY
-	select EXYNOS_DEV_DMA
-	select EXYNOS_DEV_SYSMMU
-	select S3C_DEV_HSMMC
-	select S3C_DEV_HSMMC2
-	select S3C_DEV_HSMMC3
-	select S3C_DEV_I2C1
-	select S3C_DEV_I2C3
-	select S3C_DEV_I2C5
-	select S3C_DEV_USB_HSOTG
-	select S5P_DEV_CSIS0
-	select S5P_DEV_FIMC0
-	select S5P_DEV_FIMC1
-	select S5P_DEV_FIMC2
-	select S5P_DEV_FIMC3
-	select S5P_DEV_FIMD0
-	select S5P_DEV_G2D
-	select S5P_DEV_I2C_HDMIPHY
-	select S5P_DEV_JPEG
-	select S5P_DEV_MFC
-	select S5P_DEV_ONENAND
-	select S5P_DEV_TV
-	select S5P_GPIO_INT
-	select S5P_SETUP_MIPIPHY
-	help
-	  Machine support for Samsung Mobile Universal S5PC210 Reference
-	  Board.
-
-config MACH_NURI
-	bool "Mobile NURI Board"
-	select CPU_EXYNOS4210
-	select EXYNOS4_SETUP_FIMC
-	select EXYNOS4_SETUP_FIMD0
-	select EXYNOS4_SETUP_I2C1
-	select EXYNOS4_SETUP_I2C3
-	select EXYNOS4_SETUP_I2C5
-	select EXYNOS4_SETUP_I2C6
-	select EXYNOS4_SETUP_SDHCI
-	select EXYNOS4_SETUP_USB_PHY
-	select EXYNOS_DEV_DMA
-	select S3C_DEV_HSMMC
-	select S3C_DEV_HSMMC2
-	select S3C_DEV_HSMMC3
-	select S3C_DEV_I2C1
-	select S3C_DEV_I2C3
-	select S3C_DEV_I2C5
-	select S3C_DEV_I2C6
-	select S3C_DEV_RTC
-	select S3C_DEV_USB_HSOTG
-	select S3C_DEV_WDT
-	select S5P_DEV_CSIS0
-	select S5P_DEV_FIMC0
-	select S5P_DEV_FIMC1
-	select S5P_DEV_FIMC2
-	select S5P_DEV_FIMC3
-	select S5P_DEV_FIMD0
-	select S5P_DEV_G2D
-	select S5P_DEV_JPEG
-	select S5P_DEV_MFC
-	select S5P_DEV_USB_EHCI
-	select S5P_GPIO_INT
-	select S5P_SETUP_MIPIPHY
-	select SAMSUNG_DEV_ADC
-	select SAMSUNG_DEV_PWM
-	help
-	  Machine support for Samsung Mobile NURI Board.
-
-config MACH_ORIGEN
-	bool "ORIGEN"
-	select CPU_EXYNOS4210
-	select EXYNOS4_DEV_USB_OHCI
-	select EXYNOS4_SETUP_FIMD0
-	select EXYNOS4_SETUP_SDHCI
-	select EXYNOS4_SETUP_USB_PHY
-	select EXYNOS_DEV_DMA
-	select EXYNOS_DEV_SYSMMU
-	select S3C24XX_PWM
-	select S3C_DEV_HSMMC
-	select S3C_DEV_HSMMC2
-	select S3C_DEV_RTC
-	select S3C_DEV_USB_HSOTG
-	select S3C_DEV_WDT
-	select S5P_DEV_FIMC0
-	select S5P_DEV_FIMC1
-	select S5P_DEV_FIMC2
-	select S5P_DEV_FIMC3
-	select S5P_DEV_FIMD0
-	select S5P_DEV_G2D
-	select S5P_DEV_I2C_HDMIPHY
-	select S5P_DEV_JPEG
-	select S5P_DEV_MFC
-	select S5P_DEV_TV
-	select S5P_DEV_USB_EHCI
-	select SAMSUNG_DEV_BACKLIGHT
-	select SAMSUNG_DEV_PWM
-	help
-	  Machine support for ORIGEN based on Samsung EXYNOS4210
-
-comment "EXYNOS4212 Boards"
-
-config MACH_SMDK4212
-	bool "SMDK4212"
-	select EXYNOS4_SETUP_FIMD0
-	select EXYNOS4_SETUP_I2C1
-	select EXYNOS4_SETUP_I2C3
-	select EXYNOS4_SETUP_I2C7
-	select EXYNOS4_SETUP_KEYPAD
-	select EXYNOS4_SETUP_SDHCI
-	select EXYNOS4_SETUP_USB_PHY
-	select EXYNOS_DEV_DMA
-	select EXYNOS_DEV_SYSMMU
-	select S3C24XX_PWM
-	select S3C_DEV_HSMMC2
-	select S3C_DEV_HSMMC3
-	select S3C_DEV_I2C1
-	select S3C_DEV_I2C3
-	select S3C_DEV_I2C7
-	select S3C_DEV_RTC
-	select S3C_DEV_USB_HSOTG
-	select S3C_DEV_WDT
-	select S5P_DEV_FIMC0
-	select S5P_DEV_FIMC1
-	select S5P_DEV_FIMC2
-	select S5P_DEV_FIMC3
-	select S5P_DEV_FIMD0
-	select S5P_DEV_MFC
-	select SAMSUNG_DEV_BACKLIGHT
-	select SAMSUNG_DEV_KEYPAD
-	select SAMSUNG_DEV_PWM
-	select SOC_EXYNOS4212
-	help
-	  Machine support for Samsung SMDK4212
-
-comment "EXYNOS4412 Boards"
-
-config MACH_SMDK4412
-	bool "SMDK4412"
-	select MACH_SMDK4212
-	select SOC_EXYNOS4412
-	help
-	  Machine support for Samsung SMDK4412
-endif
-
-endif
-
 comment "Flattened Device Tree based board for EXYNOS SoCs"
 
 config MACH_EXYNOS4_DT
 	bool "Samsung Exynos4 Machine using device tree"
+	default y
 	depends on ARCH_EXYNOS4
 	select ARM_AMBA
 	select CLKSRC_OF

arch/arm/mach-exynos/Makefile +0 -26

index b09b027..9811f87 100644
@@ -32,16 +32,6 @@ AFLAGS_exynos-smc.o		:=-Wa,-march=armv7-a$(plus_sec)
 
 # machine support
 
-obj-$(CONFIG_MACH_SMDKC210)		+= mach-smdkv310.o
-obj-$(CONFIG_MACH_SMDKV310)		+= mach-smdkv310.o
-obj-$(CONFIG_MACH_ARMLEX4210)		+= mach-armlex4210.o
-obj-$(CONFIG_MACH_UNIVERSAL_C210)	+= mach-universal_c210.o
-obj-$(CONFIG_MACH_NURI)			+= mach-nuri.o
-obj-$(CONFIG_MACH_ORIGEN)		+= mach-origen.o
-
-obj-$(CONFIG_MACH_SMDK4212)		+= mach-smdk4x12.o
-obj-$(CONFIG_MACH_SMDK4412)		+= mach-smdk4x12.o
-
 obj-$(CONFIG_MACH_EXYNOS4_DT)		+= mach-exynos4-dt.o
 obj-$(CONFIG_MACH_EXYNOS5_DT)		+= mach-exynos5-dt.o
 

@@ -49,21 +39,5 @@ obj-$(CONFIG_MACH_EXYNOS5_DT)		+= mach-exynos5-dt.o
 
 obj-y					+= dev-uart.o
 obj-$(CONFIG_ARCH_EXYNOS4)		+= dev-audio.o
-obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-ahci.o
-obj-$(CONFIG_EXYNOS_DEV_DMA)		+= dma.o
-obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o
 
 obj-$(CONFIG_ARCH_EXYNOS)		+= setup-i2c0.o
-obj-$(CONFIG_EXYNOS4_SETUP_FIMC)	+= setup-fimc.o
-obj-$(CONFIG_EXYNOS4_SETUP_FIMD0)	+= setup-fimd0.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C1)	+= setup-i2c1.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C2)	+= setup-i2c2.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C3)	+= setup-i2c3.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C4)	+= setup-i2c4.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C5)	+= setup-i2c5.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C6)	+= setup-i2c6.o
-obj-$(CONFIG_EXYNOS4_SETUP_I2C7)	+= setup-i2c7.o
-obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)	+= setup-keypad.o
-obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
-obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)	+= setup-usb-phy.o
-obj-$(CONFIG_EXYNOS_SETUP_SPI)		+= setup-spi.o

arch/arm/mach-exynos/common.c +0 -4

index 027c9e7..de7c7d3 100644
@@ -353,7 +353,6 @@ void __init exynos_init_late(void)
 	exynos_pm_late_initcall();
 }
 
-#ifdef CONFIG_OF
 int __init exynos_fdt_map_chipid(unsigned long node, const char *uname,
 					int depth, void *data)
 {

@@ -376,7 +375,6 @@ int __init exynos_fdt_map_chipid(unsigned long node,
 const char *uname, iotable_init(&iodesc, 1);
 	return 1;
 }
-#endif
 
 /*
  * exynos_map_io

@@ -386,11 +384,9 @@ int __init exynos_fdt_map_chipid(unsigned long node,
 const char *uname,
 
 void __init exynos_init_io(struct map_desc *mach_desc, int size)
 {
-#ifdef CONFIG_OF
 	if (initial_boot_params)
 		of_scan_flat_dt(exynos_fdt_map_chipid, NULL);
 	else
-#endif
 		iotable_init(exynos_iodesc, ARRAY_SIZE(exynos_iodesc));
 

arch/arm/mach-exynos/common.c +0 -2

 	if (mach_desc)

@@ -473,10 +469,8 @@ void __init exynos_init_time(void)
 	};
 
 	if (of_have_populated_dt()) {
-#ifdef CONFIG_OF
 		of_clk_init(NULL);
 		clocksource_of_init();
-#endif
 	} else {
 		/* todo: remove after migrating legacy E4 platforms to dt */
 #ifdef CONFIG_ARCH_EXYNOS4

@@ -515,10 +509,8 @@ void __init exynos4_init_irq(void)
 
 	if (!of_have_populated_dt())
 		gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU,

gic_bank_offset, NULL); -#ifdef CONFIG_OF

arch/arm/mach-exynos/common.c +0 -3

 	else
 		irqchip_init();
-#endif
 
 	if (!of_have_populated_dt())
 		combiner_init(S5P_VA_COMBINER_BASE, NULL,

@@ -529,9 +521,7 @@ void __init exynos4_init_irq(void)
 
 void __init exynos5_init_irq(void)
 {
-#ifdef CONFIG_OF
 	irqchip_init();
-#endif
 	gic_arch_extn.irq_set_wake = s3c_irq_wake;
 }
 

(quoted diff) +0 -0

b/arch/arm/mach-exynos/dev-ahci.c deleted file mode 100644 index ce1aad3..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/dev-ohci.c deleted file mode 100644 index d5bc129..0000000

arch/arm/mach-exynos/dma.c deleted +0 -0

deleted file mode 100644
index 87e07d6..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/mach-armlex4210.c deleted file mode 100644 index 5f0f557..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/mach-nuri.c deleted file mode 100644 index 5c8b287..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/mach-origen.c deleted file mode 100644 index 27f03ed..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/mach-smdk4x12.c deleted file mode 100644 index 2c8af96..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/mach-smdkv310.c deleted file mode 100644 index d95b8cf..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/mach-universal_c210.c deleted file mode 100644 index 74ddb2b..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/pm_domains.c index 9f1351d..beb946d 100644

arch/arm/mach-exynos/pm_domains.c +0 -7

@@ -84,7 +84,6 @@ static struct exynos_pm_domain PD = {			\
 	},						\
 }
 
-#ifdef CONFIG_OF
 static void exynos_add_device_to_domain(struct exynos_pm_domain *pd,
 					 struct device *dev)
 {

@@ -193,12 +192,6 @@ static __init int exynos_pm_dt_parse_domains(void)
 
 	return 0;
 }
-#else
-static __init int exynos_pm_dt_parse_domains(void)
-{
-	return 0;
-}
-#endif /* CONFIG_OF */
 
 static __init __maybe_unused void exynos_pm_add_dev_to_genpd(struct
 platform_device *pdev, struct exynos_pm_domain *pd)

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-fimc.c deleted file mode 100644 index 6a45078..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-fimd0.c deleted file mode 100644 index 5665bb4..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c1.c deleted file mode 100644 index 8d2279c..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c2.c deleted file mode 100644 index 0ed62fc..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c3.c deleted file mode 100644 index 7787fd2..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c4.c deleted file mode 100644 index edc847f..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c5.c deleted file mode 100644 index d88af7f..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c6.c deleted file mode 100644 index c590286..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-i2c7.c deleted file mode 100644 index 1bba755..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-keypad.c deleted file mode 100644 index 7862bfb..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-sdhci-gpio.c deleted file mode 100644 index d5b98c8..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-spi.c deleted file mode 100644 index 4999829..0000000

(quoted diff) +0 -0

b/arch/arm/mach-exynos/setup-usb-phy.c deleted file mode 100644 index 6af4066..0000000

Hi Kukjin,

Quoted 62 lines · On Thursday 06 of June 2013 12:49:23 Kukjin Kim wrote:

As we discussed in mailing list, non-DT for EXYNOS SoCs will not be supported from v3.11. This patch removes regarding files for non-DT including board files and defconfig.

Cc Sylwester Nawrocki<[email protected]>

Cc Tomasz Figa<[email protected]>

Cc Thomas Abraham<[email protected]>

Cc Kyungmin Park<[email protected]>

Cc Arnd Bergmann<[email protected]>

Cc Olof Johansson<[email protected]>

Signed-off-by Kukjin Kim<[email protected]>

---

It's time to remove non-DT stuff for EXYNOS SoCs.
If no objection on this, this will be sent to arm-soc in a couple of days.

- Kukjin

  arch/arm/configs/exynos4_defconfig         |   68 --
  arch/arm/mach-exynos/Kconfig               |  320 +------
  arch/arm/mach-exynos/Makefile              |   26 -
  arch/arm/mach-exynos/common.c              |   10 -
  arch/arm/mach-exynos/dev-ahci.c            |  255 -----
  arch/arm/mach-exynos/dev-ohci.c            |   52 --
  arch/arm/mach-exynos/dma.c                 |  322 -------
  arch/arm/mach-exynos/mach-armlex4210.c     |  207 -----
  arch/arm/mach-exynos/mach-nuri.c           | 1388
---------------------------- arch/arm/mach-exynos/mach-origen.c         |
823 ----------------- arch/arm/mach-exynos/mach-smdk4x12.c       |  396
--------
  arch/arm/mach-exynos/mach-smdkv310.c       |  444 ---------
  arch/arm/mach-exynos/mach-universal_c210.c | 1159 -----------------------
  arch/arm/mach-exynos/pm_domains.c          |    7 -
  arch/arm/mach-exynos/setup-fimc.c          |   44 -
  arch/arm/mach-exynos/setup-fimd0.c         |   43 -
  arch/arm/mach-exynos/setup-i2c1.c          |   23 -
  arch/arm/mach-exynos/setup-i2c2.c          |   23 -
  arch/arm/mach-exynos/setup-i2c3.c          |   23 -
  arch/arm/mach-exynos/setup-i2c4.c          |   23 -
  arch/arm/mach-exynos/setup-i2c5.c          |   23 -
  arch/arm/mach-exynos/setup-i2c6.c          |   23 -
  arch/arm/mach-exynos/setup-i2c7.c          |   23 -
  arch/arm/mach-exynos/setup-keypad.c        |   36 -
  arch/arm/mach-exynos/setup-sdhci-gpio.c    |  152 ---
  arch/arm/mach-exynos/setup-spi.c           |   45 -
  arch/arm/mach-exynos/setup-usb-phy.c       |  223 -----
  27 files changed, 1 insertion(+), 6180 deletions(-)

delete mode 100644 arch/arm/configs/exynos4_defconfig delete mode 100644 arch/arm/mach-exynos/dev-ahci.c delete mode 100644 arch/arm/mach-exynos/dev-ohci.c delete mode 100644 arch/arm/mach-exynos/dma.c delete mode 100644 arch/arm/mach-exynos/mach-armlex4210.c delete mode 100644 arch/arm/mach-exynos/mach-nuri.c delete mode 100644 arch/arm/mach-exynos/mach-origen.c delete mode 100644 arch/arm/mach-exynos/mach-smdk4x12.c delete mode 100644 arch/arm/mach-exynos/mach-smdkv310.c delete mode 100644 arch/arm/mach-exynos/mach-universal_c210.c delete mode 100644 arch/arm/mach-exynos/setup-fimc.c delete mode 100644 arch/arm/mach-exynos/setup-fimd0.c delete mode 100644 arch/arm/mach-exynos/setup-i2c1.c delete mode 100644 arch/arm/mach-exynos/setup-i2c2.c delete mode 100644 arch/arm/mach-exynos/setup-i2c3.c

Quoted 9 lines

delete mode 100644 arch/arm/mach-exynos/setup-i2c4.c delete mode 100644 arch/arm/mach-exynos/setup-i2c5.c delete mode 100644 arch/arm/mach-exynos/setup-i2c6.c delete mode 100644 arch/arm/mach-exynos/setup-i2c7.c delete mode 100644 arch/arm/mach-exynos/setup-keypad.c delete mode 100644 arch/arm/mach-exynos/setup-sdhci-gpio.c delete mode 100644 arch/arm/mach-exynos/setup-spi.c delete mode 100644 arch/arm/mach-exynos/setup-usb-phy.c

Something is either wrong with the patch or my git/patch skills, because I can't apply this patch in any way, getting:

$ git am -3 \[PATCH\ V2\]\ ARM_EXYNOS_no\ more\ support\ non-DT\ for\ EXYNOS\
SoCs.mbox

Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001 ARM: EXYNOS: no more support non-DT for EXYNOS SoCs The copy of the patch that failed is found in:
/home/t.figa/linux-patches/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".

I will try to apply it manually, but it would be nice to know what I am doing wrong.

Quoted 83 lines · Tomasz Figa

Hi Kukjin,

Quoted 66 lines · On Thursday 06 of June 2013 12:49:23 Kukjin Kim wrote:

As we discussed in mailing list, non-DT for EXYNOS SoCs will not be supported from v3.11. This patch removes regarding files for non-DT including board files and defconfig.

Cc Sylwester Nawrocki<[email protected]>

Cc Tomasz Figa<[email protected]>

Cc Thomas Abraham<[email protected]>

Cc Kyungmin Park<[email protected]>

Cc Arnd Bergmann<[email protected]>

Cc Olof Johansson<[email protected]>

Signed-off-by Kukjin Kim<[email protected]>

---

It's time to remove non-DT stuff for EXYNOS SoCs.
If no objection on this, this will be sent to arm-soc in a couple of days.

- Kukjin

  arch/arm/configs/exynos4_defconfig         |   68 --
  arch/arm/mach-exynos/Kconfig               |  320 +------
  arch/arm/mach-exynos/Makefile              |   26 -
  arch/arm/mach-exynos/common.c              |   10 -
  arch/arm/mach-exynos/dev-ahci.c            |  255 -----
  arch/arm/mach-exynos/dev-ohci.c            |   52 --
  arch/arm/mach-exynos/dma.c                 |  322 -------
  arch/arm/mach-exynos/mach-armlex4210.c     |  207 -----
  arch/arm/mach-exynos/mach-nuri.c           | 1388

---------------------------- arch/arm/mach-exynos/mach-origen.c
| 823 ----------------- arch/arm/mach-exynos/mach-smdk4x12.c
| 396 --------

  arch/arm/mach-exynos/mach-smdkv310.c       |  444 ---------
  arch/arm/mach-exynos/mach-universal_c210.c | 1159
  ----------------------- arch/arm/mach-exynos/pm_domains.c         
  |    7 -
  arch/arm/mach-exynos/setup-fimc.c          |   44 -
  arch/arm/mach-exynos/setup-fimd0.c         |   43 -
  arch/arm/mach-exynos/setup-i2c1.c          |   23 -
  arch/arm/mach-exynos/setup-i2c2.c          |   23 -
  arch/arm/mach-exynos/setup-i2c3.c          |   23 -
  arch/arm/mach-exynos/setup-i2c4.c          |   23 -
  arch/arm/mach-exynos/setup-i2c5.c          |   23 -
  arch/arm/mach-exynos/setup-i2c6.c          |   23 -
  arch/arm/mach-exynos/setup-i2c7.c          |   23 -
  arch/arm/mach-exynos/setup-keypad.c        |   36 -
  arch/arm/mach-exynos/setup-sdhci-gpio.c    |  152 ---
  arch/arm/mach-exynos/setup-spi.c           |   45 -
  arch/arm/mach-exynos/setup-usb-phy.c       |  223 -----
  27 files changed, 1 insertion(+), 6180 deletions(-)

delete mode 100644 arch/arm/configs/exynos4_defconfig delete mode 100644 arch/arm/mach-exynos/dev-ahci.c delete mode 100644 arch/arm/mach-exynos/dev-ohci.c delete mode 100644 arch/arm/mach-exynos/dma.c delete mode 100644 arch/arm/mach-exynos/mach-armlex4210.c delete mode 100644 arch/arm/mach-exynos/mach-nuri.c delete mode 100644 arch/arm/mach-exynos/mach-origen.c delete mode 100644 arch/arm/mach-exynos/mach-smdk4x12.c delete mode 100644 arch/arm/mach-exynos/mach-smdkv310.c delete mode 100644 arch/arm/mach-exynos/mach-universal_c210.c delete mode 100644 arch/arm/mach-exynos/setup-fimc.c delete mode 100644 arch/arm/mach-exynos/setup-fimd0.c delete mode 100644 arch/arm/mach-exynos/setup-i2c1.c delete mode 100644 arch/arm/mach-exynos/setup-i2c2.c delete mode 100644 arch/arm/mach-exynos/setup-i2c3.c

Quoted 8 lines

delete mode 100644 arch/arm/mach-exynos/setup-i2c4.c delete mode 100644 arch/arm/mach-exynos/setup-i2c5.c delete mode 100644 arch/arm/mach-exynos/setup-i2c6.c delete mode 100644 arch/arm/mach-exynos/setup-i2c7.c delete mode 100644 arch/arm/mach-exynos/setup-keypad.c delete mode 100644 arch/arm/mach-exynos/setup-sdhci-gpio.c delete mode 100644 arch/arm/mach-exynos/setup-spi.c delete mode 100644 arch/arm/mach-exynos/setup-usb-phy.c

Something is either wrong with the patch or my git/patch skills, because I can't apply this patch in any way, getting:

$ git am -3 \[PATCH\ V2\]\ ARM_EXYNOS_no\ more\ support\ non-DT\ for\
EXYNOS\ SoCs.mbox

[...]

Quoted 13 lines

Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001 ARM: EXYNOS: no more support non-DT for EXYNOS SoCs>
The copy of the patch that failed is found in:
/home/t.figa/linux-patches/.git/rebase-apply/patch

When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".

Quoted 2 lines

I will try to apply it manually, but it would be nice to know what I am doing wrong.

Tomasz, you may use my branch, for-next or v3.11-next/remove-non-DT-exynos in samsung tree for test on your board.