pinctrl: add drive for I2C related pins on MT8195

This patch provides the advanced drive raw data setting version
for I2C used pins on MT8195.

Signed-off-by: Zhiyong Tao <zhiyong.tao@mediatek.com>
Acked-by: Sean Wang <sean.wang@kernel.org>
Link: https://lore.kernel.org/r/20210413055702.27535-4-zhiyong.tao@mediatek.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8195.c b/drivers/pinctrl/mediatek/pinctrl-mt8195.c
index 063f164d7c9b9859bfc24a1d01d0b6d8f2a1ed1a..a7500e18bb1de47129d577a029c88e13636259a4 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8195.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8195.c
@@ -760,6 +760,25 @@ static const struct mtk_pin_field_calc mt8195_pin_drv_range[] = {
        PIN_FIELD_BASE(143, 143, 1, 0x020, 0x10, 24, 3),
 };
 
+static const struct mtk_pin_field_calc mt8195_pin_drv_adv_range[] = {
+       PIN_FIELD_BASE(8, 8, 4, 0x020, 0x10, 15, 3),
+       PIN_FIELD_BASE(9, 9, 4, 0x020, 0x10, 0, 3),
+       PIN_FIELD_BASE(10, 10, 4, 0x020, 0x10, 18, 3),
+       PIN_FIELD_BASE(11, 11, 4, 0x020, 0x10, 3, 3),
+       PIN_FIELD_BASE(12, 12, 4, 0x020, 0x10, 21, 3),
+       PIN_FIELD_BASE(13, 13, 4, 0x020, 0x10, 6, 3),
+       PIN_FIELD_BASE(14, 14, 4, 0x020, 0x10, 24, 3),
+       PIN_FIELD_BASE(15, 15, 4, 0x020, 0x10, 9, 3),
+       PIN_FIELD_BASE(16, 16, 4, 0x020, 0x10, 27, 3),
+       PIN_FIELD_BASE(17, 17, 4, 0x020, 0x10, 12, 3),
+       PIN_FIELD_BASE(29, 29, 2, 0x020, 0x10, 0, 3),
+       PIN_FIELD_BASE(30, 30, 2, 0x020, 0x10, 3, 3),
+       PIN_FIELD_BASE(34, 34, 1, 0x040, 0x10, 0, 3),
+       PIN_FIELD_BASE(35, 35, 1, 0x040, 0x10, 3, 3),
+       PIN_FIELD_BASE(44, 44, 1, 0x040, 0x10, 6, 3),
+       PIN_FIELD_BASE(45, 45, 1, 0x040, 0x10, 9, 3),
+};
+
 static const struct mtk_pin_reg_calc mt8195_reg_cals[PINCTRL_PIN_REG_MAX] = {
        [PINCTRL_PIN_REG_MODE] = MTK_RANGE(mt8195_pin_mode_range),
        [PINCTRL_PIN_REG_DIR] = MTK_RANGE(mt8195_pin_dir_range),
@@ -773,6 +792,7 @@ static const struct mtk_pin_reg_calc mt8195_reg_cals[PINCTRL_PIN_REG_MAX] = {
        [PINCTRL_PIN_REG_PUPD] = MTK_RANGE(mt8195_pin_pupd_range),
        [PINCTRL_PIN_REG_R0] = MTK_RANGE(mt8195_pin_r0_range),
        [PINCTRL_PIN_REG_R1] = MTK_RANGE(mt8195_pin_r1_range),
+       [PINCTRL_PIN_REG_DRV_ADV] = MTK_RANGE(mt8195_pin_drv_adv_range),
 };
 
 static const char * const mt8195_pinctrl_register_base_names[] = {
@@ -801,6 +821,8 @@ static const struct mtk_pin_soc mt8195_data = {
        .bias_get_combo = mtk_pinconf_bias_get_combo,
        .drive_set = mtk_pinconf_drive_set_rev1,
        .drive_get = mtk_pinconf_drive_get_rev1,
+       .adv_drive_get = mtk_pinconf_adv_drive_get_raw,
+       .adv_drive_set = mtk_pinconf_adv_drive_set_raw,
 };
 
 static const struct of_device_id mt8195_pinctrl_of_match[] = {

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
index fcf7c3eeee4a8aa4c67985ff302eff783a2f8fd9..c068a2259741282ec2c841a2e1201a84c189e6dc 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
@@ -1031,6 +1031,20 @@ int mtk_pinconf_adv_drive_get(struct mtk_pinctrl *hw,
 }
 EXPORT_SYMBOL_GPL(mtk_pinconf_adv_drive_get);
 
+int mtk_pinconf_adv_drive_set_raw(struct mtk_pinctrl *hw,
+                                 const struct mtk_pin_desc *desc, u32 arg)
+{
+       return mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DRV_ADV, arg);
+}
+EXPORT_SYMBOL_GPL(mtk_pinconf_adv_drive_set_raw);
+
+int mtk_pinconf_adv_drive_get_raw(struct mtk_pinctrl *hw,
+                                 const struct mtk_pin_desc *desc, u32 *val)
+{
+       return mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_DRV_ADV, val);
+}
+EXPORT_SYMBOL_GPL(mtk_pinconf_adv_drive_get_raw);
+
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Sean Wang <sean.wang@mediatek.com>");
 MODULE_DESCRIPTION("Pin configuration library module for mediatek SoCs");

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h
index 65eac708a3b311e6ed3e953a36f43b3f24b78f29..be35443d81f8d9194bc80d3c200390570746bf6d 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h
@@ -66,6 +66,7 @@ enum {
        PINCTRL_PIN_REG_DRV_EN,
        PINCTRL_PIN_REG_DRV_E0,
        PINCTRL_PIN_REG_DRV_E1,
+       PINCTRL_PIN_REG_DRV_ADV,
        PINCTRL_PIN_REG_MAX,
 };
 
@@ -316,6 +317,10 @@ int mtk_pinconf_adv_drive_set(struct mtk_pinctrl *hw,
                              const struct mtk_pin_desc *desc, u32 arg);
 int mtk_pinconf_adv_drive_get(struct mtk_pinctrl *hw,
                              const struct mtk_pin_desc *desc, u32 *val);
+int mtk_pinconf_adv_drive_set_raw(struct mtk_pinctrl *hw,
+                                 const struct mtk_pin_desc *desc, u32 arg);
+int mtk_pinconf_adv_drive_get_raw(struct mtk_pinctrl *hw,
+                                 const struct mtk_pin_desc *desc, u32 *val);
 
 bool mtk_is_virt_gpio(struct mtk_pinctrl *hw, unsigned int gpio_n);
 #endif /* __PINCTRL_MTK_COMMON_V2_H */