Message ID | 20200614215726.v1.19.I4f722d76cfa910b97ecad2c968d4bef1f9ea12f8@changeid |
---|---|
State | New |
Headers | show |
Series | x86: Programmatic generation of ACPI tables (Part C) | expand |
On Mon, Jun 15, 2020 at 11:58 AM Simon Glass <sjg at chromium.org> wrote: > > Add a Kconfig to control whether pinctrl is represented as a single ACPI > device or as multiple devices. In the latter case (the default) we should > return the pin number relative to the pinctrl device. > > Signed-off-by: Simon Glass <sjg at chromium.org> > --- > > drivers/pinctrl/intel/Kconfig | 4 ++++ > drivers/pinctrl/intel/pinctrl.c | 2 ++ > 2 files changed, 6 insertions(+) > Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
diff --git a/drivers/pinctrl/intel/Kconfig b/drivers/pinctrl/intel/Kconfig index e62a2e0349..05a314af88 100644 --- a/drivers/pinctrl/intel/Kconfig +++ b/drivers/pinctrl/intel/Kconfig @@ -15,6 +15,10 @@ config INTEL_PINCTRL_IOSTANDBY bool default y +config INTEL_PINCTRL_MULTI_ACPI_DEVICES + bool + default y + config PINCTRL_INTEL_APL bool "Support Intel Apollo Lake (APL)" help diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c index bf3989bf32..32ca303b27 100644 --- a/drivers/pinctrl/intel/pinctrl.c +++ b/drivers/pinctrl/intel/pinctrl.c @@ -427,6 +427,8 @@ int intel_pinctrl_get_acpi_pin(struct udevice *dev, uint offset) const struct pad_community *comm = priv->comm; int group; + if (IS_ENABLED(CONFIG_INTEL_PINCTRL_MULTI_ACPI_DEVICES)) + return offset; group = pinctrl_group_index(comm, offset); /* If pad base is not set then use GPIO number as ACPI pin number */
Add a Kconfig to control whether pinctrl is represented as a single ACPI device or as multiple devices. In the latter case (the default) we should return the pin number relative to the pinctrl device. Signed-off-by: Simon Glass <sjg at chromium.org> --- drivers/pinctrl/intel/Kconfig | 4 ++++ drivers/pinctrl/intel/pinctrl.c | 2 ++ 2 files changed, 6 insertions(+)