Merge tag 'u-boot-imx-20200115' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / drivers / pinctrl / rockchip / pinctrl-rockchip.h

diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip.h b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
index c21b79602ca11a657cad7234183f59d9fde2f44f..5edc7cbd7421b63db789cbf0929cf5281ffcc877 100644 (file)
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip.h
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
@@ -8,16 +8,6 @@
 
 #include <linux/types.h>
 
-enum rockchip_pinctrl_type {
-       RV1108,
-       RK3036,
-       RK3128,
-       RK3188,
-       RK3288,
-       RK3368,
-       RK3399,
-};
-
 /**
  * Encode variants of iomux registers into a type variable
  */
@@ -26,6 +16,7 @@ enum rockchip_pinctrl_type {
 #define IOMUX_SOURCE_PMU       BIT(2)
 #define IOMUX_UNROUTED         BIT(3)
 #define IOMUX_WIDTH_3BIT       BIT(4)
+#define IOMUX_8WIDTH_2BIT      BIT(5)
 
 /**
  * Defined some common pins constants
@@ -266,8 +257,6 @@ struct rockchip_pin_ctrl {
        struct rockchip_pin_bank        *pin_banks;
        u32                             nr_banks;
        u32                             nr_pins;
-       char                            *label;
-       enum rockchip_pinctrl_type      type;
        int                             grf_mux_offset;
        int                             pmu_mux_offset;
        int                             grf_drv_offset;
@@ -283,9 +272,8 @@ struct rockchip_pin_ctrl {
                            int pin_num, int pull);
        int     (*set_drive)(struct rockchip_pin_bank *bank,
                             int pin_num, int strength);
-       int     (*schmitt_calc_reg)(struct rockchip_pin_bank *bank,
-                                   int pin_num, struct regmap **regmap,
-                                   int *reg, u8 *bit);
+       int     (*set_schmitt)(struct rockchip_pin_bank *bank,
+                              int pin_num, int enable);
 };
 
 /**