Commit 15b5b762 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'samsung-soc-5.19' of...

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/20220506081438.149192-6-krzysztof.kozlowski@linaro.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7a3c3a65 170a0c56
...@@ -6,7 +6,6 @@ CONFIG_BLK_DEV_INITRD=y ...@@ -6,7 +6,6 @@ CONFIG_BLK_DEV_INITRD=y
# CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_BRK is not set
CONFIG_ARCH_S3C24XX=y CONFIG_ARCH_S3C24XX=y
CONFIG_S3C_ADC=y CONFIG_S3C_ADC=y
CONFIG_S3C24XX_PWM=y
# CONFIG_CPU_S3C2410 is not set # CONFIG_CPU_S3C2410 is not set
CONFIG_CPU_S3C2440=y CONFIG_CPU_S3C2440=y
CONFIG_MACH_MINI2440=y CONFIG_MACH_MINI2440=y
...@@ -228,6 +227,8 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y ...@@ -228,6 +227,8 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_RTC_DRV_S3C=y CONFIG_RTC_DRV_S3C=y
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=y
CONFIG_S3C24XX_DMAC=y CONFIG_S3C24XX_DMAC=y
CONFIG_PWM=y
CONFIG_PWM_SAMSUNG=y
CONFIG_EXT2_FS=m CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_POSIX_ACL=y
......
...@@ -358,6 +358,8 @@ CONFIG_RTC_CLASS=y ...@@ -358,6 +358,8 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_S3C=y CONFIG_RTC_DRV_S3C=y
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=y
CONFIG_S3C24XX_DMAC=y CONFIG_S3C24XX_DMAC=y
CONFIG_PWM=y
CONFIG_PWM_SAMSUNG=y
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_POSIX_ACL=y
......
...@@ -207,14 +207,6 @@ config SAMSUNG_DEV_PWM ...@@ -207,14 +207,6 @@ config SAMSUNG_DEV_PWM
help help
Compile in platform device definition for PWM Timer Compile in platform device definition for PWM Timer
config S3C24XX_PWM
bool "PWM device support"
select PWM
select PWM_SAMSUNG
help
Support for exporting the PWM timer blocks via the pwm device
system
config GPIO_SAMSUNG config GPIO_SAMSUNG
def_bool y def_bool y
......
...@@ -532,7 +532,6 @@ config MACH_NEO1973_GTA02 ...@@ -532,7 +532,6 @@ config MACH_NEO1973_GTA02
select MFD_PCF50633 select MFD_PCF50633
select PCF50633_GPIO select PCF50633_GPIO
select POWER_SUPPLY select POWER_SUPPLY
select S3C24XX_PWM
select S3C_DEV_USB_HOST select S3C_DEV_USB_HOST
help help
Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone
...@@ -544,7 +543,6 @@ config MACH_RX1950 ...@@ -544,7 +543,6 @@ config MACH_RX1950
select S3C2410_COMMON_DCLK select S3C2410_COMMON_DCLK
select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
select S3C2440_XTAL_16934400 select S3C2440_XTAL_16934400
select S3C24XX_PWM
select S3C_DEV_NAND select S3C_DEV_NAND
help help
Say Y here if you're using HP iPAQ rx1950 Say Y here if you're using HP iPAQ rx1950
......
...@@ -259,7 +259,7 @@ static const unsigned int tacc_tab[] = { ...@@ -259,7 +259,7 @@ static const unsigned int tacc_tab[] = {
/** /**
* get_tacc - turn tACC value into cycle time * get_tacc - turn tACC value into cycle time
* @hclk_tns: The cycle time for HCLK, in 10ths of nanoseconds. * @hclk_tns: The cycle time for HCLK, in 10ths of nanoseconds.
* @val: The bank timing register value, shifed down. * @val: The bank timing register value, shifted down.
*/ */
static unsigned int get_tacc(unsigned long hclk_tns, static unsigned int get_tacc(unsigned long hclk_tns,
unsigned long val) unsigned long val)
......
...@@ -323,7 +323,7 @@ void s3c_pm_arch_update_uart(void __iomem *regs, struct pm_uart_save *save) ...@@ -323,7 +323,7 @@ void s3c_pm_arch_update_uart(void __iomem *regs, struct pm_uart_save *save)
/* S3C64XX UART blocks only support level interrupts, so ensure that /* S3C64XX UART blocks only support level interrupts, so ensure that
* when we restore unused UART blocks we force the level interrupt * when we restore unused UART blocks we force the level interrupt
* settigs. */ * settings. */
save->ucon |= S3C2410_UCON_TXILEVEL | S3C2410_UCON_RXILEVEL; save->ucon |= S3C2410_UCON_TXILEVEL | S3C2410_UCON_RXILEVEL;
/* We have a constraint on changing the clock type of the UART /* We have a constraint on changing the clock type of the UART
......
...@@ -146,7 +146,7 @@ static struct map_desc s3c_iodesc[] __initdata __maybe_unused = { ...@@ -146,7 +146,7 @@ static struct map_desc s3c_iodesc[] __initdata __maybe_unused = {
IODESC_ENT(UART) IODESC_ENT(UART)
}; };
/* read cpu identificaiton code */ /* read cpu identification code */
static unsigned long s3c24xx_read_idcode_v5(void) static unsigned long s3c24xx_read_idcode_v5(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment