| Message ID | 51642dab.e844440a.0ad1.ffffc13f@mx.google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Kukjin Kim wrote: > > From: Kukjin Kim <kgene.kim@samsung.com> > > 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. > > Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> I'd like to send this patch for v3.10 in late branch, if possible. If any objections, please let me know. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/10/2013 12:34 PM, Kukjin Kim wrote: > Kukjin Kim wrote: >> >> From: Kukjin Kim <kgene.kim@samsung.com> >> >> 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. >> >> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> It looks OK to me. > I'd like to send this patch for v3.10 in late branch, if possible. > > If any objections, please let me know. > > - Kukjin Thanks, Sylwester -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wednesday 10 April 2013, Sylwester Nawrocki wrote: > On 04/10/2013 12:34 PM, Kukjin Kim wrote: > > Kukjin Kim wrote: > >> > >> From: Kukjin Kim <kgene.kim@samsung.com> > >> > >> 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. > >> > >> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> > > It looks OK to me. 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 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/10/2013 02:59 PM, Arnd Bergmann wrote: > On Wednesday 10 April 2013, Sylwester Nawrocki wrote: >> On 04/10/2013 12:34 PM, Kukjin Kim wrote: >>> Kukjin Kim wrote: >>>> >>>> From: Kukjin Kim <kgene.kim@samsung.com> >>>> >>>> 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. >>>> >>>> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> >> >> It looks OK to me. > > 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? 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 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wednesday 10 April 2013, Sylwester Nawrocki wrote: > 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. I still have hope to get those included. > 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. 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 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/10/13 22:55, Arnd Bergmann wrote: > On Wednesday 10 April 2013, Sylwester Nawrocki wrote: >> 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. > > I still have hope to get those included. > I agree and I asked Tomasz to re-send universal dt patch. >> 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. > > 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. > I think, if possible, keeping both way would be nice to us. Thanks. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/10/13 23:05, Kukjin Kim wrote: > On 04/10/13 22:55, Arnd Bergmann wrote: >> On Wednesday 10 April 2013, Sylwester Nawrocki wrote: >>> 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. >> >> I still have hope to get those included. >> > I agree and I asked Tomasz to re-send universal dt patch. > Hi Arnd and Olof, Is it possible to send one more pull-request for this and something like dt patches for exynos? - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Monday 22 April 2013, Kukjin Kim wrote: > On 04/10/13 23:05, Kukjin Kim wrote: > > On 04/10/13 22:55, Arnd Bergmann wrote: > >> On Wednesday 10 April 2013, Sylwester Nawrocki wrote: > >>> 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. > >> > >> I still have hope to get those included. > >> > > I agree and I asked Tomasz to re-send universal dt patch. > > > Hi Arnd and Olof, > > Is it possible to send one more pull-request for this and something like > dt patches for exynos? 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 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/23/13 04:11, Arnd Bergmann wrote: >>>> I still have hope to get those included. >>>> >>> I agree and I asked Tomasz to re-send universal dt patch. >>> >> Hi Arnd and Olof, >> >> Is it possible to send one more pull-request for this and something like >> dt patches for exynos? > > 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: > 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. > * Thomas Abraham's fix for the clk code Included in my late-dt branch for exynos. > * Tomasz Figa's patch to restore Universal C210 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... > * Whatever is needed to get USB working again on Arndale 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? > * Anything else that comes up that is really a bug fix. Yes, right. > * Getting the PWM and ADC drivers working with DT, that can > easily be done. OK. > * Possibly a patch to mark CONFIG_EXYNOS_ATAGS as broken, > if you think that helps. Yes. > but not: > > * The entire series to rework the PWM clock from Tomasz See above comments. > * The entire series to remove ATAGS support on Exynos OK. > * Any other non-bugfix patches > OK. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Kukjin Kim wrote: > [...] > Note that I will send this removing non-DT exynos support patch to > arm-soc tree after release v3.10-rc1. Just note that, as we discussed, this patch will be queued for v3.11. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/configs/exynos4_defconfig b/arch/arm/configs/exynos4_defconfig deleted file mode 100644 index bffe68e..0000000 diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index a62d979..b93d221 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -80,314 +80,13 @@ config SOC_EXYNOS5440 help Enable EXYNOS5440 SoC support -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 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 - select SAMSUNG_HRT - 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 - 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 diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index b09b027..9811f87 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -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 diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index a8570bf..d5c36fd 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -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 diff --git a/arch/arm/mach-exynos/dev-ahci.c b/arch/arm/mach-exynos/dev-ahci.c deleted file mode 100644 index ce1aad3..0000000 diff --git a/arch/arm/mach-exynos/dev-ohci.c b/arch/arm/mach-exynos/dev-ohci.c deleted file mode 100644 index d5bc129..0000000 diff --git a/arch/arm/mach-exynos/dma.c b/arch/arm/mach-exynos/dma.c deleted file mode 100644 index 87e07d6..0000000 diff --git a/arch/arm/mach-exynos/mach-armlex4210.c b/arch/arm/mach-exynos/mach-armlex4210.c deleted file mode 100644 index 2c23b65..0000000 diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c deleted file mode 100644 index 0c10852..0000000 diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c deleted file mode 100644 index f662345..0000000 diff --git a/arch/arm/mach-exynos/mach-smdk4x12.c b/arch/arm/mach-exynos/mach-smdk4x12.c deleted file mode 100644 index 184faa3..0000000 diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c deleted file mode 100644 index ee815a7..0000000 diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c deleted file mode 100644 index 72f08fd..0000000 diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c index 9f1351d..beb946d 100644 --- a/arch/arm/mach-exynos/pm_domains.c +++ b/arch/arm/mach-exynos/pm_domains.c @@ -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)