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/apollolake/gpio_glk.c | |
| 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/apollolake/gpio_glk.c')
| -rw-r--r-- | src/soc/intel/apollolake/gpio_glk.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/soc/intel/apollolake/gpio_glk.c b/src/soc/intel/apollolake/gpio_glk.c index fd73270d22..a998118aa9 100644 --- a/src/soc/intel/apollolake/gpio_glk.c +++ b/src/soc/intel/apollolake/gpio_glk.c @@ -21,12 +21,34 @@ #include <soc/pcr_ids.h> #include <soc/pm.h> + static const struct reset_mapping rst_map[] = { { .logical = PAD_CFG0_LOGICAL_RESET_PWROK, .chipset = 0U << 30 }, { .logical = PAD_CFG0_LOGICAL_RESET_DEEP, .chipset = 1U << 30 }, { .logical = PAD_CFG0_LOGICAL_RESET_PLTRST, .chipset = 2U << 30 }, }; +static const struct pad_group glk_community_audio_groups[] = { + INTEL_GPP(AUDIO_OFFSET, AUDIO_OFFSET, GPIO_175), /* AUDIO 0 */ +}; + +static const struct pad_group glk_community_nw_groups[] = { + INTEL_GPP(NW_OFFSET, NW_OFFSET, GPIO_31), /* NORTHWEST 0 */ + INTEL_GPP(NW_OFFSET, GPIO_32, GPIO_63), /* NORTHWEST 1 */ + INTEL_GPP(NW_OFFSET, GPIO_64, GPIO_214), /* NORTHWEST 2 */ +}; + +static const struct pad_group glk_community_scc_groups[] = { + INTEL_GPP(SCC_OFFSET, SCC_OFFSET, GPIO_206), /* SCC 0 */ + INTEL_GPP(SCC_OFFSET, GPIO_207, GPIO_209), /* SCC 1 */ +}; + +static const struct pad_group glk_community_n_groups[] = { + INTEL_GPP(N_OFFSET, N_OFFSET, GPIO_107), /* NORTH 0 */ + INTEL_GPP(N_OFFSET, GPIO_108, GPIO_139), /* NORTH 1 */ + INTEL_GPP(N_OFFSET, GPIO_140, GPIO_155), /* NORTH 2 */ +}; + static const struct pad_community glk_gpio_communities[] = { { .port = PID_GPIO_NW, @@ -43,6 +65,8 @@ static const struct pad_community glk_gpio_communities[] = { .acpi_path = "\\_SB.GPO0", .reset_map = rst_map, .num_reset_vals = ARRAY_SIZE(rst_map), + .groups = glk_community_nw_groups, + .num_groups = ARRAY_SIZE(glk_community_nw_groups), }, { .port = PID_GPIO_N, .first_pad = N_OFFSET, @@ -58,6 +82,8 @@ static const struct pad_community glk_gpio_communities[] = { .acpi_path = "\\_SB.GPO1", .reset_map = rst_map, .num_reset_vals = ARRAY_SIZE(rst_map), + .groups = glk_community_n_groups, + .num_groups = ARRAY_SIZE(glk_community_n_groups), }, { .port = PID_GPIO_AUDIO, .first_pad = AUDIO_OFFSET, @@ -73,6 +99,8 @@ static const struct pad_community glk_gpio_communities[] = { .acpi_path = "\\_SB.GPO2", .reset_map = rst_map, .num_reset_vals = ARRAY_SIZE(rst_map), + .groups = glk_community_audio_groups, + .num_groups = ARRAY_SIZE(glk_community_audio_groups), }, { .port = PID_GPIO_SCC, .first_pad = SCC_OFFSET, @@ -89,6 +117,8 @@ static const struct pad_community glk_gpio_communities[] = { .acpi_path = "\\_SB.GPO3", .reset_map = rst_map, .num_reset_vals = ARRAY_SIZE(rst_map), + .groups = glk_community_scc_groups, + .num_groups = ARRAY_SIZE(glk_community_scc_groups), }, }; |