Skip to content

Commit b3af859

Browse files
committed
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.
2 parents e74200e + ac875df commit b3af859

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

arch/arm/mach-exynos/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ menuconfig ARCH_EXYNOS
1717
select EXYNOS_PMU
1818
select EXYNOS_SROM
1919
select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
20-
select GPIOLIB
2120
select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5
2221
select HAVE_ARM_SCU if SMP
2322
select PINCTRL

drivers/pinctrl/samsung/Kconfig

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
#
55
config PINCTRL_SAMSUNG
66
bool
7-
depends on OF_GPIO
7+
select GPIOLIB
88
select PINMUX
99
select PINCONF
1010

1111
config PINCTRL_EXYNOS
1212
bool "Pinctrl common driver part for Samsung Exynos SoCs"
13-
depends on OF_GPIO
14-
depends on ARCH_EXYNOS || ARCH_S5PV210 || COMPILE_TEST
13+
depends on ARCH_EXYNOS || ARCH_S5PV210 || (COMPILE_TEST && OF)
1514
select PINCTRL_SAMSUNG
1615
select PINCTRL_EXYNOS_ARM if ARM && (ARCH_EXYNOS || ARCH_S5PV210)
1716
select PINCTRL_EXYNOS_ARM64 if ARM64 && ARCH_EXYNOS
@@ -26,12 +25,10 @@ config PINCTRL_EXYNOS_ARM64
2625

2726
config PINCTRL_S3C24XX
2827
bool "Samsung S3C24XX SoC pinctrl driver"
29-
depends on OF_GPIO
30-
depends on ARCH_S3C24XX || COMPILE_TEST
28+
depends on ARCH_S3C24XX || (COMPILE_TEST && OF)
3129
select PINCTRL_SAMSUNG
3230

3331
config PINCTRL_S3C64XX
3432
bool "Samsung S3C64XX SoC pinctrl driver"
35-
depends on OF_GPIO
36-
depends on ARCH_S3C64XX || COMPILE_TEST
33+
depends on ARCH_S3C64XX || (COMPILE_TEST && OF)
3734
select PINCTRL_SAMSUNG

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ static const struct samsung_pin_bank_data fsd_pin_banks2[] __initconst = {
770770
EXYNOS850_PIN_BANK_EINTN(3, 0x00, "gpq0"),
771771
};
772772

773-
const struct samsung_pin_ctrl fsd_pin_ctrl[] __initconst = {
773+
static const struct samsung_pin_ctrl fsd_pin_ctrl[] __initconst = {
774774
{
775775
/* pin-controller instance 0 FSYS0 data */
776776
.pin_banks = fsd_pin_banks0,

0 commit comments

Comments
 (0)