Message ID | 20200614215726.v1.21.I3afd224b9bfd632a56dd7f5e621a46d75318f328@changeid |
---|---|
State | Accepted |
Commit | 59cf26480b6598330aba492733aec05b0a67303d |
Headers | show |
Series | x86: Programmatic generation of ACPI tables (Part C) | expand |
Hi Simon, -----"Simon Glass" <sjg at chromium.org> schrieb: ----- > Betreff: [PATCH v1 21/43] x86: pinctrl: Drop the acpi_name member Nit: You are dropping the acpi_path member, not acpi_name. > > This is in the device tree now, so drop the unnecessary field here. > > Signed-off-by: Simon Glass <sjg at chromium.org> > --- > > arch/x86/include/asm/intel_pinctrl.h | 2 -- > drivers/pinctrl/intel/pinctrl_apl.c | 4 ---- > 2 files changed, 6 deletions(-) > > diff --git a/arch/x86/include/asm/intel_pinctrl.h b/arch/x86/include/asm/intel_pinctrl.h > index 982b2514a0..e734f4a7f0 100644 > --- 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 c14176d4a7..7624a9974f 100644 > --- 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, > -- > 2.27.0.290.gba653c62da-goog Reviewed-by: Wolfgang Wallner <wolfgang.wallner at br-automation.com>
diff --git a/arch/x86/include/asm/intel_pinctrl.h b/arch/x86/include/asm/intel_pinctrl.h index 982b2514a0..e734f4a7f0 100644 --- 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 c14176d4a7..7624a9974f 100644 --- 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,
This is in the device tree now, so drop the unnecessary field here. Signed-off-by: Simon Glass <sjg at chromium.org> --- arch/x86/include/asm/intel_pinctrl.h | 2 -- drivers/pinctrl/intel/pinctrl_apl.c | 4 ---- 2 files changed, 6 deletions(-)