iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Samsung mach/soc changes for v5.19

Browse Source 
Cleanup: drop unneeded CONFIG_S3C24XX_PWM and fix some typos.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmJ01dkQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD114LD/9l2h3ijQW0XFx9A52Kyj8igaeh5QLThk01
 TzEe+LbgxRhIJ8A9zj2RdXnttWktVHXDJONU4Nc+5WxI5nZ6o7rVLaOWWl42w4R8
 4X4h0n1+ZDgZxoH42AIUnBTginNkhYJ9z98tkWARjtow2HAHpN1qbcLPlksdsUim
 o0gouSq/aJAWJ19VX8R4wG2D7lQXs9gPHlQrTeXOUf0onoXqvaqpKGZZN+5yP1GC
 zgXHgYH8wSe10Vgk7XppejvshyMmSzeBGws4bQmlmR+pCbCr2aAkunjOT9slocVb
 IXVb1xHi6JKf9/YCqqN3pdVwmQTTwxPc8U+tRNIN9175XUepmdSaS+P4a6h0G0IQ
 SMAWAOX7OcdnNTcCtju7hwo9VepDwuYD/r+P7C5zISRrQzBDipGSoErXF1iwhbLD
 Slblnfsc/A6nwxTbpLzUo6AdKIZ/5mCgs52F1z5SoHWmDEguzrSo1uPYx8kU1MJU
 3N5zV4rN8bHLiiPK4LljfcUy2ReYH0B3aDp7phPLd/Q/afNZh+jrOjIeD+w8MCyT
 X0v/rq9ln/dPcRy55UGN5RTbghKE4AfN6y6YVUF9JZe560bAkrn6PBpuZCHU5KuQ
 jDfPUpFmsvwxSRYAuqUB+AXWcszQEDahayg+yJiqQUspXE4sgG95RkTpD4Cin0J2
 zEl4ZPNk+A==
 =Z5fr
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmJ1iIwACgkQmmx57+YA
 GNm2wg/+Jyywc34DiM+vF2MB1TA61nRQDh1apXET3CVvOtZgDlzuL1s2HOp2KRgy
 DzQHQgRG6WeS8bN2TDrAUFTxjCy6udNoqwnEGW4BjAxfXzOGkyq74F2QYI2WOsM7
 oVPM5V68LwePwbq50iub9J0fIQJntswSGyp00isMqGZ8mNYrWPTWxw5PptOS/mlQ
 XJZXvl4Nuk18tcCy323ryVxi9PqdqtL9m33us4hc0tdnPYZMvbweVGNKu579EGf5
 9HIb2jIE7WLPm5Z+j8+hLBf19Ksf05zQquKd7TSSveVxNuQ2ZT8yUYyu6OVIQKPF
 p4XgqOlTFHNpUPkVn0zF9ZA248ZuPGAGJhLvcNb7fUfRff1pRBnKjmlVfvPbbWzI
 V+ZVYfRkhH0gcQLKrQ9ZvnE8DGSV4Aw67E809AZkZ7tF9Hj+Ni8CPkOvJv8RC/l9
 Bn/+PxWU32KC5eJ/JYqkhacqDxA5jCYh+xFDrYO1Vx4ShkcEceSYdZg8mtpriWZD
 Z4JUes+8BCvpILNRenSF6UzLCcdij8rSTk+Baq+h8NrjmAXXZP+IhKnblTygf55y
 rkrTgbhlFVIG4qAPl6GEuUTt1iFwPb/nlhsNwd3IsOKv2t25hKuDK/INCpLhMYOg
 X0zs4VkvsEDilnND4nBfqRd1aHKgxzmO+QVmFcG961qaS3dOePc=
 =5wp0
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-05-06 22:43:55 +02:00
commit ff9fb2e811
7 changed files with 7 additions and 14 deletions

3
arch/arm/configs/mini2440_defconfig

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

2
arch/arm/configs/s3c2410_defconfig

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

8
arch/arm/mach-s3c/Kconfig

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

2
arch/arm/mach-s3c/Kconfig.s3c24xx

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

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

@ -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)

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

@ -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
* when we restore unused UART blocks we force the level interrupt
* settigs. */
* settings. */
save->ucon |= S3C2410_UCON_TXILEVEL | S3C2410_UCON_RXILEVEL;
/* We have a constraint on changing the clock type of the UART

2
arch/arm/mach-s3c/s3c24xx.c

@ -146,7 +146,7 @@ static struct map_desc s3c_iodesc[] __initdata __maybe_unused = {
IODESC_ENT(UART)
};
/* read cpu identificaiton code */
/* read cpu identification code */
static unsigned long s3c24xx_read_idcode_v5(void)
{