Skip to content

Commit 15b5b76

Browse files
committed
Merge tag 'samsung-soc-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/drivers
Samsung mach/soc changes for v5.19 Cleanup: drop unneeded CONFIG_S3C24XX_PWM and fix some typos. * tag 'samsung-soc-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: s3c: fix typos in comments ARM: s3c: Drop config symbol S3C24XX_PWM Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 7a3c3a6 + 170a0c5 commit 15b5b76

File tree

7 files changed

+7
-14
lines changed

7 files changed

+7
-14
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

arch/arm/mach-s3c/iotiming-s3c2410.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ static const unsigned int tacc_tab[] = {
259259
/**
260260
* get_tacc - turn tACC value into cycle time
261261
* @hclk_tns: The cycle time for HCLK, in 10ths of nanoseconds.
262-
* @val: The bank timing register value, shifed down.
262+
* @val: The bank timing register value, shifted down.
263263
*/
264264
static unsigned int get_tacc(unsigned long hclk_tns,
265265
unsigned long val)

arch/arm/mach-s3c/pm-s3c64xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ void s3c_pm_arch_update_uart(void __iomem *regs, struct pm_uart_save *save)
323323

324324
/* S3C64XX UART blocks only support level interrupts, so ensure that
325325
* when we restore unused UART blocks we force the level interrupt
326-
* settigs. */
326+
* settings. */
327327
save->ucon |= S3C2410_UCON_TXILEVEL | S3C2410_UCON_RXILEVEL;
328328

329329
/* We have a constraint on changing the clock type of the UART

arch/arm/mach-s3c/s3c24xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ static struct map_desc s3c_iodesc[] __initdata __maybe_unused = {
146146
IODESC_ENT(UART)
147147
};
148148

149-
/* read cpu identificaiton code */
149+
/* read cpu identification code */
150150

151151
static unsigned long s3c24xx_read_idcode_v5(void)
152152
{

0 commit comments

Comments
 (0)