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

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

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 9193b2b7 3ac5f9db

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-exynos/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-s3c/Kconfig.s3c64xx

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-s3c/gpio-samsung.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-s3c/mach-jive.c

+1 −0
Original line number Diff line number Diff line
@@ -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;