Unverified Commit ff9fb2e8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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/soc

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.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 10b19646 170a0c56

arch/arm/configs/mini2440_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ CONFIG_BLK_DEV_INITRD=y 
# CONFIG_COMPAT_BRK is not set

CONFIG_ARCH_S3C24XX=y

CONFIG_S3C_ADC=y

CONFIG_S3C24XX_PWM=y

# CONFIG_CPU_S3C2410 is not set

CONFIG_CPU_S3C2440=y

CONFIG_MACH_MINI2440=y
@@ -228,6 +227,8 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y 
CONFIG_RTC_DRV_S3C=y

CONFIG_DMADEVICES=y

CONFIG_S3C24XX_DMAC=y

CONFIG_PWM=y

CONFIG_PWM_SAMSUNG=y

CONFIG_EXT2_FS=m

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

arch/arm/configs/s3c2410_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -358,6 +358,8 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_S3C=y

CONFIG_DMADEVICES=y

CONFIG_S3C24XX_DMAC=y

CONFIG_PWM=y

CONFIG_PWM_SAMSUNG=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

arch/arm/mach-s3c/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -207,14 +207,6 @@ config SAMSUNG_DEV_PWM 
	help

	  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

	def_bool y

arch/arm/mach-s3c/Kconfig.s3c24xx

+0 −2
Original line number Diff line number Diff line
@@ -532,7 +532,6 @@ config MACH_NEO1973_GTA02 
	select MFD_PCF50633

	select PCF50633_GPIO

	select POWER_SUPPLY

	select S3C24XX_PWM

	select S3C_DEV_USB_HOST

	help

	   Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone
@@ -544,7 +543,6 @@ config MACH_RX1950 
	select S3C2410_COMMON_DCLK

	select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ

	select S3C2440_XTAL_16934400

	select S3C24XX_PWM

	select S3C_DEV_NAND

	help

	   Say Y here if you're using HP iPAQ rx1950

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

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static const unsigned int tacc_tab[] = { 
/**

 * get_tacc - turn tACC value into cycle time

 * @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,

			     unsigned long val)