ARM: S5P64X0: no more support S5P6440 and S5P6450 SoCs
Subsystems (5)
PATCH 1/17 ARM: S5P64X0: no more support S5P6440 and S5P6450 SoCs
This patch removes supporting codes for s5p6440 and s5p6450 because seems no more used now. And if its supporting is required, DT based codes should be supprted next time.
---
Note: This is resending because previous sending has been rejected from ml because of big changes so re-created with using -D as per Arnd's suggestion.
Documentation/arm/Samsung/Overview.txt | 2 - arch/arm/Kconfig | 22 +- arch/arm/Makefile | 1 - arch/arm/configs/s5p64x0_defconfig | 68 --- arch/arm/mach-s5p64x0/Kconfig | 102 ---- arch/arm/mach-s5p64x0/Makefile | 36 -- arch/arm/mach-s5p64x0/Makefile.boot | 2 - arch/arm/mach-s5p64x0/clock-s5p6440.c | 632 ------------------- arch/arm/mach-s5p64x0/clock-s5p6450.c | 701 ---------------------- arch/arm/mach-s5p64x0/clock.c | 236 -------- arch/arm/mach-s5p64x0/clock.h | 38 -- arch/arm/mach-s5p64x0/common.c | 490 --------------- arch/arm/mach-s5p64x0/common.h | 56 -- arch/arm/mach-s5p64x0/dev-audio.c | 176 ------ arch/arm/mach-s5p64x0/dma.c | 128 ---- arch/arm/mach-s5p64x0/i2c.h | 16 - arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 32 - arch/arm/mach-s5p64x0/include/mach/dma.h | 26 - arch/arm/mach-s5p64x0/include/mach/gpio.h | 132 ---- arch/arm/mach-s5p64x0/include/mach/hardware.h | 18 - arch/arm/mach-s5p64x0/include/mach/irqs.h | 148 ----- arch/arm/mach-s5p64x0/include/mach/map.h | 96 --- arch/arm/mach-s5p64x0/include/mach/pm-core.h | 119 ---- arch/arm/mach-s5p64x0/include/mach/regs-clock.h | 98 --- arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 68 --- arch/arm/mach-s5p64x0/include/mach/regs-irq.h | 18 - arch/arm/mach-s5p64x0/irq-pm.c | 98 --- arch/arm/mach-s5p64x0/mach-smdk6440.c | 280 --------- arch/arm/mach-s5p64x0/mach-smdk6450.c | 299 --------- arch/arm/mach-s5p64x0/pm.c | 202 ------- arch/arm/mach-s5p64x0/setup-fb-24bpp.c | 29 - arch/arm/mach-s5p64x0/setup-i2c0.c | 38 -- arch/arm/mach-s5p64x0/setup-i2c1.c | 38 -- arch/arm/mach-s5p64x0/setup-sdhci-gpio.c | 104 ---- arch/arm/mach-s5p64x0/setup-spi.c | 38 -- arch/arm/plat-samsung/Kconfig | 14 +- arch/arm/plat-samsung/adc.c | 2 +- arch/arm/plat-samsung/include/plat/cpu.h | 19 - arch/arm/plat-samsung/include/plat/devs.h | 9 - arch/arm/plat-samsung/include/plat/fb.h | 7 - arch/arm/plat-samsung/include/plat/sdhci.h | 43 -- 41 files changed, 8 insertions(+), 4673 deletions(-) delete mode 100644 arch/arm/configs/s5p64x0_defconfig delete mode 100644 arch/arm/mach-s5p64x0/Kconfig delete mode 100644 arch/arm/mach-s5p64x0/Makefile delete mode 100644 arch/arm/mach-s5p64x0/Makefile.boot delete mode 100644 arch/arm/mach-s5p64x0/clock-s5p6440.c delete mode 100644 arch/arm/mach-s5p64x0/clock-s5p6450.c delete mode 100644 arch/arm/mach-s5p64x0/clock.c delete mode 100644 arch/arm/mach-s5p64x0/clock.h delete mode 100644 arch/arm/mach-s5p64x0/common.c delete mode 100644 arch/arm/mach-s5p64x0/common.h delete mode 100644 arch/arm/mach-s5p64x0/dev-audio.c delete mode 100644 arch/arm/mach-s5p64x0/dma.c delete mode 100644 arch/arm/mach-s5p64x0/i2c.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-s5p64x0/include/mach/dma.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/gpio.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/hardware.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/irqs.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/map.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/pm-core.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-clock.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-gpio.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-irq.h delete mode 100644 arch/arm/mach-s5p64x0/irq-pm.c delete mode 100644 arch/arm/mach-s5p64x0/mach-smdk6440.c delete mode 100644 arch/arm/mach-s5p64x0/mach-smdk6450.c delete mode 100644 arch/arm/mach-s5p64x0/pm.c delete mode 100644 arch/arm/mach-s5p64x0/setup-fb-24bpp.c delete mode 100644 arch/arm/mach-s5p64x0/setup-i2c0.c delete mode 100644 arch/arm/mach-s5p64x0/setup-i2c1.c delete mode 100644 arch/arm/mach-s5p64x0/setup-sdhci-gpio.c delete mode 100644 arch/arm/mach-s5p64x0/setup-spi.c
Documentation/arm/Samsung/Overview.txt +0 -2
@@ -13,7 +13,6 @@ Introduction - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list - S3C64XX: S3C6400 and S3C6410 - - S5P6440 - S5PC100 - S5PC110 / S5PV210
@@ -34,7 +33,6 @@ Configuration A number of configurations are supplied, as there is no current way of unifying all the SoCs into one kernel. - s5p6440_defconfig - S5P6440 specific default configuration s5pc100_defconfig - S5PC100 specific default configuration s5pc110_defconfig - S5PC110 specific default configuration s5pv210_defconfig - S5PV210 specific default configuration
arch/arm/Kconfig +1 -21
@@ -758,24 +758,6 @@ config ARCH_S3C64XX help Samsung S3C64XX series based systems -config ARCH_S5P64X0 - bool "Samsung S5P6440 S5P6450" - select ATAGS - select CLKDEV_LOOKUP - select CLKSRC_SAMSUNG_PWM - select CPU_V6 - select GENERIC_CLOCKEVENTS - select GPIO_SAMSUNG - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C2410_WATCHDOG if WATCHDOG - select HAVE_S3C_RTC if RTC_CLASS - select NEED_MACH_GPIO_H - select SAMSUNG_ATAGS - select SAMSUNG_WDT_RESET - help - Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440, - SMDK6450. - config ARCH_S5PC100 bool "Samsung S5PC100" select ARCH_REQUIRE_GPIOLIB
@@ -1004,8 +986,6 @@ source "arch/arm/mach-s3c24xx/Kconfig" source "arch/arm/mach-s3c64xx/Kconfig" -source "arch/arm/mach-s5p64x0/Kconfig" - source "arch/arm/mach-s5pc100/Kconfig" source "arch/arm/mach-s5pv210/Kconfig"
@@ -1569,7 +1549,7 @@ source kernel/Kconfig.preempt config HZ_FIXED int - default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \ + default 200 if ARCH_EBSA110 || ARCH_S3C24XX || \ ARCH_S5PV210 || ARCH_EXYNOS4 default AT91_TIMER_HZ if ARCH_AT91 default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY
arch/arm/Makefile +0 -1
@@ -187,7 +187,6 @@ machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_ARCH_RPC) += rpc machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx -machine-$(CONFIG_ARCH_S5P64X0) += s5p64x0 machine-$(CONFIG_ARCH_S5PC100) += s5pc100 machine-$(CONFIG_ARCH_S5PV210) += s5pv210 machine-$(CONFIG_ARCH_SA1100) += sa1100
arch/arm/configs/s5p64x0_defconfig deleted +0 -0
arch/arm/mach-s5p64x0/Kconfig deleted +0 -0
arch/arm/mach-s5p64x0/Makefile deleted +0 -0
arch/arm/mach-s5p64x0/Makefile.boot deleted +0 -0
arch/arm/mach-s5p64x0/clock-s5p6440.c deleted +0 -0
arch/arm/mach-s5p64x0/clock-s5p6450.c deleted +0 -0
arch/arm/mach-s5p64x0/clock.c deleted +0 -0
arch/arm/mach-s5p64x0/clock.h deleted +0 -0
arch/arm/mach-s5p64x0/common.c deleted +0 -0
arch/arm/mach-s5p64x0/common.h deleted +0 -0
arch/arm/mach-s5p64x0/dev-audio.c deleted +0 -0
arch/arm/mach-s5p64x0/dma.c deleted +0 -0
arch/arm/mach-s5p64x0/i2c.h deleted +0 -0
arch/arm/mach-s5p64x0/include/mach/debug-macro.S deleted +0 -0
arch/arm/mach-s5p64x0/include/mach/dma.h deleted +0 -0
arch/arm/mach-s5p64x0/include/mach/gpio.h deleted +0 -0
arch/arm/mach-s5p64x0/include/mach/hardware.h deleted +0 -0
arch/arm/mach-s5p64x0/include/mach/irqs.h deleted +0 -0
arch/arm/mach-s5p64x0/include/mach/map.h deleted +0 -0
arch/arm/mach-s5p64x0/include/mach/pm-core.h deleted +0 -0
arch/arm/mach-s5p64x0/include/mach/regs-clock.h deleted +0 -0
arch/arm/mach-s5p64x0/include/mach/regs-gpio.h deleted +0 -0
arch/arm/mach-s5p64x0/include/mach/regs-irq.h deleted +0 -0
arch/arm/mach-s5p64x0/irq-pm.c deleted +0 -0
arch/arm/mach-s5p64x0/mach-smdk6440.c deleted +0 -0
arch/arm/mach-s5p64x0/mach-smdk6450.c deleted +0 -0
arch/arm/mach-s5p64x0/pm.c deleted +0 -0
arch/arm/mach-s5p64x0/setup-fb-24bpp.c deleted +0 -0
arch/arm/mach-s5p64x0/setup-i2c0.c deleted +0 -0
arch/arm/mach-s5p64x0/setup-i2c1.c deleted +0 -0
arch/arm/mach-s5p64x0/setup-sdhci-gpio.c deleted +0 -0
arch/arm/mach-s5p64x0/setup-spi.c deleted +0 -0
arch/arm/plat-samsung/Kconfig +6 -8
@@ -15,7 +15,7 @@ config PLAT_SAMSUNG config PLAT_S5P bool - depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210) + depends on (ARCH_S5PC100 || ARCH_S5PV210) default y select ARCH_REQUIRE_GPIOLIB select ARM_VIC
@@ -29,7 +29,7 @@ config PLAT_S5P config SAMSUNG_PM bool - depends on PM && (PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5P64X0 || S5P_PM) + depends on PM && (PLAT_S3C24XX || ARCH_S3C64XX || S5P_PM) default y help Base platform power management code for samsung code
@@ -78,14 +78,14 @@ config SAMSUNG_CLKSRC used by newer systems such as the S3C64XX. config S5P_CLOCK - def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210) + def_bool (ARCH_S5PC100 || ARCH_S5PV210) help Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs # options for IRQ support config S5P_IRQ - def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210) + def_bool (ARCH_S5PC100 || ARCH_S5PV210) help Support common interrupt part for ARCH_S5P SoCs
@@ -93,7 +93,6 @@ config S5P_EXT_INT bool help Use the external interrupts (other than GPIO interrupts.) - Note: Do not choose this for S5P6440 and S5P6450. config S5P_GPIO_INT bool
@@ -143,7 +142,7 @@ config S3C_GPIO_TRACK config S5P_DEV_UART def_bool y - depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210) + depends on (ARCH_S5PC100 || ARCH_S5PV210) # ADC driver
@@ -397,7 +396,7 @@ config SAMSUNG_PM_GPIO config SAMSUNG_DMADEV bool "Use legacy Samsung DMA abstraction" - depends on CPU_S5PV210 || CPU_S5PC100 || ARCH_S5P64X0 || ARCH_S3C64XX + depends on CPU_S5PV210 || CPU_S5PC100 || ARCH_S3C64XX select DMADEVICES default y help
@@ -474,7 +473,6 @@ config S5P_PM bool help Common code for power management support on S5P and newer SoCs - Note: Do not select this for S5P6440 and S5P6450. config S5P_SLEEP bool
arch/arm/plat-samsung/adc.c +1 -1
@@ -43,7 +43,7 @@ enum s3c_cpu_type {TYPE_ADCV1 ,/* S3C24XX */ TYPE_ADCV11 ,/* S3C2443 */ TYPE_ADCV12 ,/* S3C2416, S3C2450 */ -TYPE_ADCV2 ,/* S3C64XX, S5P64X0, S5PC100 */ +TYPE_ADCV2 ,/* S3C64XX, S5PC100 */ TYPE_ADCV3, /* S5PV210, S5PC110, EXYNOS4210 */ };
arch/arm/plat-samsung/include/plat/cpu.h +0 -19
@@ -33,10 +33,6 @@ extern unsigned long samsung_cpu_id;#define S3C6410_CPU_ID 0x36410000#define S3C64XX_CPU_MASK 0xFFFFF000 -#define S5P6440_CPU_ID 0x56440000 -#define S5P6450_CPU_ID 0x36450000 -#define S5P64XX_CPU_MASK 0xFFFFF000 -#define S5PC100_CPU_ID 0x43100000#define S5PC100_CPU_MASK 0xFFFFF000
@@ -54,8 +50,6 @@ IS_SAMSUNG_CPU(s3c24xx, S3C24XX_CPU_ID, S3C24XX_CPU_MASK) IS_SAMSUNG_CPU(s3c2412, S3C2412_CPU_ID, S3C2412_CPU_MASK) IS_SAMSUNG_CPU(s3c6400, S3C6400_CPU_ID, S3C64XX_CPU_MASK) IS_SAMSUNG_CPU(s3c6410, S3C6410_CPU_ID, S3C64XX_CPU_MASK) -IS_SAMSUNG_CPU(s5p6440, S5P6440_CPU_ID, S5P64XX_CPU_MASK) -IS_SAMSUNG_CPU(s5p6450, S5P6450_CPU_ID, S5P64XX_CPU_MASK) IS_SAMSUNG_CPU(s5pc100, S5PC100_CPU_ID, S5PC100_CPU_MASK)IS_SAMSUNG_CPU (s5pv210,S5PV210_CPU_ID ,S5PV210_CPU_MASK )
@@ -86,18 +80,6 @@ IS_SAMSUNG_CPU(s5pv210, S5PV210_CPU_ID, S5PV210_CPU_MASK)# define soc_is_s3c64xx () 0#endif -#if defined(CONFIG_CPU_S5P6440 ) -# define soc_is_s5p6440 () is_samsung_s5p6440() -#else -# define soc_is_s5p6440 () 0 -#endif - -#if defined(CONFIG_CPU_S5P6450 ) -# define soc_is_s5p6450 () is_samsung_s5p6450() -#else -# define soc_is_s5p6450 () 0 -#endif -#if defined(CONFIG_CPU_S5PC100 )# define soc_is_s5pc100 () is_samsung_s5pc100()#else
@@ -177,7 +159,6 @@ extern struct bus_type s3c2440_subsys;extern struct bus_type s3c2442_subsys;extern struct bus_type s3c2443_subsys;extern struct bus_type s3c6410_subsys; -extern struct bus_type s5p64x0_subsys;extern struct bus_type s5pv210_subsys;extern void (*s5pc1xx_idle)(void );
arch/arm/plat-samsung/include/plat/devs.h +0 -9
@@ -94,15 +94,6 @@ extern struct platform_device s5p_device_mixer;extern struct platform_device s5p_device_onenand;extern struct platform_device s5p_device_sdo; -extern struct platform_device s5p6440_device_iis; -extern struct platform_device s5p6440_device_pcm; - -extern struct platform_device s5p6450_device_iis0; -extern struct platform_device s5p6450_device_iis1; -extern struct platform_device s5p6450_device_iis2; -extern struct platform_device s5p6450_device_pcm0; - -extern struct platform_device s5pc100_device_ac97;extern struct platform_device s5pc100_device_iis0;extern struct platform_device s5pc100_device_iis1;
arch/arm/plat-samsung/include/plat/fb.h +0 -7
@@ -61,11 +61,4 @@ extern void s5pv210_fb_gpio_setup_24bpp(void);*/ extern void exynos4_fimd0_gpio_setup_24bpp (void ); -/** -* s5p64x0_fb_gpio_setup_24bpp() - S5P6440/S5P6450 setup function for 24bpp LCD -* -* Initialise the GPIO for an 24bpp LCD display on the RGB interface. -*/ -extern void s5p64x0_fb_gpio_setup_24bpp (void ); -#endif /* __PLAT_S3C_FB_H */
arch/arm/plat-samsung/include/plat/sdhci.h +0 -43
55 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 8/17 ARM: S5PC100: no more support S5PC100 SoC
This patch removes supporting codes for s5pc100 because no more used now.
---
Note: This is resending because previous sending has been rejected from ml because of big changes so re-created with using -D as per Arnd's suggestion.
Documentation/arm/Samsung/Overview.txt | 9 - .../arm/Samsung/clksrc-change-registers.awk | 1 - arch/arm/Kconfig | 21 - arch/arm/Makefile | 1 - arch/arm/configs/s5pc100_defconfig | 49 - arch/arm/mach-s5pc100/Kconfig | 81 -- arch/arm/mach-s5pc100/Makefile | 32 - arch/arm/mach-s5pc100/Makefile.boot | 2 - arch/arm/mach-s5pc100/clock.c | 1361 -------------------- arch/arm/mach-s5pc100/common.c | 255 ---- arch/arm/mach-s5pc100/common.h | 30 - arch/arm/mach-s5pc100/dev-audio.c | 239 ---- arch/arm/mach-s5pc100/dma.c | 130 -- arch/arm/mach-s5pc100/include/mach/debug-macro.S | 39 - arch/arm/mach-s5pc100/include/mach/dma.h | 26 - arch/arm/mach-s5pc100/include/mach/entry-macro.S | 19 - arch/arm/mach-s5pc100/include/mach/gpio.h | 144 --- arch/arm/mach-s5pc100/include/mach/hardware.h | 14 - arch/arm/mach-s5pc100/include/mach/irqs.h | 115 -- arch/arm/mach-s5pc100/include/mach/map.h | 137 -- arch/arm/mach-s5pc100/include/mach/regs-clock.h | 80 -- arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 38 - arch/arm/mach-s5pc100/include/mach/regs-irq.h | 18 - arch/arm/mach-s5pc100/mach-smdkc100.c | 264 ---- arch/arm/mach-s5pc100/setup-fb-24bpp.c | 35 - arch/arm/mach-s5pc100/setup-i2c0.c | 28 - arch/arm/mach-s5pc100/setup-i2c1.c | 28 - arch/arm/mach-s5pc100/setup-ide.c | 57 - arch/arm/mach-s5pc100/setup-keypad.c | 23 - arch/arm/mach-s5pc100/setup-sdhci-gpio.c | 70 - arch/arm/mach-s5pc100/setup-spi.c | 41 - arch/arm/plat-samsung/Kconfig | 10 +- arch/arm/plat-samsung/adc.c | 2 +- arch/arm/plat-samsung/include/plat/cpu.h | 10 - arch/arm/plat-samsung/include/plat/devs.h | 8 - arch/arm/plat-samsung/include/plat/fb.h | 7 - arch/arm/plat-samsung/include/plat/s5p-clock.h | 2 +- arch/arm/plat-samsung/include/plat/sdhci.h | 34 - drivers/irqchip/Kconfig | 1 - 39 files changed, 7 insertions(+), 3454 deletions(-) delete mode 100644 arch/arm/configs/s5pc100_defconfig delete mode 100644 arch/arm/mach-s5pc100/Kconfig delete mode 100644 arch/arm/mach-s5pc100/Makefile delete mode 100644 arch/arm/mach-s5pc100/Makefile.boot delete mode 100644 arch/arm/mach-s5pc100/clock.c delete mode 100644 arch/arm/mach-s5pc100/common.c delete mode 100644 arch/arm/mach-s5pc100/common.h delete mode 100644 arch/arm/mach-s5pc100/dev-audio.c delete mode 100644 arch/arm/mach-s5pc100/dma.c delete mode 100644 arch/arm/mach-s5pc100/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-s5pc100/include/mach/dma.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-s5pc100/include/mach/gpio.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/hardware.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/irqs.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/map.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-clock.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-gpio.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-irq.h delete mode 100644 arch/arm/mach-s5pc100/mach-smdkc100.c delete mode 100644 arch/arm/mach-s5pc100/setup-fb-24bpp.c delete mode 100644 arch/arm/mach-s5pc100/setup-i2c0.c delete mode 100644 arch/arm/mach-s5pc100/setup-i2c1.c delete mode 100644 arch/arm/mach-s5pc100/setup-ide.c delete mode 100644 arch/arm/mach-s5pc100/setup-keypad.c delete mode 100644 arch/arm/mach-s5pc100/setup-sdhci-gpio.c delete mode 100644 arch/arm/mach-s5pc100/setup-spi.c
Documentation/arm/Samsung/Overview.txt +0 -9
@@ -13,7 +13,6 @@ Introduction - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list - S3C64XX: S3C6400 and S3C6410 - - S5PC100 - S5PC110 / S5PV210
@@ -33,7 +32,6 @@ Configuration A number of configurations are supplied, as there is no current way of unifying all the SoCs into one kernel. - s5pc100_defconfig - S5PC100 specific default configuration s5pc110_defconfig - S5PC110 specific default configuration s5pv210_defconfig - S5PV210 specific default configuration
@@ -65,13 +63,6 @@ Layout changes where to simplify the include and dependency issues involved with having so many different platform directories. - It was decided to remove plat-s5pc1xx as some of the support was already - in plat-s5p or plat-samsung, with the S5PC110 support added with S5PV210 - the only user was the S5PC100. The S5PC100 specific items where moved to - arch/arm/mach-s5pc100. - - - Port Contributors -----------------
Documentation/arm/Samsung/clksrc-change-registers.awk +0 -1
@@ -68,7 +68,6 @@ BEGIN { while (getline line < ARGV[1] > 0) { if (line ~ /\#define.*_MASK/ && - !(line ~ /S5PC100_EPLL_MASK/) && !(line ~ /USB_SIG_MASK/)) { splitdefine(line, fields) name = fields[0]
arch/arm/Kconfig +0 -21
@@ -758,24 +758,6 @@ config ARCH_S3C64XX help Samsung S3C64XX series based systems -config ARCH_S5PC100 - bool "Samsung S5PC100" - select ARCH_REQUIRE_GPIOLIB - select ATAGS - select CLKDEV_LOOKUP - select CLKSRC_SAMSUNG_PWM - select CPU_V7 - select GENERIC_CLOCKEVENTS - select GPIO_SAMSUNG - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C2410_WATCHDOG if WATCHDOG - select HAVE_S3C_RTC if RTC_CLASS - select NEED_MACH_GPIO_H - select SAMSUNG_ATAGS - select SAMSUNG_WDT_RESET - help - Samsung S5PC100 series based systems - config ARCH_S5PV210 bool "Samsung S5PV210/S5PC110" select ARCH_HAS_HOLES_MEMORYMODEL
@@ -986,8 +968,6 @@ source "arch/arm/mach-s3c24xx/Kconfig" source "arch/arm/mach-s3c64xx/Kconfig" -source "arch/arm/mach-s5pc100/Kconfig" - source "arch/arm/mach-s5pv210/Kconfig" source "arch/arm/mach-exynos/Kconfig"
@@ -2174,7 +2154,6 @@ menu "Power management options" source "kernel/power/Kconfig" config ARCH_SUSPEND_POSSIBLE - depends on !ARCH_S5PC100 depends on CPU_ARM920T || CPU_ARM926T || CPU_FEROCEON || CPU_SA1100 || \ CPU_V6 || CPU_V6K || CPU_V7 || CPU_V7M || CPU_XSC3 || CPU_XSCALE || CPU_MOHAWK def_bool y
arch/arm/Makefile +0 -1
@@ -187,7 +187,6 @@ machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_ARCH_RPC) += rpc machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx -machine-$(CONFIG_ARCH_S5PC100) += s5pc100 machine-$(CONFIG_ARCH_S5PV210) += s5pv210 machine-$(CONFIG_ARCH_SA1100) += sa1100 machine-$(CONFIG_ARCH_SHMOBILE) += shmobile
arch/arm/configs/s5pc100_defconfig deleted +0 -0
arch/arm/mach-s5pc100/Kconfig deleted +0 -0
arch/arm/mach-s5pc100/Makefile deleted +0 -0
arch/arm/mach-s5pc100/Makefile.boot deleted +0 -0
arch/arm/mach-s5pc100/clock.c deleted +0 -0
arch/arm/mach-s5pc100/common.c deleted +0 -0
arch/arm/mach-s5pc100/common.h deleted +0 -0
arch/arm/mach-s5pc100/dev-audio.c deleted +0 -0
arch/arm/mach-s5pc100/dma.c deleted +0 -0
arch/arm/mach-s5pc100/include/mach/debug-macro.S deleted +0 -0
arch/arm/mach-s5pc100/include/mach/dma.h deleted +0 -0
arch/arm/mach-s5pc100/include/mach/entry-macro.S deleted +0 -0
arch/arm/mach-s5pc100/include/mach/gpio.h deleted +0 -0
arch/arm/mach-s5pc100/include/mach/hardware.h deleted +0 -0
arch/arm/mach-s5pc100/include/mach/irqs.h deleted +0 -0
arch/arm/mach-s5pc100/include/mach/map.h deleted +0 -0
arch/arm/mach-s5pc100/include/mach/regs-clock.h deleted +0 -0
arch/arm/mach-s5pc100/include/mach/regs-gpio.h deleted +0 -0
arch/arm/mach-s5pc100/include/mach/regs-irq.h deleted +0 -0
arch/arm/mach-s5pc100/mach-smdkc100.c deleted +0 -0
arch/arm/mach-s5pc100/setup-fb-24bpp.c deleted +0 -0
arch/arm/mach-s5pc100/setup-i2c0.c deleted +0 -0
arch/arm/mach-s5pc100/setup-i2c1.c deleted +0 -0
arch/arm/mach-s5pc100/setup-ide.c deleted +0 -0
arch/arm/mach-s5pc100/setup-keypad.c deleted +0 -0
arch/arm/mach-s5pc100/setup-sdhci-gpio.c deleted +0 -0
arch/arm/mach-s5pc100/setup-spi.c deleted +0 -0
arch/arm/plat-samsung/Kconfig +5 -5
@@ -15,7 +15,7 @@ config PLAT_SAMSUNG config PLAT_S5P bool - depends on (ARCH_S5PC100 || ARCH_S5PV210) + depends on ARCH_S5PV210 default y select ARCH_REQUIRE_GPIOLIB select ARM_VIC
@@ -78,14 +78,14 @@ config SAMSUNG_CLKSRC used by newer systems such as the S3C64XX. config S5P_CLOCK - def_bool (ARCH_S5PC100 || ARCH_S5PV210) + def_bool ARCH_S5PV210 help Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs # options for IRQ support config S5P_IRQ - def_bool (ARCH_S5PC100 || ARCH_S5PV210) + def_bool ARCH_S5PV210 help Support common interrupt part for ARCH_S5P SoCs
@@ -142,7 +142,7 @@ config S3C_GPIO_TRACK config S5P_DEV_UART def_bool y - depends on (ARCH_S5PC100 || ARCH_S5PV210) + depends on ARCH_S5PV210 # ADC driver
@@ -396,7 +396,7 @@ config SAMSUNG_PM_GPIO config SAMSUNG_DMADEV bool "Use legacy Samsung DMA abstraction" - depends on CPU_S5PV210 || CPU_S5PC100 || ARCH_S3C64XX + depends on CPU_S5PV210 || ARCH_S3C64XX select DMADEVICES default y help
arch/arm/plat-samsung/adc.c +1 -1
@@ -43,7 +43,7 @@ enum s3c_cpu_type {TYPE_ADCV1 ,/* S3C24XX */ TYPE_ADCV11 ,/* S3C2443 */ TYPE_ADCV12 ,/* S3C2416, S3C2450 */ -TYPE_ADCV2 ,/* S3C64XX, S5PC100 */ +TYPE_ADCV2 ,/* S3C64XX */ TYPE_ADCV3, /* S5PV210, S5PC110, EXYNOS4210 */ };
arch/arm/plat-samsung/include/plat/cpu.h +0 -10
@@ -33,9 +33,6 @@ extern unsigned long samsung_cpu_id;#define S3C6410_CPU_ID 0x36410000#define S3C64XX_CPU_MASK 0xFFFFF000 -#define S5PC100_CPU_ID 0x43100000 -#define S5PC100_CPU_MASK 0xFFFFF000 -#define S5PV210_CPU_ID 0x43110000#define S5PV210_CPU_MASK 0xFFFFF000
@@ -50,7 +47,6 @@ IS_SAMSUNG_CPU(s3c24xx, S3C24XX_CPU_ID, S3C24XX_CPU_MASK) IS_SAMSUNG_CPU(s3c2412, S3C2412_CPU_ID, S3C2412_CPU_MASK) IS_SAMSUNG_CPU(s3c6400, S3C6400_CPU_ID, S3C64XX_CPU_MASK) IS_SAMSUNG_CPU(s3c6410, S3C6410_CPU_ID, S3C64XX_CPU_MASK) -IS_SAMSUNG_CPU(s5pc100, S5PC100_CPU_ID, S5PC100_CPU_MASK) IS_SAMSUNG_CPU(s5pv210, S5PV210_CPU_ID, S5PV210_CPU_MASK) #if defined(CONFIG_CPU_S3C2410) || defined(CONFIG_CPU_S3C2412) || \
@@ -80,12 +76,6 @@ IS_SAMSUNG_CPU(s5pv210, S5PV210_CPU_ID, S5PV210_CPU_MASK)# define soc_is_s3c64xx () 0#endif -#if defined(CONFIG_CPU_S5PC100 ) -# define soc_is_s5pc100 () is_samsung_s5pc100() -#else -# define soc_is_s5pc100 () 0 -#endif -#if defined(CONFIG_CPU_S5PV210 )# define soc_is_s5pv210 () is_samsung_s5pv210()#else
arch/arm/plat-samsung/include/plat/devs.h +0 -8
@@ -94,14 +94,6 @@ extern struct platform_device s5p_device_mixer;extern struct platform_device s5p_device_onenand;extern struct platform_device s5p_device_sdo; -extern struct platform_device s5pc100_device_ac97; -extern struct platform_device s5pc100_device_iis0; -extern struct platform_device s5pc100_device_iis1; -extern struct platform_device s5pc100_device_iis2; -extern struct platform_device s5pc100_device_pcm0; -extern struct platform_device s5pc100_device_pcm1; -extern struct platform_device s5pc100_device_spdif; -extern struct platform_device s5pv210_device_ac97;extern struct platform_device s5pv210_device_iis0;extern struct platform_device s5pv210_device_iis1;
arch/arm/plat-samsung/include/plat/fb.h +0 -7
@@ -41,13 +41,6 @@ extern void s5p_fimd0_set_platdata(struct s3c_fb_platdata *pd);extern void s3c64xx_fb_gpio_setup_24bpp (void );/** -* s5pc100_fb_gpio_setup_24bpp() - S5PC100 setup function for 24bpp LCD -* -* Initialise the GPIO for an 24bpp LCD display on the RGB interface. -*/ -extern void s5pc100_fb_gpio_setup_24bpp (void ); - -/** * s5pv210_fb_gpio_setup_24bpp() - S5PV210/S5PC110 setup function for 24bpp LCD * * Initialise the GPIO for an 24bpp LCD display on the RGB interface.
arch/arm/plat-samsung/include/plat/s5p-clock.h +1 -1
@@ -57,7 +57,7 @@ extern int s5p_gatectrl(void __iomem *reg, struct clk *clk, int enable);extern int s5p_epll_enable (struct clk *clk,int enable);extern unsigned long s5p_epll_get_rate (struct clk *clk); -/* SPDIF clk operations common for S5PC100/V210/C110 and Exynos4 */ +/* SPDIF clk operations common for S5PV210/C110 and Exynos4 */ extern int s5p_spdif_set_rate (struct clk *clk,unsigned long rate);extern unsigned long s5p_spdif_get_rate (struct clk *clk);
arch/arm/plat-samsung/include/plat/sdhci.h +0 -34
@@ -56,9 +56,6 @@ extern void s3c2416_setup_sdhci0_cfg_gpio(struct platform_device *, int w);extern void s3c2416_setup_sdhci1_cfg_gpio (struct platform_device *,int w);extern void s3c64xx_setup_sdhci0_cfg_gpio (struct platform_device *,int w);extern void s3c64xx_setup_sdhci1_cfg_gpio (struct platform_device *,int w); -extern void s5pc100_setup_sdhci0_cfg_gpio (struct platform_device *,int w); -extern void s5pc100_setup_sdhci1_cfg_gpio (struct platform_device *,int w); -extern void s5pc100_setup_sdhci2_cfg_gpio (struct platform_device *,int w);extern void s3c64xx_setup_sdhci2_cfg_gpio (struct platform_device *,int w);extern void s5pv210_setup_sdhci0_cfg_gpio (struct platform_device *,int w);extern void s5pv210_setup_sdhci1_cfg_gpio (struct platform_device *,int w);
@@ -147,37 +144,6 @@ static inline void s3c6400_default_sdhci2(void) { }#endif /* CONFIG_S3C64XX_SETUP_SDHCI */ -/* S5PC100 SDHCI setup */ - -#ifdef CONFIG_S5PC100_SETUP_SDHCI -static inline void s5pc100_default_sdhci0 (void ) -{ -#ifdef CONFIG_S3C_DEV_HSMMC - s3c_hsmmc0_def_platdata.cfg_gpio = s5pc100_setup_sdhci0_cfg_gpio; -#endif -} - -static inline void s5pc100_default_sdhci1 (void ) -{ -#ifdef CONFIG_S3C_DEV_HSMMC1 - s3c_hsmmc1_def_platdata.cfg_gpio = s5pc100_setup_sdhci1_cfg_gpio; -#endif -} - -static inline void s5pc100_default_sdhci2 (void ) -{ -#ifdef CONFIG_S3C_DEV_HSMMC2 - s3c_hsmmc2_def_platdata.cfg_gpio = s5pc100_setup_sdhci2_cfg_gpio; -#endif -} - -#else -static inline void s5pc100_default_sdhci0 (void ) { } -static inline void s5pc100_default_sdhci1 (void ) { } -static inline void s5pc100_default_sdhci2 (void ) { } - -#endif /* CONFIG_S5PC100_SETUP_SDHCI */ -/* S5PV210 SDHCI setup */ #ifdef CONFIG_S5PV210_SETUP_SDHCI
drivers/irqchip/Kconfig +0 -1
@@ -23,7 +23,6 @@ config ARM_VIC config ARM_VIC_NR int default 4 if ARCH_S5PV210 - default 3 if ARCH_S5PC100 default 2 depends on ARM_VIC help
Signature · 1 line
1.7.10.4
PATCH 8/17 ARM: S5PC100: no more support S5PC100 SoC
Quoted 29 lines · On Tuesday 01 July 2014 19:21:16 Kukjin Kim wrote:
arch/arm/plat-samsung/Kconfig +3
-3@@ -15,7 +15,7 @@ config PLAT_SAMSUNG config PLAT_S5P bool - depends on (ARCH_S5PC100 || ARCH_S5PV210) + depends on ARCH_S5PV210 default y select ARCH_REQUIRE_GPIOLIB select ARM_VIC@@ -78,14 +78,14 @@ config SAMSUNG_CLKSRC used by newer systems such as the S3C64XX. config S5P_CLOCK - def_bool (ARCH_S5PC100 || ARCH_S5PV210) + def_bool ARCH_S5PV210 help Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs # options for IRQ support config S5P_IRQ - def_bool (ARCH_S5PC100 || ARCH_S5PV210) + def_bool ARCH_S5PV210 help Support common interrupt part for ARCH_S5P SoCs
arch/arm/plat-samsung/Kconfig config S3C_GPIO_TRACK · line 148
Quoted 8 lines
arch/arm/plat-samsung/Kconfig +1
-1@@ -142,7 +142,7 @@ config S3C_GPIO_TRACK config S5P_DEV_UART def_bool y - depends on (ARCH_S5PC100 || ARCH_S5PV210) + depends on ARCH_S5PV210 # ADC driver
I guess the next logical step would be to either remove these entirely after the move to DT-only ARCH_S5PV210 obsoletes them, or to move the code back to mach-s5pv210, right?
arch/arm/plat-samsung/Kconfig config SAMSUNG_PM_GPIO · line 402
Quoted 7 lines
config
SAMSUNG_DMADEV
bool "Use legacy Samsung DMA abstraction"arch/arm/plat-samsung/Kconfig +1
-1- depends on CPU_S5PV210 || CPU_S5PC100 || ARCH_S3C64XX + depends on CPU_S5PV210 || ARCH_S3C64XX select DMADEVICES default y help
It would be good to just kill this one off now, as nothing uses it any more, but that's also a separate patch.
Arnd
PATCH 8/17 ARM: S5PC100: no more support S5PC100 SoC
Quoted 37 lines · Arnd Bergmann
Quoted 35 lines · On Tuesday 01 July 2014 19:21:16 Kukjin Kim wrote:
arch/arm/plat-samsung/Kconfig +4
-4@@ -15,7 +15,7 @@ config PLAT_SAMSUNG config PLAT_S5P bool - depends on (ARCH_S5PC100 || ARCH_S5PV210) + depends on ARCH_S5PV210 default y select ARCH_REQUIRE_GPIOLIB select ARM_VIC@@ -78,14 +78,14 @@ config SAMSUNG_CLKSRC used by newer systems such as the S3C64XX. config S5P_CLOCK - def_bool (ARCH_S5PC100 || ARCH_S5PV210) + def_bool ARCH_S5PV210 help Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs # options for IRQ support config S5P_IRQ - def_bool (ARCH_S5PC100 || ARCH_S5PV210) + def_bool ARCH_S5PV210 help Support common interrupt part for ARCH_S5P SoCs@@ -142,7 +142,7 @@ config S3C_GPIO_TRACK config S5P_DEV_UART def_bool y - depends on (ARCH_S5PC100 || ARCH_S5PV210) + depends on ARCH_S5PV210
Quoted 7 lines
arch/arm/plat-samsung/Kconfig config S3C_GPIO_TRACK · line 148
Quoted 2 lines
arch/arm/plat-samsung/Kconfig +0
-0# ADC driverI guess the next logical step would be to either remove these entirely after the move to DT-only
ARCH_S5PV210obsoletes them, or to move the code back to mach-s5pv210, right?
Yeah both are possible, but the latter would be more possible at this moment, I think. I will cleanup stuff in plat-samsung as you suggested :-)
Quoted 9 lines
arch/arm/plat-samsung/Kconfig config SAMSUNG_PM_GPIO · line 402
Quoted 8 lines
config
SAMSUNG_DMADEV
bool "Use legacy Samsung DMA abstraction"arch/arm/plat-samsung/Kconfig +1
-1- depends on CPU_S5PV210 || CPU_S5PC100 || ARCH_S3C64XX + depends on CPU_S5PV210 || ARCH_S3C64XX select DMADEVICES default y help
Quoted 3 lines
It would be good to just kill this one off now, as nothing uses it any more, but that's also a separate patch.
Maybe it is still used for s5pv210 and s3c64xx? If I misunderstand your comments, please kindly let me know.
Thanks,
Kukjin
PATCH 8/17 ARM: S5PC100: no more support S5PC100 SoC
Quoted 9 lines · On Tuesday 01 July 2014 21:18:07 Kukjin Kim wrote:
Quoted 9 lines
Quoted 8 lines
config
SAMSUNG_DMADEV
bool "Use legacy Samsung DMA abstraction"arch/arm/plat-samsung/Kconfig +1
-1- depends on CPU_S5PV210 || CPU_S5PC100 || ARCH_S3C64XX + depends on CPU_S5PV210 || ARCH_S3C64XX select DMADEVICES default y help
Quoted 5 lines
Quoted 3 lines
It would be good to just kill this one off now, as nothing uses it any more, but that's also a separate patch.
Maybe it is still used for s5pv210 and s3c64xx? If I misunderstand your comments, please kindly let me know.
samsung-dmadev used to be used in a number of device drivers, but I believe they have all been converted to using dmaengine interfaces now.
Arnd
PATCH 8/17 ARM: S5PC100: no more support S5PC100 SoC
In reply to Kukjin KimKukjin,
Quoted 6 lines · Kukjin Kim
This patch removes supporting codes for s5pc100 because no more used now.
Signed-off-by Kukjin Kim <[email protected]>Cc Russell King <[email protected]>---
...
Quoted 1 line
drivers/irqchip/Kconfig | 1 -
thx,
Jason.