aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt5
-rw-r--r--Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt7
-rw-r--r--drivers/pinctrl/pinctrl-tz1090-pdc.c5
-rw-r--r--drivers/pinctrl/pinctrl-tz1090.c5
4 files changed, 2 insertions, 20 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt
index 9f7a85bb8fca..a186181c402b 100644
--- a/Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt
@@ -44,9 +44,6 @@ Optional subnode-properties:
44 - bias-pull-down 44 - bias-pull-down
45 - input-schmitt-enable 45 - input-schmitt-enable
46 - input-schmitt-disable 46 - input-schmitt-disable
47 - slew-rate: Integer, control slew rate of pins.
48 0: slow (half frequency)
49 1: fast
50 - drive-strength: Integer, control drive strength of pins in mA. 47 - drive-strength: Integer, control drive strength of pins in mA.
51 2: 2mA 48 2: 2mA
52 4: 4mA 49 4: 4mA
@@ -83,7 +80,7 @@ Valid values for pin and group names are:
83 80
84 drive groups: 81 drive groups:
85 82
86 These support input-schmitt-enable, input-schmitt-disable, slew-rate, 83 These support input-schmitt-enable, input-schmitt-disable,
87 drive-strength, low-power-enable, and low-power-disable. 84 drive-strength, low-power-enable, and low-power-disable.
88 85
89 pdc 86 pdc
diff --git a/Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt
index 39bfd9cd6bba..4b27c99f7f9d 100644
--- a/Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt
@@ -44,9 +44,6 @@ Optional subnode-properties:
44 - bias-pull-down 44 - bias-pull-down
45 - input-schmitt-enable 45 - input-schmitt-enable
46 - input-schmitt-disable 46 - input-schmitt-disable
47 - slew-rate: Integer, control slew rate of pins.
48 0: slow (half frequency)
49 1: fast
50 - drive-strength: Integer, control drive strength of pins in mA. 47 - drive-strength: Integer, control drive strength of pins in mA.
51 2: 2mA 48 2: 2mA
52 4: 4mA 49 4: 4mA
@@ -124,7 +121,6 @@ Valid values for pin and group names are:
124 function: afe, ts_out_0. 121 function: afe, ts_out_0.
125 input-schmitt-enable: supported. 122 input-schmitt-enable: supported.
126 input-schmitt-disable: supported. 123 input-schmitt-disable: supported.
127 slew-rate: supported.
128 drive-strength: supported. 124 drive-strength: supported.
129 pdm_d 125 pdm_d
130 pins: pdm_d. 126 pins: pdm_d.
@@ -153,12 +149,11 @@ Valid values for pin and group names are:
153 lcd_trace, phy_ringosc. 149 lcd_trace, phy_ringosc.
154 input-schmitt-enable: supported. 150 input-schmitt-enable: supported.
155 input-schmitt-disable: supported. 151 input-schmitt-disable: supported.
156 slew-rate: supported.
157 drive-strength: supported. 152 drive-strength: supported.
158 153
159 drive groups: 154 drive groups:
160 155
161 These all support input-schmitt-enable, input-schmitt-disable, slew-rate, 156 These all support input-schmitt-enable, input-schmitt-disable,
162 and drive-strength. 157 and drive-strength.
163 158
164 jtag 159 jtag
diff --git a/drivers/pinctrl/pinctrl-tz1090-pdc.c b/drivers/pinctrl/pinctrl-tz1090-pdc.c
index 12e480869468..d4f12cc556b4 100644
--- a/drivers/pinctrl/pinctrl-tz1090-pdc.c
+++ b/drivers/pinctrl/pinctrl-tz1090-pdc.c
@@ -809,11 +809,6 @@ static int tz1090_pdc_pinconf_group_reg(struct pinctrl_dev *pctldev,
809 *width = 1; 809 *width = 1;
810 *map = tz1090_pdc_boolean_map; 810 *map = tz1090_pdc_boolean_map;
811 break; 811 break;
812 case PIN_CONFIG_SLEW_RATE:
813 *shift = REG_GPIO_CONTROL2_PDC_SR_S;
814 *width = 1;
815 *map = tz1090_pdc_boolean_map;
816 break;
817 case PIN_CONFIG_DRIVE_STRENGTH: 812 case PIN_CONFIG_DRIVE_STRENGTH:
818 *shift = REG_GPIO_CONTROL2_PDC_DR_S; 813 *shift = REG_GPIO_CONTROL2_PDC_DR_S;
819 *width = 2; 814 *width = 2;
diff --git a/drivers/pinctrl/pinctrl-tz1090.c b/drivers/pinctrl/pinctrl-tz1090.c
index 02ff3a238168..4edae08a0a61 100644
--- a/drivers/pinctrl/pinctrl-tz1090.c
+++ b/drivers/pinctrl/pinctrl-tz1090.c
@@ -1834,11 +1834,6 @@ static int tz1090_pinconf_group_reg(struct pinctrl_dev *pctldev,
1834 *width = 1; 1834 *width = 1;
1835 *map = tz1090_boolean_map; 1835 *map = tz1090_boolean_map;
1836 break; 1836 break;
1837 case PIN_CONFIG_SLEW_RATE:
1838 *reg = REG_PINCTRL_SR;
1839 *width = 1;
1840 *map = tz1090_boolean_map;
1841 break;
1842 case PIN_CONFIG_DRIVE_STRENGTH: 1837 case PIN_CONFIG_DRIVE_STRENGTH:
1843 *reg = REG_PINCTRL_DR; 1838 *reg = REG_PINCTRL_DR;
1844 *width = 2; 1839 *width = 2;