rockchip64-current: rewrite patches
This commit is contained in:
parent
57694c740d
commit
15393d6dc6
@ -24,7 +24,7 @@ diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/configs/defconfig
|
||||
+++ b/arch/arm64/configs/defconfig
|
||||
@@ -810,6 +810,7 @@ CONFIG_REGULATOR_BD9571MWV=y
|
||||
@@ -809,6 +809,7 @@ CONFIG_REGULATOR_BD9571MWV=y
|
||||
CONFIG_REGULATOR_CROS_EC=y
|
||||
CONFIG_REGULATOR_DA9211=m
|
||||
CONFIG_REGULATOR_FAN53555=y
|
||||
|
||||
@ -175,7 +175,7 @@ index 111111111111..222222222222 100644
|
||||
/*
|
||||
* Pinmux_ops handling
|
||||
*/
|
||||
@@ -3353,6 +3418,15 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
|
||||
@@ -3352,6 +3417,15 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
break;
|
||||
@ -191,7 +191,7 @@ index 111111111111..222222222222 100644
|
||||
default:
|
||||
return -ENOTSUPP;
|
||||
break;
|
||||
@@ -3427,6 +3501,26 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,
|
||||
@@ -3426,6 +3500,26 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
@ -218,7 +218,7 @@ index 111111111111..222222222222 100644
|
||||
arg = rc;
|
||||
break;
|
||||
default:
|
||||
@@ -4229,6 +4323,7 @@ static struct rockchip_pin_ctrl rk3308_pin_ctrl = {
|
||||
@@ -4228,6 +4322,7 @@ static struct rockchip_pin_ctrl rk3308_pin_ctrl = {
|
||||
.pull_calc_reg = rk3308_calc_pull_reg_and_bit,
|
||||
.drv_calc_reg = rk3308_calc_drv_reg_and_bit,
|
||||
.schmitt_calc_reg = rk3308_calc_schmitt_reg_and_bit,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user