diff --git a/patch/kernel/archive/rockchip64-6.19/rk3308-0001-pinctrl-slew-mux.patch b/patch/kernel/archive/rockchip64-6.19/rk3308-0001-pinctrl-slew-mux.patch.disabled similarity index 96% rename from patch/kernel/archive/rockchip64-6.19/rk3308-0001-pinctrl-slew-mux.patch rename to patch/kernel/archive/rockchip64-6.19/rk3308-0001-pinctrl-slew-mux.patch.disabled index bff0a0340b..25ab5ec1d2 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3308-0001-pinctrl-slew-mux.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3308-0001-pinctrl-slew-mux.patch.disabled @@ -81,16 +81,20 @@ Subject: [ARCHEOLOGY] Rockpis wifi fixes (#4008) 4 files changed, 100 insertions(+) diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c -index 111111111111..222222222222 100644 +index 366775841c63..6a6370d9a237 100644 --- a/drivers/pinctrl/pinconf-generic.c +++ b/drivers/pinctrl/pinconf-generic.c -@@ -54,6 +54,7 @@ static const struct pin_config_item conf_items[] = { +@@ -52,10 +52,11 @@ static const struct pin_config_item conf_items[] = { + PCONFDUMP(PIN_CONFIG_OUTPUT_IMPEDANCE_OHMS, "output impedance", "ohms", true), + PCONFDUMP(PIN_CONFIG_POWER_SOURCE, "pin power source", "selector", true), PCONFDUMP(PIN_CONFIG_SLEEP_HARDWARE_STATE, "sleep hardware state", NULL, false), PCONFDUMP(PIN_CONFIG_SLEW_RATE, "slew rate", NULL, true), PCONFDUMP(PIN_CONFIG_SKEW_DELAY, "skew delay", NULL, true), + PCONFDUMP(PIN_CONFIG_MUX, "mux", NULL, true), + PCONFDUMP(PIN_CONFIG_SKEW_DELAY_INPUT_PS, "input skew delay", "ps", true), + PCONFDUMP(PIN_CONFIG_SKEW_DELAY_OUTPUT_PS, "output skew delay", "ps", true), }; - + static void pinconf_generic_dump_one(struct pinctrl_dev *pctldev, diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index 111111111111..222222222222 100644 @@ -99,7 +103,7 @@ index 111111111111..222222222222 100644 @@ -3000,6 +3000,26 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, return ret; } - + +#define RK3308_SLEW_PINS_PER_REG 8 +#define RK3308_SLEW_BANK_STRIDE 16 +#define RK3308_SLEW_GRF_OFFSET 0x150 @@ -126,7 +130,7 @@ index 111111111111..222222222222 100644 @@ -3115,6 +3135,51 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank *bank, return regmap_update_bits(regmap, reg, rmask, data); } - + +static int rockchip_get_slew_rate(struct rockchip_pin_bank *bank, int pin_num) +{ + struct rockchip_pinctrl *info = bank->drvdata; @@ -194,7 +198,7 @@ index 111111111111..222222222222 100644 @@ -3427,6 +3501,26 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin, if (rc < 0) return rc; - + + arg = rc; + break; + case PIN_CONFIG_SLEW_RATE: @@ -224,7 +228,7 @@ index 111111111111..222222222222 100644 .schmitt_calc_reg = rk3308_calc_schmitt_reg_and_bit, + .slew_rate_calc_reg = rk3308_calc_slew_reg_and_bit, }; - + static struct rockchip_pin_bank rk3328_pin_banks[] = { diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockchip.h index 111111111111..222222222222 100644 @@ -238,7 +242,7 @@ index 111111111111..222222222222 100644 + int pin_num, struct regmap **regmap, + int *reg, u8 *bit); }; - + struct rockchip_pin_config { diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h index 111111111111..222222222222 100644 @@ -252,6 +256,6 @@ index 111111111111..222222222222 100644 PIN_CONFIG_END = 0x7F, PIN_CONFIG_MAX = 0xFF, }; --- +-- Armbian