diff options
| author | Bora Guvendik <bora.guvendik@intel.com> | 2017-11-22 13:48:12 -0800 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2018-02-16 03:59:29 +0000 |
| commit | 3f672323b5f5cd6eaf955a31ebd0f73685f1d257 (patch) | |
| tree | c619cda6d614a0c37c873a8fe52d68f0439592eb /src/soc/intel/skylake | |
| parent | 7e2fe06a46ad3c44b1eb77651c27d4b9166033a6 (diff) | |
soc/intel/common/block/gpio: Change group offset calculation
Add group information for each gpio community and use it to
calculate offset of a pad within its group. Original implementation
assumed that the number of gpios in each group is same but that lead to
a bug for cnl since numbers differ for each group.
BUG=b:69616750
TEST=Need to test again on SKL,CNL,APL,GLK
Change-Id: I02ab1d878bc83d32222be074bd2db5e23adaf580
Signed-off-by: Bora Guvendik <bora.guvendik@intel.com>
Reviewed-on: https://review.coreboot.org/22571
Reviewed-by: Lijian Zhao <lijian.zhao@intel.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/skylake')
| -rw-r--r-- | src/soc/intel/skylake/gpio.c | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/src/soc/intel/skylake/gpio.c b/src/soc/intel/skylake/gpio.c index 9c9d041e4f..f67d4a3bb9 100644 --- a/src/soc/intel/skylake/gpio.c +++ b/src/soc/intel/skylake/gpio.c @@ -20,6 +20,7 @@ #include <soc/pcr_ids.h> #include <soc/pm.h> + static const struct reset_mapping rst_map[] = { { .logical = PAD_CFG0_LOGICAL_RESET_RSMRST, .chipset = 0U << 30}, { .logical = PAD_CFG0_LOGICAL_RESET_DEEP, .chipset = 1U << 30}, @@ -33,6 +34,38 @@ static const struct reset_mapping rst_map_com2[] = { { .logical = PAD_CFG0_LOGICAL_RESET_RSMRST, .chipset = 3U << 30}, }; +static const struct pad_group skl_community_com0_groups[] = { + INTEL_GPP(GPP_A0, GPP_A0, GPP_A23), /* GPP A */ + INTEL_GPP(GPP_A0, GPP_B0, GPP_B23), /* GPP B */ +}; + +static const struct pad_group skl_community_com1_groups[] = { + INTEL_GPP(GPP_C0, GPP_C0, GPP_C23), /* GPP C */ +#if IS_ENABLED(CONFIG_SKYLAKE_SOC_PCH_H) + INTEL_GPP(GPP_C0, GPP_D0, GPP_D23), /* GPP D */ + INTEL_GPP(GPP_C0, GPP_E0, GPP_E12), /* GPP E */ + INTEL_GPP(GPP_C0, GPP_F0, GPP_F23), /* GPP F */ + INTEL_GPP(GPP_C0, GPP_G0, GPP_G23), /* GPP G */ + INTEL_GPP(GPP_C0, GPP_H0, GPP_H23), /* GPP H */ +#else + INTEL_GPP(GPP_C0, GPP_D0, GPP_D23), /* GPP D */ + INTEL_GPP(GPP_C0, GPP_E0, GPP_E23), /* GPP E */ +#endif +}; + +static const struct pad_group skl_community_com3_groups[] = { +#if IS_ENABLED(CONFIG_SKYLAKE_SOC_PCH_H) + INTEL_GPP(GPP_I0, GPP_I0, GPP_I10), /* GPP I */ +#else + INTEL_GPP(GPP_F0, GPP_F0, GPP_F23), /* GPP F */ + INTEL_GPP(GPP_F0, GPP_G0, GPP_G7), /* GPP G */ +#endif +}; + +static const struct pad_group skl_community_com2_groups[] = { + INTEL_GPP(GPD0, GPD0, GPD11), /* GPP GDP */ +}; + static const struct pad_community skl_gpio_communities[] = { { .port = PID_GPIOCOM0, @@ -48,6 +81,8 @@ static const struct pad_community skl_gpio_communities[] = { .acpi_path = "\\_SB.PCI0.GPIO", .reset_map = rst_map, .num_reset_vals = ARRAY_SIZE(rst_map), + .groups = skl_community_com0_groups, + .num_groups = ARRAY_SIZE(skl_community_com0_groups), }, { .port = PID_GPIOCOM1, .first_pad = GPP_C0, @@ -66,6 +101,8 @@ static const struct pad_community skl_gpio_communities[] = { .acpi_path = "\\_SB.PCI0.GPIO", .reset_map = rst_map, .num_reset_vals = ARRAY_SIZE(rst_map), + .groups = skl_community_com1_groups, + .num_groups = ARRAY_SIZE(skl_community_com1_groups), }, { .port = PID_GPIOCOM3, #if IS_ENABLED(CONFIG_SKYLAKE_SOC_PCH_H) @@ -85,6 +122,8 @@ static const struct pad_community skl_gpio_communities[] = { .acpi_path = "\\_SB.PCI0.GPIO", .reset_map = rst_map, .num_reset_vals = ARRAY_SIZE(rst_map), + .groups = skl_community_com3_groups, + .num_groups = ARRAY_SIZE(skl_community_com3_groups), }, { .port = PID_GPIOCOM2, .first_pad = GPD0, @@ -99,6 +138,8 @@ static const struct pad_community skl_gpio_communities[] = { .acpi_path = "\\_SB.PCI0.GPIO", .reset_map = rst_map_com2, .num_reset_vals = ARRAY_SIZE(rst_map_com2), + .groups = skl_community_com2_groups, + .num_groups = ARRAY_SIZE(skl_community_com2_groups), } }; |