diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-04-01 17:12:31 +0200 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-04-01 17:12:31 +0200 |
| commit | de4fb176622d54a82ea3ceb7362392aaf5ff0b5a (patch) | |
| tree | 8b510763d14d89b97cd719e79834c84e095932d7 /arch/arm/mach-s3c | |
| parent | ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame() (diff) | |
| parent | ARM: 9189/1: decompressor: fix unneeded rebuilds of library objects (diff) | |
| download | linux-de4fb176622d54a82ea3ceb7362392aaf5ff0b5a.tar.xz linux-de4fb176622d54a82ea3ceb7362392aaf5ff0b5a.zip | |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/mach-s3c')
| -rw-r--r-- | arch/arm/mach-s3c/Kconfig.s3c64xx | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/gpio-samsung.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-jive.c | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c/Kconfig.s3c64xx b/arch/arm/mach-s3c/Kconfig.s3c64xx index f3fcb570edf5..af01675d8769 100644 --- a/arch/arm/mach-s3c/Kconfig.s3c64xx +++ b/arch/arm/mach-s3c/Kconfig.s3c64xx @@ -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 diff --git a/arch/arm/mach-s3c/gpio-samsung.c b/arch/arm/mach-s3c/gpio-samsung.c index 76ef415789f2..fda2c01f5a08 100644 --- a/arch/arm/mach-s3c/gpio-samsung.c +++ b/arch/arm/mach-s3c/gpio-samsung.c @@ -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, diff --git a/arch/arm/mach-s3c/mach-jive.c b/arch/arm/mach-s3c/mach-jive.c index 7d15b84ae217..0d7d408c3729 100644 --- a/arch/arm/mach-s3c/mach-jive.c +++ b/arch/arm/mach-s3c/mach-jive.c @@ -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; |