Skip to content

Commit a086107

Browse files
Uwe Kleine-Königkrzk
authored andcommitted
ARM: s3c: Drop config symbol S3C24XX_PWM
The only effect of this symbol is to select PWM_SAMSUNG. Drop it and fix the affected defconfigs to still keep PWM_SAMSUNG=y. Developers using MACH_NEO1973_GTA02 and/or MACH_RX1950 now have to manually select PWM and PWM_SAMSUNG (and get the freedom to select is as a module or not at all). A side effect of this change is that allmodconfig now contains PWM_SAMSUNG=m (which was =y before). Signed-off-by: Uwe Kleine-König <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Krzysztof Kozlowski <[email protected]>
1 parent 3123109 commit a086107

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

arch/arm/configs/mini2440_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ CONFIG_BLK_DEV_INITRD=y
66
# CONFIG_COMPAT_BRK is not set
77
CONFIG_ARCH_S3C24XX=y
88
CONFIG_S3C_ADC=y
9-
CONFIG_S3C24XX_PWM=y
109
# CONFIG_CPU_S3C2410 is not set
1110
CONFIG_CPU_S3C2440=y
1211
CONFIG_MACH_MINI2440=y
@@ -228,6 +227,8 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
228227
CONFIG_RTC_DRV_S3C=y
229228
CONFIG_DMADEVICES=y
230229
CONFIG_S3C24XX_DMAC=y
230+
CONFIG_PWM=y
231+
CONFIG_PWM_SAMSUNG=y
231232
CONFIG_EXT2_FS=m
232233
CONFIG_EXT2_FS_XATTR=y
233234
CONFIG_EXT2_FS_POSIX_ACL=y

arch/arm/configs/s3c2410_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,8 @@ CONFIG_RTC_CLASS=y
358358
CONFIG_RTC_DRV_S3C=y
359359
CONFIG_DMADEVICES=y
360360
CONFIG_S3C24XX_DMAC=y
361+
CONFIG_PWM=y
362+
CONFIG_PWM_SAMSUNG=y
361363
CONFIG_EXT2_FS=y
362364
CONFIG_EXT2_FS_XATTR=y
363365
CONFIG_EXT2_FS_POSIX_ACL=y

arch/arm/mach-s3c/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -207,14 +207,6 @@ config SAMSUNG_DEV_PWM
207207
help
208208
Compile in platform device definition for PWM Timer
209209

210-
config S3C24XX_PWM
211-
bool "PWM device support"
212-
select PWM
213-
select PWM_SAMSUNG
214-
help
215-
Support for exporting the PWM timer blocks via the pwm device
216-
system
217-
218210
config GPIO_SAMSUNG
219211
def_bool y
220212

arch/arm/mach-s3c/Kconfig.s3c24xx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,6 @@ config MACH_NEO1973_GTA02
532532
select MFD_PCF50633
533533
select PCF50633_GPIO
534534
select POWER_SUPPLY
535-
select S3C24XX_PWM
536535
select S3C_DEV_USB_HOST
537536
help
538537
Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone
@@ -544,7 +543,6 @@ config MACH_RX1950
544543
select S3C2410_COMMON_DCLK
545544
select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
546545
select S3C2440_XTAL_16934400
547-
select S3C24XX_PWM
548546
select S3C_DEV_NAND
549547
help
550548
Say Y here if you're using HP iPAQ rx1950

0 commit comments

Comments
 (0)