x86: pinctrl: Drop the acpi_path member

This is in the device tree now, so drop the unnecessary field here.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/include/asm/intel_pinctrl.h b/arch/x86/include/asm/intel_pinctrl.h
index a6a9edd0d4d64a2353c979fb190810cd25347d27..00868d17258e66f3180b0197b24d9054ac400024 100644 (file)
--- a/arch/x86/include/asm/intel_pinctrl.h
+++ b/arch/x86/include/asm/intel_pinctrl.h
@@ -99,7 +99,6 @@ struct pad_group {
  * groups exist inside a community
  *
  * @name: Community name
- * @acpi_path: ACPI path
  * @num_gpi_regs: number of gpi registers in community
  * @max_pads_per_group: number of pads in each group; number of pads bit-mapped
  *     in each GPI status/en and Host Own Reg
@@ -120,7 +119,6 @@ struct pad_group {
  */
 struct pad_community {
        const char *name;
-       const char *acpi_path;
        size_t num_gpi_regs;
        size_t max_pads_per_group;
        uint first_pad;

diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c
index c14176d4a77bf7734fe4074554f11ddfcd882d4b..7624a9974fe3f43b08d62dcbfcb37d428bbbbe02 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl_apl.c
+++ b/drivers/pinctrl/intel/pinctrl_apl.c
@@ -75,7 +75,6 @@ static const struct pad_community apl_gpio_communities[] = {
                .gpi_smi_en_reg_0 = GPI_SMI_EN_0,
                .max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
                .name = "GPIO_GPE_N",
-               .acpi_path = "\\_SB.GPO0",
                .reset_map = rst_map,
                .num_reset_vals = ARRAY_SIZE(rst_map),
                .groups = apl_community_n_groups,
@@ -94,7 +93,6 @@ static const struct pad_community apl_gpio_communities[] = {
                .gpi_smi_en_reg_0 = GPI_SMI_EN_0,
                .max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
                .name = "GPIO_GPE_NW",
-               .acpi_path = "\\_SB.GPO1",
                .reset_map = rst_map,
                .num_reset_vals = ARRAY_SIZE(rst_map),
                .groups = apl_community_nw_groups,
@@ -113,7 +111,6 @@ static const struct pad_community apl_gpio_communities[] = {
                .gpi_smi_en_reg_0 = GPI_SMI_EN_0,
                .max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
                .name = "GPIO_GPE_W",
-               .acpi_path = "\\_SB.GPO2",
                .reset_map = rst_map,
                .num_reset_vals = ARRAY_SIZE(rst_map),
                .groups = apl_community_w_groups,
@@ -132,7 +129,6 @@ static const struct pad_community apl_gpio_communities[] = {
                .gpi_smi_en_reg_0 = GPI_SMI_EN_0,
                .max_pads_per_group = GPIO_MAX_NUM_PER_GROUP,
                .name = "GPIO_GPE_SW",
-               .acpi_path = "\\_SB.GPO3",
                .reset_map = rst_map,
                .num_reset_vals = ARRAY_SIZE(rst_map),
                .groups = apl_community_sw_groups,