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

From: Kukjin Kim <[email protected]>

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

---
Recreated as per Arnd's suggestion with using -D option :-)

Thanks, Arnd.

 arch/arm/configs/exynos4_defconfig         |   68 --
 arch/arm/mach-exynos/Kconfig               |  303 +-----
 arch/arm/mach-exynos/Makefile              |   26 -
 arch/arm/mach-exynos/common.c              |    9 +-
 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     |  206 -----
 arch/arm/mach-exynos/mach-nuri.c           | 1387 ----------------------------
 arch/arm/mach-exynos/mach-origen.c         |  822 -----------------
 arch/arm/mach-exynos/mach-smdk4x12.c       |  395 --------
 arch/arm/mach-exynos/mach-smdkv310.c       |  443 ---------
 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, 3 insertions(+), 6155 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

deleted file mode 100644
index bffe68e..0000000

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

index a8570bf..d5c36fd 100644
@@ -357,7 +357,7 @@ void __init exynos_init_io(struct map_desc *mach_desc, int size)
 {
 	struct map_desc *iodesc = exynos_iodesc;
 	int iodesc_sz = ARRAY_SIZE(exynos_iodesc);
-#if defined(CONFIG_OF) && defined(CONFIG_ARCH_EXYNOS5)
+#if defined(CONFIG_ARCH_EXYNOS5)
 	unsigned long root = of_get_flat_dt_root();
 
 	/* initialize the io descriptors we need for initialization */

@@ -437,10 +437,8 @@ static void __init exynos5440_map_io(void)
 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

@@ -459,10 +457,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
 	else
 		irqchip_init();
-#endif
 
 	if (!of_have_populated_dt())
 		combiner_init(S5P_VA_COMBINER_BASE, NULL);

@@ -479,9 +475,8 @@ void __init exynos4_init_irq(void)
 
 void __init exynos5_init_irq(void)
 {
-#ifdef CONFIG_OF
 	irqchip_init();
-#endif
+
 	/*
 	 * The parameters of s5p_init_irq() are for VIC init.
 	 * Theses parameters should be NULL and 0 because EXYNOS4

deleted file mode 100644
index ce1aad3..0000000

deleted file mode 100644
index d5bc129..0000000

deleted file mode 100644
index 87e07d6..0000000

deleted file mode 100644
index 2c23b65..0000000

deleted file mode 100644
index 0c10852..0000000

deleted file mode 100644
index f662345..0000000

deleted file mode 100644
index 184faa3..0000000

deleted file mode 100644
index ee815a7..0000000

deleted file mode 100644
index 72f08fd..0000000

index 9f1351d..beb946d 100644
@@ -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)

deleted file mode 100644
index 6a45078..0000000

deleted file mode 100644
index 5665bb4..0000000

deleted file mode 100644
index 8d2279c..0000000

deleted file mode 100644
index 0ed62fc..0000000

deleted file mode 100644
index 7787fd2..0000000

deleted file mode 100644
index edc847f..0000000

deleted file mode 100644
index d88af7f..0000000

deleted file mode 100644
index c590286..0000000

deleted file mode 100644
index 1bba755..0000000

deleted file mode 100644
index 7862bfb..0000000

deleted file mode 100644
index e8d08bf..0000000

deleted file mode 100644
index 4999829..0000000

deleted file mode 100644
index b81cc56..0000000

1.8.2.1.339.g52a3e01

I'd like to send this patch for v3.10 in late branch, if possible.

If any objections, please let me know.

- Kukjin

It looks OK to me.

Thanks,
Sylwester

Ok. I am currently rebuilding my exynos multiplatform series on top of the branches merged yesterday, but keeping ATAGS support alive there.

Should I rebase on top of this patch instead?

Arnd

Hmm, it turns out we are still actively using some boards based on Exynos4210 EVT0 SoCs. And since it seems unlikely the patches from Tomasz [1] adding basic DT support for those will get merged for 3.10, it would be a bit inconvenient to remove the ATAGS support now, leaving Exynos4210 Rev. 0 not supported at all.

Not sure what's others opinion on that, and what would be an advantage of removing non-dt support for Exynos now, rather than in 3.11, vs. any possible inconvenience and regressions this could cause.

[1] http://www.spinics.net/lists/arm-kernel/msg235745.html

Thanks,
Sylwester

I still have hope to get those included.

A multiplatform kernel will not work on an ATAGS based Exynos platform, but I think we can have it both ways and allow either multiplatform DT-only or single-platform with both DT and ATAGS in 3.10.

Arnd

I agree and I asked Tomasz to re-send universal dt patch.

I think, if possible, keeping both way would be nice to us.

Thanks.

- Kukjin

Hi Arnd and Olof,

Is it possible to send one more pull-request for this and something like dt patches for exynos?

- Kukjin

I think it's too late for that now, let's just fix the broken pieces now and do the minimum amount of patches on top of what we have:

* Thomas Abraham's fix for the clk code
* Tomasz Figa's patch to restore Universal C210
* Whatever is needed to get USB working again on Arndale
* Anything else that comes up that is really a bug fix.
* Getting the PWM and ADC drivers working with DT, that can easily be done.
* Possibly a patch to mark CONFIG_EXYNOS_ATAGS as broken, if you think that helps.

but not:

* The entire series to rework the PWM clock from Tomasz
* The entire series to remove ATAGS support on Exynos
* Any other non-bugfix patches

Arnd

Agreed, but following has been sent to arm-soc as a name of 'dt-exynos2 for v3.10' at 4/10, even though its base should be fixed.

--------8<----------------8<---------
Sachin Kamat (5):
ARM: dts: Remove keypad entries from exynos4x12-pinctrl.dtsi
ARM: dts: Add keypad entries to Exynos4412 based Origen
ARM: dts: Add keypad entries to SMDK4412
ARM: dts: Add MFC clock entries for exynos4
ARM: dts: Update MFC documentation for clock entries

Vivek Gautam (5):
ARM: dts: Enabling samsung-usb2phy driver for exynos5250
ARM: dts: Enabling samsung-usb3phy driver for exynos5250
ARM: dts: Add device tree bindings for dwc3-exynos
ARM: dts: Enabling dwc3-exynos driver for exynos5250
ARM: EXYNOS: Enable XHCI support on exynos5

.../devicetree/bindings/media/s5p-mfc.txt | 5 ++

  .../devicetree/bindings/usb/exynos-usb.txt         | 34 +++++++++
  arch/arm/boot/dts/exynos4.dtsi                     |  2 +
  arch/arm/boot/dts/exynos4412-origen.dts            | 62 +++++++++++++++
  arch/arm/boot/dts/exynos4412-smdk4412.dts          | 87 
++++++++++++++++++++++
  arch/arm/boot/dts/exynos4x12-pinctrl.dtsi          | 56 --------------
  arch/arm/boot/dts/exynos5250.dtsi                  | 45 +++++++++++
  arch/arm/mach-exynos/Kconfig                       |  1 +
  8 files changed, 236 insertions(+), 56 deletions(-)

--------8<----------------8<---------

So I'd like to send below you mentioned with above.

Note that I will send this removing non-DT exynos support patch to arm-soc tree after release v3.10-rc1.

Included in my late-dt branch for exynos.

If you mean '[PATCH v2 0/3] ARM: EXYNOS: DT-enabled support for Universal C210', the series included but as I know, that depends on '[PATCH v5 00/14] ARM: samsung-time: Prepare for multiplatform support' you asked to postpone for v3.11...

Hmm, I'm not sure which patch is needed for this on Arndale, unfortunately, I don't have the platform...Probably above Vivek's patches?

Yes, right.

OK.

Yes.

See above comments.

OK.

OK.

- Kukjin

[...]

Just note that, as we discussed, this patch will be queued for v3.11.

- Kukjin