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

Samsung mach/soc changes for v5.17

Browse Source 
1. Minor fixes for S3C platforms.
 2. Remove HAVE_S3C2410_I2C Kconfig symbol - not really useful.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmHAa9oQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD1zXcD/9w6pPEGaH9sDcCcWql11tX+x3iKc3G4IJD
 /ARDEpmdH3FI4uFLzKQ+vYOT6WyivTOcd5OOtWvGWDSi+GCHLYtvUExSd+fXXs7Z
 ZEdNQR+h18pmwL3A6GrQx+xXCM2j4Xhf3ETA+DSc86QhBvvAPc1ZlyK4vlt1NE0T
 N0ROuVENem9RWc+u263TMOuBeEHNAJ7R+gFTbilmkrBGT95iKn+7jBrSoQ1Y/iJV
 M6FXRoSQVRHYvAWTSdTAErK+0KPPjwKjshXrxrsW855gAd7lsUS6bp6A3sXKW+Uj
 30YVhY5p6tPbdPL0GvcjHBH9Hpnouak+YE441Gzy/PD1JCIlMYl8AA62fzZ8rccR
 Vyvo5IxKy9UG50MsbxVLN04l3CtG/RcYyKZEwgWi36u4qYpW1jQnymAdrBN8zVI0
 F/vSpGkYp96h/wz2RVW5ODF53wdoXo10AyEzmaG62h0moKy8SF76/RKlREehgzNn
 JknO6DDsKDMJ4cYBOrCRIJdywzj+xsBUZ82MaLLPqsfSKxXytDVlGvUK6KwD27VF
 1WVf/OkGNPcTsq0HQwgT93foPttVoxK4zj2nJAFtT5cnY/UcM54afMpa26SdlW5W
 Y3trAlnKmkCCKzcQ0WZTb5qfprau3gEJCObXzXK1D3+gPyTVIw+CQp45jEvh7Et2
 Wp9HrxXHRQ==
 =NRcm
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmHAodwACgkQmmx57+YA
 GNnM/Q/+LiFJp0V5gYiz2L2filRAlrrAc3cGDJr8FWTJttlAN7/UExWYSgKIlpyQ
 JphFkaHinLPxV+xsc7uFSz4ju5o30nK9alkMnuxYaQlCuYW2JinA0xSAVYkBRxym
 b2gcJhBvQNVr8DnGU+uaLOfmlEEGji+CEKIKAQl8l9ppCNGIz7HEPM27nOfInVLB
 XBB8B5pAZUuiZrrq60348D1ShB85bKI6UhadfcAinH1h0hj+/m4RN+9GoQiNqC20
 zt4ZzznQQXGhzV8kVQBD38Sq52s47kP0Xqsl9RZF/E6kn1XBDmMQ5k61g0XhZfV6
 +JyFcmK6BtCMYfF+8NEY5NYAl7J2cup99Sk+Bhy9n07/O0QlEde3xROsgcXutQ/l
 OKscfip0wRybpMIxBWdwe4YALIk2kW3h1Yn2Z5VqnuEzxEM/P6qTV7cUynwaETTZ
 b9YSbhUA1I0d35+ldujFLm/NSf/cjpk4jbIrA7noP0ySvQmD4nLvLdYznA6lFtn+
 d7EkZOOWbk772ZbIyxUcs9nNGgd7/eI/vP0j96ZeBugCJe87hc5yPdnor4p1m15P
 U9/eiv779D1CO5BPFxSwk6JbpvLg9TFpMv5efx7385k8YkrSSYMxgFOtZNrCS7sd
 qcI5tHyFfEwbzWyE0cyeefrAqkH6UcKz1fwk69cvM/rGwkNsJbM=
 =LTUb
 -----END PGP SIGNATURE-----

Merge tag 'samsung-soc-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc

Samsung mach/soc changes for v5.17

1. Minor fixes for S3C platforms.
2. Remove HAVE_S3C2410_I2C Kconfig symbol - not really useful.

* tag 'samsung-soc-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: samsung: Remove HAVE_S3C2410_I2C and use direct dependencies
  ARM: s3c: add one more "fallthrough" statement in Jive
  ARM: s3c: include header for prototype of s3c2410_modify_misccr

Link: https://lore.kernel.org/r/20211220115530.30961-3-krzysztof.kozlowski@canonical.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-12-20 16:31:40 +01:00
commit e91aad4b60
7 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@ -479,7 +479,6 @@ config ARCH_S3C24XX
select GPIO_SAMSUNG
select GPIOLIB
select GENERIC_IRQ_MULTI_HANDLER
select HAVE_S3C2410_I2C if I2C
select NEED_MACH_IO_H
select S3C2410_WATCHDOG
select SAMSUNG_ATAGS

1
arch/arm/mach-exynos/Kconfig
View File

@ -20,7 +20,6 @@ menuconfig ARCH_EXYNOS
select GPIOLIB
select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5
select HAVE_ARM_SCU if SMP
select HAVE_S3C2410_I2C if I2C
select PINCTRL
select PINCTRL_EXYNOS
select PM_GENERIC_DOMAINS if PM

1
arch/arm/mach-s3c/Kconfig.s3c64xx
View File

@ -12,7 +12,6 @@ menuconfig ARCH_S3C64XX
select COMMON_CLK_SAMSUNG
select GPIO_SAMSUNG if ATAGS
select GPIOLIB
select HAVE_S3C2410_I2C if I2C
select HAVE_TCM
select PLAT_SAMSUNG
select PM_GENERIC_DOMAINS if PM

1
arch/arm/mach-s3c/gpio-samsung.c
View File

@ -35,6 +35,7 @@
#include "gpio-core.h"
#include "gpio-cfg.h"
#include "gpio-cfg-helpers.h"
#include "hardware-s3c24xx.h"
#include "pm.h"
int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip,

1
arch/arm/mach-s3c/mach-jive.c
View File

@ -247,6 +247,7 @@ static int __init jive_mtdset(char *options)
case 1:
nand->nr_partitions = ARRAY_SIZE(jive_imageB_nand_part);
nand->partitions = jive_imageB_nand_part;
break;
case 0:
/* this is already setup in the nand info */
break;

1
arch/arm/mach-s5pv210/Kconfig
View File

@ -12,7 +12,6 @@ config ARCH_S5PV210
select CLKSRC_SAMSUNG_PWM
select COMMON_CLK_SAMSUNG
select GPIOLIB
select HAVE_S3C2410_I2C if I2C
select PINCTRL
select PINCTRL_EXYNOS
select SOC_SAMSUNG

10
drivers/i2c/busses/Kconfig
View File

@ -963,16 +963,10 @@ config I2C_RK3X
This driver can also be built as a module. If so, the module will
be called i2c-rk3x.
config HAVE_S3C2410_I2C
bool
help
This will include I2C support for Samsung SoCs. If you want to
include I2C support for any machine, kindly select this in the
respective Kconfig file.
config I2C_S3C2410
tristate "S3C/Exynos I2C Driver"
depends on HAVE_S3C2410_I2C || COMPILE_TEST
depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || \
ARCH_S5PV210 || COMPILE_TEST
help
Say Y here to include support for I2C controller in the
Samsung SoCs (S3C, S5Pv210, Exynos).