Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On Thu, 2014-09-04 at 12:16 +0200, Paul Bolle wrote: On Wed, 2014-07-16 at 14:58 +0200, Tomasz Figa wrote: I had two patches fixing those, but apparently this was lost in action. The correct solution is s/PLAT_S5P/ARCH_S5PV210/. I will include this in a follow-up series if nobody objects. No one objected, as far as I know. Exactly the same references are still to be found in v3.17-rc3 and next-20140903. Perhaps someone actually familiar with this matter (ie, not me) could submit one or more patches that implement Tomasz' proposal. We're now at v3.17-rc5 and next-20140918 and nothing has changed. I raised this issue the day it hit linux-next. After two months it's still not fixed. Could anyone familiar with ARCH_S5PV210 please jump in? Thanks, Paul Bolle -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On 18.09.2014 21:29, Paul Bolle wrote: On Thu, 2014-09-04 at 12:16 +0200, Paul Bolle wrote: On Wed, 2014-07-16 at 14:58 +0200, Tomasz Figa wrote: I had two patches fixing those, but apparently this was lost in action. The correct solution is s/PLAT_S5P/ARCH_S5PV210/. I will include this in a follow-up series if nobody objects. No one objected, as far as I know. Exactly the same references are still to be found in v3.17-rc3 and next-20140903. Perhaps someone actually familiar with this matter (ie, not me) could submit one or more patches that implement Tomasz' proposal. We're now at v3.17-rc5 and next-20140918 and nothing has changed. I raised this issue the day it hit linux-next. After two months it's still not fixed. Could anyone familiar with ARCH_S5PV210 please jump in? Basically, it turned out that no respin was necessary and I didn't post those two patches. Now, I don't work for Samsung anymore, but let me see if I can find them in my private tree and then some time to send them. Best regards, Tomasz -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On Wed, 2014-07-16 at 15:00 +0200, Tomasz Figa wrote: On 16.07.2014 12:24, Paul Bolle wrote: On Fri, 2014-07-04 at 19:48 +0200, Tomasz Figa wrote: -config S5P_GPIO_DRVSTR - bool - help -Internal configuration to get and set correct GPIO driver strength -helper - This one is used (as a macro) in drivers/gpio/gpio-samsung.c. Is a patch that touches that macro queued somewhere? The code you mention should be removed as well as it's no longer needed. Will include in a follow-up series. Thanks for reporting this and remaining missed parts. That check for CONFIG_S5P_GPIO_DRVSTR is still present in v3.17-rc3 and next-20140903. Should I submit the trivial patch to remove it (and the dead code it hides)? Paul Bolle -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On Wed, 2014-07-16 at 14:58 +0200, Tomasz Figa wrote: On 16.07.2014 12:15, Paul Bolle wrote: After this patch that symbol is still referenced in: drivers/media/platform/Kconfig:159: depends on VIDEO_DEV VIDEO_V4L2 (PLAT_S5P || ARCH_EXYNOS) drivers/media/platform/Kconfig:169: depends on VIDEO_DEV VIDEO_V4L2 (PLAT_S5P || ARCH_EXYNOS) drivers/media/platform/Kconfig:177: depends on VIDEO_DEV VIDEO_V4L2 (PLAT_S5P || ARCH_EXYNOS) drivers/media/platform/exynos4-is/Kconfig:5:depends on (PLAT_S5P || ARCH_EXYNOS) drivers/media/platform/s5p-tv/Kconfig:11: depends on (PLAT_S5P || ARCH_EXYNOS) PM_RUNTIME drivers/usb/host/Kconfig:223: depends on PLAT_S5P || ARCH_EXYNOS drivers/usb/host/Kconfig:530: depends on PLAT_S5P || ARCH_EXYNOS Again, I assume patches to remove these references are pending. But is that correct? I had two patches fixing those, but apparently this was lost in action. The correct solution is s/PLAT_S5P/ARCH_S5PV210/. I will include this in a follow-up series if nobody objects. No one objected, as far as I know. Exactly the same references are still to be found in v3.17-rc3 and next-20140903. Perhaps someone actually familiar with this matter (ie, not me) could submit one or more patches that implement Tomasz' proposal. Paul Bolle -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On Thursday 04 September 2014, Paul Bolle wrote: On Wed, 2014-07-16 at 15:00 +0200, Tomasz Figa wrote: On 16.07.2014 12:24, Paul Bolle wrote: On Fri, 2014-07-04 at 19:48 +0200, Tomasz Figa wrote: -config S5P_GPIO_DRVSTR - bool - help -Internal configuration to get and set correct GPIO driver strength -helper - This one is used (as a macro) in drivers/gpio/gpio-samsung.c. Is a patch that touches that macro queued somewhere? The code you mention should be removed as well as it's no longer needed. Will include in a follow-up series. Thanks for reporting this and remaining missed parts. That check for CONFIG_S5P_GPIO_DRVSTR is still present in v3.17-rc3 and next-20140903. Should I submit the trivial patch to remove it (and the dead code it hides)? Yes, I think this one is an obvious candidate for removal. Arnd -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On Thu, 2014-07-17 at 12:10 +0200, Paul Bolle wrote: The strange thing is that it is dated Jun 3 2104. 2014 That must be my most common typo! Paul Bolle -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On Fri, 2014-07-04 at 19:48 +0200, Tomasz Figa wrote: After refactoring suspend/resume, which was last part with dependencies on legacy code, all Kconfig symbols related to Samsung ATAGS support can be deselected and more unused code removed. This includes most of s5p-* code as well, as s5pv210 was their last user. Signed-off-by: Tomasz Figa t.f...@samsung.com --- This one also landed in today's linux-next (ie, next-20140716). [...] diff --git a/arch/arm/mach-s5pv210/include/mach/gpio.h b/arch/arm/mach-s5pv210/include/mach/gpio.h deleted file mode 100644 index 6c8b903..000 This removed the single case were CONFIG_SAMSUNG_GPIO_EXTRA was used. [...] diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig [...] @@ -64,31 +51,6 @@ config SAMSUNG_ATAGS if SAMSUNG_ATAGS -# options for IRQ support - -config S5P_IRQ - def_bool ARCH_S5PV210 - help - Support common interrupt part for ARCH_S5P SoCs - -config S5P_EXT_INT - bool - help - Use the external interrupts (other than GPIO interrupts.) - -config S5P_GPIO_INT - bool - help - Common code for the GPIO interrupts (other than external interrupts.) - -# options for gpio configuration support - -config S5P_GPIO_DRVSTR - bool - help - Internal configuration to get and set correct GPIO driver strength - helper - config SAMSUNG_GPIO_EXTRA int Number of additional GPIO pins default 128 if SAMSUNG_GPIO_EXTRA128 So a second order effect is that SAMSUNG_GPIO_EXTRA can now be removed. Which implies that SAMSUNG_GPIO_EXTRA64 and SAMSUNG_GPIO_EXTRA128 can also be removed. Should I submit the trivial patch to do that or is a patch already queued somewhere? Paul Bolle -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On Fri, 2014-07-04 at 19:48 +0200, Tomasz Figa wrote: After refactoring suspend/resume, which was last part with dependencies on legacy code, all Kconfig symbols related to Samsung ATAGS support can be deselected and more unused code removed. This includes most of s5p-* code as well, as s5pv210 was their last user. Signed-off-by: Tomasz Figa t.f...@samsung.com --- I noticed another thing now this patch showed up in next-20140716. [...] diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index f8185b5..1091b0a 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -6,29 +6,16 @@ config PLAT_SAMSUNG bool - depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS + depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_EXYNOS || ARCH_S5PV210 default y select GENERIC_IRQ_CHIP select NO_IOPORT_MAP help Base platform code for all Samsung SoC based systems -config PLAT_S5P - bool - depends on ARCH_S5PV210 - default y - select ARCH_REQUIRE_GPIOLIB - select ARM_VIC - select NO_IOPORT_MAP - select PLAT_SAMSUNG - select S3C_GPIO_TRACK - select S5P_GPIO_DRVSTR - help - Base platform code for Samsung's S5P series SoC. - After this patch that symbol is still referenced in: drivers/media/platform/Kconfig:159: depends on VIDEO_DEV VIDEO_V4L2 (PLAT_S5P || ARCH_EXYNOS) drivers/media/platform/Kconfig:169: depends on VIDEO_DEV VIDEO_V4L2 (PLAT_S5P || ARCH_EXYNOS) drivers/media/platform/Kconfig:177: depends on VIDEO_DEV VIDEO_V4L2 (PLAT_S5P || ARCH_EXYNOS) drivers/media/platform/exynos4-is/Kconfig:5:depends on (PLAT_S5P || ARCH_EXYNOS) drivers/media/platform/s5p-tv/Kconfig:11: depends on (PLAT_S5P || ARCH_EXYNOS) PM_RUNTIME drivers/usb/host/Kconfig:223: depends on PLAT_S5P || ARCH_EXYNOS drivers/usb/host/Kconfig:530: depends on PLAT_S5P || ARCH_EXYNOS Again, I assume patches to remove these references are pending. But is that correct? Paul Bolle -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On Fri, 2014-07-04 at 19:48 +0200, Tomasz Figa wrote: After refactoring suspend/resume, which was last part with dependencies on legacy code, all Kconfig symbols related to Samsung ATAGS support can be deselected and more unused code removed. This includes most of s5p-* code as well, as s5pv210 was their last user. Signed-off-by: Tomasz Figa t.f...@samsung.com --- And I noticed another issue as this patch showed up in linux-next (this should be the last issue for this series). [...] diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index f8185b5..1091b0a 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig [...] @@ -64,31 +51,6 @@ config SAMSUNG_ATAGS if SAMSUNG_ATAGS -# options for IRQ support - -config S5P_IRQ - def_bool ARCH_S5PV210 - help - Support common interrupt part for ARCH_S5P SoCs - -config S5P_EXT_INT - bool - help - Use the external interrupts (other than GPIO interrupts.) - -config S5P_GPIO_INT - bool - help - Common code for the GPIO interrupts (other than external interrupts.) - -# options for gpio configuration support - -config S5P_GPIO_DRVSTR - bool - help - Internal configuration to get and set correct GPIO driver strength - helper - This one is used (as a macro) in drivers/gpio/gpio-samsung.c. Is a patch that touches that macro queued somewhere? config SAMSUNG_GPIO_EXTRA int Number of additional GPIO pins default 128 if SAMSUNG_GPIO_EXTRA128 Thanks, Paul Bolle -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On 16.07.2014 11:47, Paul Bolle wrote: On Fri, 2014-07-04 at 19:48 +0200, Tomasz Figa wrote: [snip] config SAMSUNG_GPIO_EXTRA int Number of additional GPIO pins default 128 if SAMSUNG_GPIO_EXTRA128 So a second order effect is that SAMSUNG_GPIO_EXTRA can now be removed. Which implies that SAMSUNG_GPIO_EXTRA64 and SAMSUNG_GPIO_EXTRA128 can also be removed. Should I submit the trivial patch to do that or is a patch already queued somewhere? Please do if you don't mind. That's one more thing I missed. Best regards, Tomasz -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On 16.07.2014 12:15, Paul Bolle wrote: On Fri, 2014-07-04 at 19:48 +0200, Tomasz Figa wrote: [snip] -config PLAT_S5P -bool -depends on ARCH_S5PV210 -default y -select ARCH_REQUIRE_GPIOLIB -select ARM_VIC -select NO_IOPORT_MAP -select PLAT_SAMSUNG -select S3C_GPIO_TRACK -select S5P_GPIO_DRVSTR -help - Base platform code for Samsung's S5P series SoC. - After this patch that symbol is still referenced in: drivers/media/platform/Kconfig:159: depends on VIDEO_DEV VIDEO_V4L2 (PLAT_S5P || ARCH_EXYNOS) drivers/media/platform/Kconfig:169: depends on VIDEO_DEV VIDEO_V4L2 (PLAT_S5P || ARCH_EXYNOS) drivers/media/platform/Kconfig:177: depends on VIDEO_DEV VIDEO_V4L2 (PLAT_S5P || ARCH_EXYNOS) drivers/media/platform/exynos4-is/Kconfig:5:depends on (PLAT_S5P || ARCH_EXYNOS) drivers/media/platform/s5p-tv/Kconfig:11: depends on (PLAT_S5P || ARCH_EXYNOS) PM_RUNTIME drivers/usb/host/Kconfig:223: depends on PLAT_S5P || ARCH_EXYNOS drivers/usb/host/Kconfig:530: depends on PLAT_S5P || ARCH_EXYNOS Again, I assume patches to remove these references are pending. But is that correct? I had two patches fixing those, but apparently this was lost in action. The correct solution is s/PLAT_S5P/ARCH_S5PV210/. I will include this in a follow-up series if nobody objects. Best regards, Tomasz -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On 16.07.2014 12:24, Paul Bolle wrote: On Fri, 2014-07-04 at 19:48 +0200, Tomasz Figa wrote: [snip] -config S5P_GPIO_DRVSTR -bool -help - Internal configuration to get and set correct GPIO driver strength - helper - This one is used (as a macro) in drivers/gpio/gpio-samsung.c. Is a patch that touches that macro queued somewhere? The code you mention should be removed as well as it's no longer needed. Will include in a follow-up series. Thanks for reporting this and remaining missed parts. Best regards, Tomasz -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On 04.07.2014 22:23, Arnd Bergmann wrote: On Friday 04 July 2014 19:48:18 Tomasz Figa wrote: After refactoring suspend/resume, which was last part with dependencies on legacy code, all Kconfig symbols related to Samsung ATAGS support can be deselected and more unused code removed. This includes most of s5p-* code as well, as s5pv210 was their last user. Signed-off-by: Tomasz Figa t.f...@samsung.com I actually found a few more, see patch below. Feel free to merge it into yours. Will add your patch to this series, if sending v2. Otherwise I guess it could be applied on top of it. As discussed on IRC, I have also done an experimental patch to move the few contents of mach-s5pv210 into mach-exynos, which turned out very simple and should be uncontroversial but needs more testing. Finally, there is some more cleanup potential in moving things out of plat-samsung into the individual platforms (s3c24xx, s3c64xx, exynos including s5pv210), as a lot of files are now only used on one of them. I tried moving everything that the combined mach-exynos needs out of plat-samsung, but that resulted in about 500-600 lines of duplication between s3c and exynos for pm-common.c, pm-common.h, pmdebug.c and pm-check.c, so those four files should probably remain shared for now. OK. Best regards, Tomasz -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
After refactoring suspend/resume, which was last part with dependencies on legacy code, all Kconfig symbols related to Samsung ATAGS support can be deselected and more unused code removed. This includes most of s5p-* code as well, as s5pv210 was their last user. Signed-off-by: Tomasz Figa t.f...@samsung.com --- arch/arm/mach-s5pv210/include/mach/dma.h| 26 -- arch/arm/mach-s5pv210/include/mach/gpio.h | 140 -- arch/arm/mach-s5pv210/include/mach/hardware.h | 18 -- arch/arm/mach-s5pv210/include/mach/irqs.h | 137 -- arch/arm/mach-s5pv210/include/mach/map.h| 158 arch/arm/mach-s5pv210/include/mach/memory.h | 27 -- arch/arm/mach-s5pv210/include/mach/pm-core.h| 46 arch/arm/mach-s5pv210/include/mach/regs-clock.h | 2 +- arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 41 --- arch/arm/mach-s5pv210/include/mach/regs-irq.h | 18 -- arch/arm/mach-s5pv210/setup-i2c0.c | 30 --- arch/arm/plat-samsung/Kconfig | 125 + arch/arm/plat-samsung/Makefile | 9 - arch/arm/plat-samsung/cpu.c | 1 - arch/arm/plat-samsung/devs.c| 330 arch/arm/plat-samsung/include/plat/camport.h| 28 -- arch/arm/plat-samsung/include/plat/cpu.h| 12 - arch/arm/plat-samsung/include/plat/devs.h | 42 --- arch/arm/plat-samsung/include/plat/fb-core.h| 15 -- arch/arm/plat-samsung/include/plat/fb.h | 22 -- arch/arm/plat-samsung/include/plat/fimc-core.h | 51 arch/arm/plat-samsung/include/plat/gpio-cfg.h | 64 - arch/arm/plat-samsung/include/plat/hdmi.h | 16 -- arch/arm/plat-samsung/include/plat/irqs.h | 72 -- arch/arm/plat-samsung/include/plat/mfc.h| 35 --- arch/arm/plat-samsung/include/plat/sdhci.h | 47 arch/arm/plat-samsung/include/plat/tv-core.h| 44 arch/arm/plat-samsung/pm-gpio.c | 4 +- arch/arm/plat-samsung/s5p-dev-mfc.c | 81 +- arch/arm/plat-samsung/s5p-dev-uart.c| 88 --- arch/arm/plat-samsung/s5p-irq-eint.c| 221 arch/arm/plat-samsung/s5p-irq-gpioint.c | 218 arch/arm/plat-samsung/s5p-irq-pm.c | 92 --- arch/arm/plat-samsung/s5p-irq.c | 31 --- arch/arm/plat-samsung/s5p-pm.c | 40 --- arch/arm/plat-samsung/s5p-sleep.S | 45 36 files changed, 14 insertions(+), 2362 deletions(-) delete mode 100644 arch/arm/mach-s5pv210/include/mach/dma.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/gpio.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/hardware.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/irqs.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/map.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/memory.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/pm-core.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/regs-gpio.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/regs-irq.h delete mode 100644 arch/arm/mach-s5pv210/setup-i2c0.c delete mode 100644 arch/arm/plat-samsung/include/plat/camport.h delete mode 100644 arch/arm/plat-samsung/include/plat/fimc-core.h delete mode 100644 arch/arm/plat-samsung/include/plat/hdmi.h delete mode 100644 arch/arm/plat-samsung/include/plat/irqs.h delete mode 100644 arch/arm/plat-samsung/include/plat/mfc.h delete mode 100644 arch/arm/plat-samsung/include/plat/tv-core.h delete mode 100644 arch/arm/plat-samsung/s5p-dev-uart.c delete mode 100644 arch/arm/plat-samsung/s5p-irq-eint.c delete mode 100644 arch/arm/plat-samsung/s5p-irq-gpioint.c delete mode 100644 arch/arm/plat-samsung/s5p-irq-pm.c delete mode 100644 arch/arm/plat-samsung/s5p-irq.c delete mode 100644 arch/arm/plat-samsung/s5p-pm.c delete mode 100644 arch/arm/plat-samsung/s5p-sleep.S diff --git a/arch/arm/mach-s5pv210/include/mach/dma.h b/arch/arm/mach-s5pv210/include/mach/dma.h deleted file mode 100644 index 201842a..000 diff --git a/arch/arm/mach-s5pv210/include/mach/gpio.h b/arch/arm/mach-s5pv210/include/mach/gpio.h deleted file mode 100644 index 6c8b903..000 diff --git a/arch/arm/mach-s5pv210/include/mach/hardware.h b/arch/arm/mach-s5pv210/include/mach/hardware.h deleted file mode 100644 index fada7a3..000 diff --git a/arch/arm/mach-s5pv210/include/mach/irqs.h b/arch/arm/mach-s5pv210/include/mach/irqs.h deleted file mode 100644 index 5e0de3a..000 diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h deleted file mode 100644 index 763929a..000 diff --git a/arch/arm/mach-s5pv210/include/mach/memory.h b/arch/arm/mach-s5pv210/include/mach/memory.h deleted file mode 100644 index 2d3cfa2..000 diff --git a/arch/arm/mach-s5pv210/include/mach/pm-core.h b/arch/arm/mach-s5pv210/include/mach/pm-core.h deleted file mode 100644
Re: [PATCH 18/19] ARM: SAMSUNG: Remove remaining legacy code
On Friday 04 July 2014 19:48:18 Tomasz Figa wrote: After refactoring suspend/resume, which was last part with dependencies on legacy code, all Kconfig symbols related to Samsung ATAGS support can be deselected and more unused code removed. This includes most of s5p-* code as well, as s5pv210 was their last user. Signed-off-by: Tomasz Figa t.f...@samsung.com I actually found a few more, see patch below. Feel free to merge it into yours. As discussed on IRC, I have also done an experimental patch to move the few contents of mach-s5pv210 into mach-exynos, which turned out very simple and should be uncontroversial but needs more testing. Finally, there is some more cleanup potential in moving things out of plat-samsung into the individual platforms (s3c24xx, s3c64xx, exynos including s5pv210), as a lot of files are now only used on one of them. I tried moving everything that the combined mach-exynos needs out of plat-samsung, but that resulted in about 500-600 lines of duplication between s3c and exynos for pm-common.c, pm-common.h, pmdebug.c and pm-check.c, so those four files should probably remain shared for now. Arnd commit c0157e3dcf12f9e5d6c41e143bd9ba2bb3fe406a Author: Arnd Bergmann a...@arndb.de Date: Fri Jul 4 21:10:39 2014 +0200 ARM: samsung: remove unused device definitions After the s5p platforms have all been deleted or turned into DT-only platforms, a lot of device definitions are now completely unused and can be removed. Signed-off-by: Arnd Bergmann a...@arndb.de diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 0eee25d..14bddde 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -55,22 +55,6 @@ config SAMSUNG_ATAGS if SAMSUNG_ATAGS -config SAMSUNG_GPIO_EXTRA - int Number of additional GPIO pins - default 128 if SAMSUNG_GPIO_EXTRA128 - default 64 if SAMSUNG_GPIO_EXTRA64 - default 0 - help - Use additional GPIO space in addition to the GPIO's the SOC - provides. This allows expanding the GPIO space for use with - GPIO expanders. - -config SAMSUNG_GPIO_EXTRA64 - bool - -config SAMSUNG_GPIO_EXTRA128 - bool - config S3C_GPIO_SPACE int Space between gpio banks default 0 @@ -112,11 +96,6 @@ config S3C_DEV_HSMMC2 help Compile in platform device definitions for HSMMC channel 2 -config S3C_DEV_HSMMC3 - bool - help - Compile in platform device definitions for HSMMC channel 3 - config S3C_DEV_HWMON bool help @@ -127,36 +106,6 @@ config S3C_DEV_I2C1 help Compile in platform device definitions for I2C channel 1 -config S3C_DEV_I2C2 - bool - help - Compile in platform device definitions for I2C channel 2 - -config S3C_DEV_I2C3 - bool - help - Compile in platform device definition for I2C controller 3 - -config S3C_DEV_I2C4 - bool - help - Compile in platform device definition for I2C controller 4 - -config S3C_DEV_I2C5 - bool - help - Compile in platform device definition for I2C controller 5 - -config S3C_DEV_I2C6 - bool - help - Compile in platform device definition for I2C controller 6 - -config S3C_DEV_I2C7 - bool - help - Compile in platform device definition for I2C controller 7 - config S3C_DEV_FB bool help @@ -272,7 +221,7 @@ config SAMSUNG_PM_GPIO config SAMSUNG_DMADEV bool Use legacy Samsung DMA abstraction - depends on CPU_S5PV210 || ARCH_S3C64XX + depends on ARCH_S3C64XX select DMADEVICES default y help diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 83c7d15..319c547 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -282,36 +282,6 @@ void s3c_sdhci2_set_platdata(struct s3c_sdhci_platdata *pd) } #endif /* CONFIG_S3C_DEV_HSMMC2 */ -#ifdef CONFIG_S3C_DEV_HSMMC3 -static struct resource s3c_hsmmc3_resource[] = { - [0] = DEFINE_RES_MEM(S3C_PA_HSMMC3, SZ_4K), - [1] = DEFINE_RES_IRQ(IRQ_HSMMC3), -}; - -struct s3c_sdhci_platdata s3c_hsmmc3_def_platdata = { - .max_width = 4, - .host_caps = (MMC_CAP_4_BIT_DATA | - MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED), -}; - -struct platform_device s3c_device_hsmmc3 = { - .name = s3c-sdhci, - .id = 3, - .num_resources = ARRAY_SIZE(s3c_hsmmc3_resource), - .resource = s3c_hsmmc3_resource, - .dev= { - .dma_mask = samsung_device_dma_mask, - .coherent_dma_mask = DMA_BIT_MASK(32), - .platform_data = s3c_hsmmc3_def_platdata, - }, -}; - -void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata *pd) -{ - s3c_sdhci_set_platdata(pd,