summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/mediatek/common/gpio.c107
-rw-r--r--src/soc/mediatek/common/include/soc/gpio_common.h14
-rw-r--r--src/soc/mediatek/mt8186/gpio.c112
-rw-r--r--src/soc/mediatek/mt8186/include/soc/gpio.h11
-rw-r--r--src/soc/mediatek/mt8188/include/soc/gpio.h10
5 files changed, 123 insertions, 131 deletions
diff --git a/src/soc/mediatek/common/gpio.c b/src/soc/mediatek/common/gpio.c
index daed55590d..e8a50b2b18 100644
--- a/src/soc/mediatek/common/gpio.c
+++ b/src/soc/mediatek/common/gpio.c
@@ -173,3 +173,110 @@ void gpio_eint_configure(gpio_t gpio, enum gpio_irq_type type)
write32(&mtk_eint->mask_clr.regs[pos], mask);
}
+
+static inline bool is_valid_drv(uint8_t drv)
+{
+ return drv <= GPIO_DRV_16_MA;
+}
+
+static inline bool is_valid_drv_adv(enum gpio_drv_adv drv)
+{
+ return drv <= GPIO_DRV_ADV_1_MA && drv >= GPIO_DRV_ADV_125_UA;
+}
+
+int gpio_set_driving(gpio_t gpio, uint8_t drv)
+{
+ uint32_t mask;
+ const struct gpio_drv_info *info = get_gpio_driving_info(gpio.id);
+ const struct gpio_drv_info *adv_info = get_gpio_driving_adv_info(gpio.id);
+ void *reg, *reg_adv, *reg_addr;
+
+ if (!info)
+ return -1;
+
+ if (!is_valid_drv(drv))
+ return -1;
+
+ if (info->width == 0)
+ return -1;
+
+ mask = BIT(info->width) - 1;
+ /* Check setting value is not beyond width */
+ if ((uint32_t)drv > mask)
+ return -1;
+
+ reg_addr = gpio_find_reg_addr(gpio);
+ reg = reg_addr + info->offset;
+ clrsetbits32(reg, mask << info->shift, drv << info->shift);
+
+ /* Disable EH if supported */
+ if (adv_info && adv_info->width != 0) {
+ reg_adv = reg_addr + adv_info->offset;
+ clrbits32(reg_adv, BIT(adv_info->shift));
+ }
+
+ return 0;
+}
+
+int gpio_get_driving(gpio_t gpio)
+{
+ const struct gpio_drv_info *info = get_gpio_driving_info(gpio.id);
+ void *reg;
+
+ if (!info)
+ return -1;
+
+ if (info->width == 0)
+ return -1;
+
+ reg = gpio_find_reg_addr(gpio) + info->offset;
+ return (read32(reg) >> info->shift) & (BIT(info->width) - 1);
+}
+
+int gpio_set_driving_adv(gpio_t gpio, enum gpio_drv_adv drv)
+{
+ uint32_t mask;
+ const struct gpio_drv_info *adv_info = get_gpio_driving_adv_info(gpio.id);
+ void *reg_adv;
+
+ if (!adv_info)
+ return -1;
+
+ if (!is_valid_drv_adv(drv))
+ return -1;
+
+ if (adv_info->width == 0)
+ return -1;
+
+ /* Not include EH bit (the lowest bit) */
+ if ((uint32_t)drv > (BIT(adv_info->width - 1) - 1))
+ return -1;
+
+ reg_adv = gpio_find_reg_addr(gpio) + adv_info->offset;
+ mask = BIT(adv_info->width) - 1;
+ /* EH enable */
+ drv = (drv << 1) | BIT(0);
+
+ clrsetbits32(reg_adv, mask << adv_info->shift, drv << adv_info->shift);
+
+ return 0;
+}
+
+int gpio_get_driving_adv(gpio_t gpio)
+{
+ const struct gpio_drv_info *adv_info = get_gpio_driving_adv_info(gpio.id);
+ void *reg_adv;
+ uint32_t drv;
+
+ if (!adv_info)
+ return -1;
+
+ if (adv_info->width == 0)
+ return -1;
+
+ reg_adv = gpio_find_reg_addr(gpio) + adv_info->offset;
+ drv = (read32(reg_adv) >> adv_info->shift) & (BIT(adv_info->width) - 1);
+
+ /* Drop EH bit */
+ return drv >> 1;
+}
diff --git a/src/soc/mediatek/common/include/soc/gpio_common.h b/src/soc/mediatek/common/include/soc/gpio_common.h
index 993dbe6325..b12d9c92c5 100644
--- a/src/soc/mediatek/common/include/soc/gpio_common.h
+++ b/src/soc/mediatek/common/include/soc/gpio_common.h
@@ -33,6 +33,17 @@ enum gpio_drv_adv {
GPIO_DRV_ADV_1_MA = 3,
};
+enum gpio_drv {
+ GPIO_DRV_2_MA = 0,
+ GPIO_DRV_4_MA = 1,
+ GPIO_DRV_6_MA = 2,
+ GPIO_DRV_8_MA = 3,
+ GPIO_DRV_10_MA = 4,
+ GPIO_DRV_12_MA = 5,
+ GPIO_DRV_14_MA = 6,
+ GPIO_DRV_16_MA = 7,
+};
+
struct gpio_drv_info {
uint8_t offset;
uint8_t shift;
@@ -44,6 +55,9 @@ void gpio_set_pull(gpio_t gpio, enum pull_enable enable,
void gpio_set_mode(gpio_t gpio, int mode);
void *gpio_find_reg_addr(gpio_t gpio);
+const struct gpio_drv_info *get_gpio_driving_info(uint32_t raw_id);
+const struct gpio_drv_info *get_gpio_driving_adv_info(uint32_t raw_id);
+
/* Normal driving function */
int gpio_set_driving(gpio_t gpio, uint8_t drv);
int gpio_get_driving(gpio_t gpio);
diff --git a/src/soc/mediatek/mt8186/gpio.c b/src/soc/mediatek/mt8186/gpio.c
index 0dad34205c..a92349c3a5 100644
--- a/src/soc/mediatek/mt8186/gpio.c
+++ b/src/soc/mediatek/mt8186/gpio.c
@@ -278,7 +278,7 @@ void *gpio_find_reg_addr(gpio_t gpio)
return reg_addr;
}
-static const struct gpio_drv_info *get_gpio_driving_info(uint32_t raw_id)
+const struct gpio_drv_info *get_gpio_driving_info(uint32_t raw_id)
{
if (ENV_BOOTBLOCK) {
uint32_t id;
@@ -321,7 +321,7 @@ static const struct gpio_drv_info *get_gpio_driving_info(uint32_t raw_id)
}
}
-static const struct gpio_drv_info *get_gpio_driving_adv_info(uint32_t raw_id)
+const struct gpio_drv_info *get_gpio_driving_adv_info(uint32_t raw_id)
{
if (ENV_BOOTBLOCK) {
return NULL;
@@ -331,111 +331,3 @@ static const struct gpio_drv_info *get_gpio_driving_adv_info(uint32_t raw_id)
return &gpio_driving_adv_info[raw_id];
}
}
-
-static inline bool is_valid_drv(uint8_t drv)
-{
- return drv <= GPIO_DRV_16_MA;
-}
-
-static inline bool is_valid_drv_adv(enum gpio_drv_adv drv)
-{
- return drv <= GPIO_DRV_ADV_1_MA && drv >= GPIO_DRV_ADV_125_UA;
-}
-
-int gpio_set_driving(gpio_t gpio, uint8_t drv)
-{
- uint32_t mask;
- const struct gpio_drv_info *info = get_gpio_driving_info(gpio.id);
- const struct gpio_drv_info *adv_info = get_gpio_driving_adv_info(gpio.id);
- void *reg, *reg_adv, *reg_addr;
-
- if (!info)
- return -1;
-
- if (!is_valid_drv(drv))
- return -1;
-
- if (info->width == 0)
- return -1;
-
- mask = BIT(info->width) - 1;
- /* Check setting value is not beyond width */
- if ((uint32_t)drv > mask)
- return -1;
-
- reg_addr = gpio_find_reg_addr(gpio);
- reg = reg_addr + info->offset;
- clrsetbits32(reg, mask << info->shift, drv << info->shift);
-
- /* Disable EH if supported */
- if (adv_info && adv_info->width != 0) {
- reg_adv = reg_addr + adv_info->offset;
- clrbits32(reg_adv, BIT(adv_info->shift));
- }
-
- return 0;
-}
-
-int gpio_get_driving(gpio_t gpio)
-{
- const struct gpio_drv_info *info = get_gpio_driving_info(gpio.id);
- void *reg;
-
- if (!info)
- return -1;
-
- reg = gpio_find_reg_addr(gpio) + info->offset;
- if (info->width == 0)
- return -1;
-
- return (read32(reg) >> info->shift) & (BIT(info->width) - 1);
-}
-
-int gpio_set_driving_adv(gpio_t gpio, enum gpio_drv_adv drv)
-{
- uint32_t mask;
- const struct gpio_drv_info *adv_info = get_gpio_driving_adv_info(gpio.id);
- void *reg_adv;
-
- if (!adv_info)
- return -1;
-
- if (!is_valid_drv_adv(drv))
- return -1;
-
- reg_adv = gpio_find_reg_addr(gpio) + adv_info->offset;
-
- if (adv_info->width == 0)
- return -1;
-
- /* Not include EH bit (the lowest bit) */
- if ((uint32_t)drv > (BIT(adv_info->width - 1) - 1))
- return -1;
-
- mask = BIT(adv_info->width) - 1;
- /* EH enable */
- drv = (drv << 1) | BIT(0);
-
- clrsetbits32(reg_adv, mask << adv_info->shift, drv << adv_info->shift);
-
- return 0;
-}
-
-int gpio_get_driving_adv(gpio_t gpio)
-{
- const struct gpio_drv_info *adv_info = get_gpio_driving_adv_info(gpio.id);
- void *reg_adv;
- uint32_t drv;
-
- if (!adv_info)
- return -1;
-
- reg_adv = gpio_find_reg_addr(gpio) + adv_info->offset;
- if (adv_info->width == 0)
- return -1;
-
- drv = (read32(reg_adv) >> adv_info->shift) & (BIT(adv_info->width) - 1);
-
- /* Drop EH bit */
- return drv >> 1;
-}
diff --git a/src/soc/mediatek/mt8186/include/soc/gpio.h b/src/soc/mediatek/mt8186/include/soc/gpio.h
index 1377e015a1..4ce1e98a85 100644
--- a/src/soc/mediatek/mt8186/include/soc/gpio.h
+++ b/src/soc/mediatek/mt8186/include/soc/gpio.h
@@ -20,17 +20,6 @@ enum {
GPIO_MODE_BITS = 4,
};
-enum gpio_drv {
- GPIO_DRV_2_MA = 0,
- GPIO_DRV_4_MA = 1,
- GPIO_DRV_6_MA = 2,
- GPIO_DRV_8_MA = 3,
- GPIO_DRV_10_MA = 4,
- GPIO_DRV_12_MA = 5,
- GPIO_DRV_14_MA = 6,
- GPIO_DRV_16_MA = 7,
-};
-
#define GPIO_ID(name) PAD_##name##_ID
#define PIN(id, name, flag, bit, base, offset, \
diff --git a/src/soc/mediatek/mt8188/include/soc/gpio.h b/src/soc/mediatek/mt8188/include/soc/gpio.h
index 803fcf4fa1..8767e0f7a9 100644
--- a/src/soc/mediatek/mt8188/include/soc/gpio.h
+++ b/src/soc/mediatek/mt8188/include/soc/gpio.h
@@ -19,16 +19,6 @@ enum {
MAX_GPIO_MODE_PER_REG = 8,
GPIO_MODE_BITS = 4,
};
-enum gpio_drv {
- GPIO_DRV_2_MA = 0,
- GPIO_DRV_4_MA = 1,
- GPIO_DRV_6_MA = 2,
- GPIO_DRV_8_MA = 3,
- GPIO_DRV_10_MA = 4,
- GPIO_DRV_12_MA = 5,
- GPIO_DRV_14_MA = 6,
- GPIO_DRV_16_MA = 7,
-};
#define PIN(id, name, flag, bit, base, offset, \
func1, func2, func3, func4, func5, func6, func7) \