aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pinctrl/intel/pinctrl-baytrail.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c
index 18d9ad504194..c72d831ca8b6 100644
--- a/drivers/pinctrl/intel/pinctrl-baytrail.c
+++ b/drivers/pinctrl/intel/pinctrl-baytrail.c
@@ -91,6 +91,7 @@
91 * does not find a match for the requested function. 91 * does not find a match for the requested function.
92 */ 92 */
93#define BYT_DEFAULT_GPIO_MUX 0 93#define BYT_DEFAULT_GPIO_MUX 0
94#define BYT_ALTER_GPIO_MUX 1
94 95
95struct byt_gpio_pin_context { 96struct byt_gpio_pin_context {
96 u32 conf0; 97 u32 conf0;
@@ -932,14 +933,14 @@ static u32 byt_get_gpio_mux(struct byt_gpio *vg, unsigned int offset)
932 /* SCORE pin 92-93 */ 933 /* SCORE pin 92-93 */
933 if (!strcmp(vg->soc_data->uid, BYT_SCORE_ACPI_UID) && 934 if (!strcmp(vg->soc_data->uid, BYT_SCORE_ACPI_UID) &&
934 offset >= 92 && offset <= 93) 935 offset >= 92 && offset <= 93)
935 return 1; 936 return BYT_ALTER_GPIO_MUX;
936 937
937 /* SUS pin 11-21 */ 938 /* SUS pin 11-21 */
938 if (!strcmp(vg->soc_data->uid, BYT_SUS_ACPI_UID) && 939 if (!strcmp(vg->soc_data->uid, BYT_SUS_ACPI_UID) &&
939 offset >= 11 && offset <= 21) 940 offset >= 11 && offset <= 21)
940 return 1; 941 return BYT_ALTER_GPIO_MUX;
941 942
942 return 0; 943 return BYT_DEFAULT_GPIO_MUX;
943} 944}
944 945
945static void byt_gpio_clear_triggering(struct byt_gpio *vg, unsigned int offset) 946static void byt_gpio_clear_triggering(struct byt_gpio *vg, unsigned int offset)