Commit b3af8596 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'samsung-pinctrl-fixes-5.18' of... 

Merge tag 'samsung-pinctrl-fixes-5.18' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung into fixes

Samsung pinctrl drivers fixes for v5.18

1. Fix sparse warning introduced in v5.18-rc1.
2. Fix possible unmet Kconfig dependency with COMPILE_TEST, present
   since v4.3 or earlier.
parents e74200eb ac875df4

arch/arm/mach-exynos/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ menuconfig ARCH_EXYNOS 
	select EXYNOS_PMU

	select EXYNOS_SROM

	select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS

	select GPIOLIB

	select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5

	select HAVE_ARM_SCU if SMP

	select PINCTRL

drivers/pinctrl/samsung/Kconfig

+4 −7
Original line number Diff line number Diff line
@@ -4,14 +4,13 @@ 
#

config PINCTRL_SAMSUNG

	bool

	depends on OF_GPIO

	select GPIOLIB

	select PINMUX

	select PINCONF



config PINCTRL_EXYNOS

	bool "Pinctrl common driver part for Samsung Exynos SoCs"

	depends on OF_GPIO

	depends on ARCH_EXYNOS || ARCH_S5PV210 || COMPILE_TEST

	depends on ARCH_EXYNOS || ARCH_S5PV210 || (COMPILE_TEST && OF)

	select PINCTRL_SAMSUNG

	select PINCTRL_EXYNOS_ARM if ARM && (ARCH_EXYNOS || ARCH_S5PV210)

	select PINCTRL_EXYNOS_ARM64 if ARM64 && ARCH_EXYNOS
@@ -26,12 +25,10 @@ config PINCTRL_EXYNOS_ARM64 


config PINCTRL_S3C24XX

	bool "Samsung S3C24XX SoC pinctrl driver"

	depends on OF_GPIO

	depends on ARCH_S3C24XX || COMPILE_TEST

	depends on ARCH_S3C24XX || (COMPILE_TEST && OF)

	select PINCTRL_SAMSUNG



config PINCTRL_S3C64XX

	bool "Samsung S3C64XX SoC pinctrl driver"

	depends on OF_GPIO

	depends on ARCH_S3C64XX || COMPILE_TEST

	depends on ARCH_S3C64XX || (COMPILE_TEST && OF)

	select PINCTRL_SAMSUNG

drivers/pinctrl/samsung/pinctrl-exynos-arm64.c

+1 −1
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ static const struct samsung_pin_bank_data fsd_pin_banks2[] __initconst = { 
	EXYNOS850_PIN_BANK_EINTN(3, 0x00, "gpq0"),

};



const struct samsung_pin_ctrl fsd_pin_ctrl[] __initconst = {

static const struct samsung_pin_ctrl fsd_pin_ctrl[] __initconst = {

	{

		/* pin-controller instance 0 FSYS0 data */

		.pin_banks	= fsd_pin_banks0,