Skip to content

Commit 82a65f0

Browse files
committed
Merge tag 'intel-pinctrl-v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel into devel
intel-pinctrl for v6.6-1 * New library driver for Intel MID to deduplicate code (Raag Jadav) * Reuse common functions from pinctrl-intel to reduce the code (Raag Jadav) * Move most of the exported functions to the PINCTRL_INTEL namespace * Make use of pm_ptr() in Bay Trail and Lynxpoint drivers * Introduce DEFINE_NOIRQ_DEV_PM_OPS() helper and use it in a few drivers * Consolidata ACPI dependency in Kconfig (Raag Jadav) * Fix address_space_handler() argument in Cherryview driver (Raag Jadav) * Optinmize byt_pin_config_set() to avoid IO in error cases (Raag Jadav) The following is an automated git shortlog grouped by driver: at91: - Switch to use DEFINE_NOIRQ_DEV_PM_OPS() helper baytrail: - Make use of pm_ptr() - reuse common functions from pinctrl-intel - consolidate common mask operation cherryview: - fix address_space_handler() argument - Switch to use DEFINE_NOIRQ_DEV_PM_OPS() helper - reuse common functions from pinctrl-intel intel: - consolidate ACPI dependency - Switch to use exported namespace - export common pinctrl functions lynxpoint: - Make use of pm_ptr() - reuse common functions from pinctrl-intel Merge patch series: - Merge patch series "Introduce Intel Tangier pinctrl driver" - Merge patch series "Reuse common functions from pinctrl-intel" merrifield: - Adapt to Intel Tangier driver moorefield: - Adapt to Intel Tangier driver mvebu: - Switch to use DEFINE_NOIRQ_DEV_PM_OPS() helper pm: - Introduce DEFINE_NOIRQ_DEV_PM_OPS() helper renesas: - Switch to use DEFINE_NOIRQ_DEV_PM_OPS() helper tangier: - Introduce Intel Tangier driver tegra: - Switch to use DEFINE_NOIRQ_DEV_PM_OPS() helper Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2 parents 69657e6 + d5301c9 commit 82a65f0

33 files changed

+905
-1613
lines changed

drivers/pinctrl/intel/Kconfig

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# SPDX-License-Identifier: GPL-2.0
22
# Intel pin control drivers
33
menu "Intel pinctrl drivers"
4-
depends on X86 || COMPILE_TEST
4+
depends on ACPI && (X86 || COMPILE_TEST)
55

66
config PINCTRL_BAYTRAIL
77
bool "Intel Baytrail GPIO pin control"
8-
depends on ACPI
98
select PINCTRL_INTEL
109
help
1110
driver for memory mapped GPIO functionality on Intel Baytrail
@@ -17,47 +16,19 @@ config PINCTRL_BAYTRAIL
1716

1817
config PINCTRL_CHERRYVIEW
1918
tristate "Intel Cherryview/Braswell pinctrl and GPIO driver"
20-
depends on ACPI
2119
select PINCTRL_INTEL
2220
help
2321
Cherryview/Braswell pinctrl driver provides an interface that
2422
allows configuring of SoC pins and using them as GPIOs.
2523

2624
config PINCTRL_LYNXPOINT
2725
tristate "Intel Lynxpoint pinctrl and GPIO driver"
28-
depends on ACPI
29-
select PINMUX
30-
select PINCONF
31-
select GENERIC_PINCONF
32-
select GPIOLIB
33-
select GPIOLIB_IRQCHIP
26+
select PINCTRL_INTEL
3427
help
3528
Lynxpoint is the PCH of Intel Haswell. This pinctrl driver
3629
provides an interface that allows configuring of PCH pins and
3730
using them as GPIOs.
3831

39-
config PINCTRL_MERRIFIELD
40-
tristate "Intel Merrifield pinctrl driver"
41-
depends on X86_INTEL_MID
42-
select PINMUX
43-
select PINCONF
44-
select GENERIC_PINCONF
45-
help
46-
Merrifield Family-Level Interface Shim (FLIS) driver provides an
47-
interface that allows configuring of SoC pins and using them as
48-
GPIOs.
49-
50-
config PINCTRL_MOOREFIELD
51-
tristate "Intel Moorefield pinctrl driver"
52-
depends on X86_INTEL_MID
53-
select PINMUX
54-
select PINCONF
55-
select GENERIC_PINCONF
56-
help
57-
Moorefield Family-Level Interface Shim (FLIS) driver provides an
58-
interface that allows configuring of SoC pins and using them as
59-
GPIOs.
60-
6132
config PINCTRL_INTEL
6233
tristate
6334
select PINMUX
@@ -68,111 +39,97 @@ config PINCTRL_INTEL
6839

6940
config PINCTRL_ALDERLAKE
7041
tristate "Intel Alder Lake pinctrl and GPIO driver"
71-
depends on ACPI
7242
select PINCTRL_INTEL
7343
help
7444
This pinctrl driver provides an interface that allows configuring
7545
of Intel Alder Lake PCH pins and using them as GPIOs.
7646

7747
config PINCTRL_BROXTON
7848
tristate "Intel Broxton pinctrl and GPIO driver"
79-
depends on ACPI
8049
select PINCTRL_INTEL
8150
help
8251
Broxton pinctrl driver provides an interface that allows
8352
configuring of SoC pins and using them as GPIOs.
8453

8554
config PINCTRL_CANNONLAKE
8655
tristate "Intel Cannon Lake PCH pinctrl and GPIO driver"
87-
depends on ACPI
8856
select PINCTRL_INTEL
8957
help
9058
This pinctrl driver provides an interface that allows configuring
9159
of Intel Cannon Lake PCH pins and using them as GPIOs.
9260

9361
config PINCTRL_CEDARFORK
9462
tristate "Intel Cedar Fork pinctrl and GPIO driver"
95-
depends on ACPI
9663
select PINCTRL_INTEL
9764
help
9865
This pinctrl driver provides an interface that allows configuring
9966
of Intel Cedar Fork PCH pins and using them as GPIOs.
10067

10168
config PINCTRL_DENVERTON
10269
tristate "Intel Denverton pinctrl and GPIO driver"
103-
depends on ACPI
10470
select PINCTRL_INTEL
10571
help
10672
This pinctrl driver provides an interface that allows configuring
10773
of Intel Denverton SoC pins and using them as GPIOs.
10874

10975
config PINCTRL_ELKHARTLAKE
11076
tristate "Intel Elkhart Lake SoC pinctrl and GPIO driver"
111-
depends on ACPI
11277
select PINCTRL_INTEL
11378
help
11479
This pinctrl driver provides an interface that allows configuring
11580
of Intel Elkhart Lake SoC pins and using them as GPIOs.
11681

11782
config PINCTRL_EMMITSBURG
11883
tristate "Intel Emmitsburg pinctrl and GPIO driver"
119-
depends on ACPI
12084
select PINCTRL_INTEL
12185
help
12286
This pinctrl driver provides an interface that allows configuring
12387
of Intel Emmitsburg pins and using them as GPIOs.
12488

12589
config PINCTRL_GEMINILAKE
12690
tristate "Intel Gemini Lake SoC pinctrl and GPIO driver"
127-
depends on ACPI
12891
select PINCTRL_INTEL
12992
help
13093
This pinctrl driver provides an interface that allows configuring
13194
of Intel Gemini Lake SoC pins and using them as GPIOs.
13295

13396
config PINCTRL_ICELAKE
13497
tristate "Intel Ice Lake PCH pinctrl and GPIO driver"
135-
depends on ACPI
13698
select PINCTRL_INTEL
13799
help
138100
This pinctrl driver provides an interface that allows configuring
139101
of Intel Ice Lake PCH pins and using them as GPIOs.
140102

141103
config PINCTRL_JASPERLAKE
142104
tristate "Intel Jasper Lake PCH pinctrl and GPIO driver"
143-
depends on ACPI
144105
select PINCTRL_INTEL
145106
help
146107
This pinctrl driver provides an interface that allows configuring
147108
of Intel Jasper Lake PCH pins and using them as GPIOs.
148109

149110
config PINCTRL_LAKEFIELD
150111
tristate "Intel Lakefield SoC pinctrl and GPIO driver"
151-
depends on ACPI
152112
select PINCTRL_INTEL
153113
help
154114
This pinctrl driver provides an interface that allows configuring
155115
of Intel Lakefield SoC pins and using them as GPIOs.
156116

157117
config PINCTRL_LEWISBURG
158118
tristate "Intel Lewisburg pinctrl and GPIO driver"
159-
depends on ACPI
160119
select PINCTRL_INTEL
161120
help
162121
This pinctrl driver provides an interface that allows configuring
163122
of Intel Lewisburg pins and using them as GPIOs.
164123

165124
config PINCTRL_METEORLAKE
166125
tristate "Intel Meteor Lake pinctrl and GPIO driver"
167-
depends on ACPI
168126
select PINCTRL_INTEL
169127
help
170128
This pinctrl driver provides an interface that allows configuring
171129
of Intel Meteor Lake pins and using them as GPIOs.
172130

173131
config PINCTRL_SUNRISEPOINT
174132
tristate "Intel Sunrisepoint pinctrl and GPIO driver"
175-
depends on ACPI
176133
select PINCTRL_INTEL
177134
help
178135
Sunrisepoint is the PCH of Intel Skylake. This pinctrl driver
@@ -181,10 +138,10 @@ config PINCTRL_SUNRISEPOINT
181138

182139
config PINCTRL_TIGERLAKE
183140
tristate "Intel Tiger Lake pinctrl and GPIO driver"
184-
depends on ACPI
185141
select PINCTRL_INTEL
186142
help
187143
This pinctrl driver provides an interface that allows configuring
188144
of Intel Tiger Lake PCH pins and using them as GPIOs.
189145

146+
source "drivers/pinctrl/intel/Kconfig.tng"
190147
endmenu

drivers/pinctrl/intel/Kconfig.tng

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
# Intel Tangier and compatible pin control drivers
3+
4+
if X86_INTEL_MID || COMPILE_TEST
5+
6+
config PINCTRL_TANGIER
7+
tristate
8+
select PINMUX
9+
select PINCONF
10+
select GENERIC_PINCONF
11+
help
12+
This is a library driver for Intel Tangier pin controller and to
13+
be selected and used by respective compatible platform drivers.
14+
15+
If built as a module its name will be pinctrl-tangier.
16+
17+
config PINCTRL_MERRIFIELD
18+
tristate "Intel Merrifield pinctrl driver"
19+
select PINCTRL_TANGIER
20+
help
21+
Intel Merrifield Family-Level Interface Shim (FLIS) driver provides
22+
an interface that allows configuring of SoC pins and using them as
23+
GPIOs.
24+
25+
config PINCTRL_MOOREFIELD
26+
tristate "Intel Moorefield pinctrl driver"
27+
select PINCTRL_TANGIER
28+
help
29+
Intel Moorefield Family-Level Interface Shim (FLIS) driver provides
30+
an interface that allows configuring of SoC pins and using them as
31+
GPIOs.
32+
33+
endif

drivers/pinctrl/intel/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
obj-$(CONFIG_PINCTRL_BAYTRAIL) += pinctrl-baytrail.o
55
obj-$(CONFIG_PINCTRL_CHERRYVIEW) += pinctrl-cherryview.o
66
obj-$(CONFIG_PINCTRL_LYNXPOINT) += pinctrl-lynxpoint.o
7+
obj-$(CONFIG_PINCTRL_TANGIER) += pinctrl-tangier.o
78
obj-$(CONFIG_PINCTRL_MERRIFIELD) += pinctrl-merrifield.o
89
obj-$(CONFIG_PINCTRL_MOOREFIELD) += pinctrl-moorefield.o
910
obj-$(CONFIG_PINCTRL_INTEL) += pinctrl-intel.o

drivers/pinctrl/intel/pinctrl-alderlake.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,3 +748,4 @@ module_platform_driver(adl_pinctrl_driver);
748748
MODULE_AUTHOR("Andy Shevchenko <andriy.shevchenko@linux.intel.com>");
749749
MODULE_DESCRIPTION("Intel Alder Lake PCH pinctrl/GPIO driver");
750750
MODULE_LICENSE("GPL v2");
751+
MODULE_IMPORT_NS(PINCTRL_INTEL);

0 commit comments

Comments
 (0)