[PATCH 3/4] pinctrl: remove slew-rate parameter from tz1090
From: Heiko StÃbner
Date: Tue Jun 25 2013 - 08:56:43 EST
As the binding for slew-rate is under discussion and seems to need
more tought it will get removed for now, so it doesn't get an offical
release.
Therefore remove it again from the only current user, tz1090.
Signed-off-by: Heiko Stuebner <heiko@xxxxxxxxx>
---
.../devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt | 5 +----
.../devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt | 7 +------
drivers/pinctrl/pinctrl-tz1090-pdc.c | 5 -----
drivers/pinctrl/pinctrl-tz1090.c | 5 -----
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 9f7a85b..a186181 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:
- bias-pull-down
- input-schmitt-enable
- input-schmitt-disable
- - slew-rate: Integer, control slew rate of pins.
- 0: slow (half frequency)
- 1: fast
- drive-strength: Integer, control drive strength of pins in mA.
2: 2mA
4: 4mA
@@ -83,7 +80,7 @@ Valid values for pin and group names are:
drive groups:
- These support input-schmitt-enable, input-schmitt-disable, slew-rate,
+ These support input-schmitt-enable, input-schmitt-disable,
drive-strength, low-power-enable, and low-power-disable.
pdc
diff --git a/Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt
index 39bfd9c..4b27c99 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:
- bias-pull-down
- input-schmitt-enable
- input-schmitt-disable
- - slew-rate: Integer, control slew rate of pins.
- 0: slow (half frequency)
- 1: fast
- drive-strength: Integer, control drive strength of pins in mA.
2: 2mA
4: 4mA
@@ -124,7 +121,6 @@ Valid values for pin and group names are:
function: afe, ts_out_0.
input-schmitt-enable: supported.
input-schmitt-disable: supported.
- slew-rate: supported.
drive-strength: supported.
pdm_d
pins: pdm_d.
@@ -153,12 +149,11 @@ Valid values for pin and group names are:
lcd_trace, phy_ringosc.
input-schmitt-enable: supported.
input-schmitt-disable: supported.
- slew-rate: supported.
drive-strength: supported.
drive groups:
- These all support input-schmitt-enable, input-schmitt-disable, slew-rate,
+ These all support input-schmitt-enable, input-schmitt-disable,
and drive-strength.
jtag
diff --git a/drivers/pinctrl/pinctrl-tz1090-pdc.c b/drivers/pinctrl/pinctrl-tz1090-pdc.c
index 12e4808..d4f12cc 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,
*width = 1;
*map = tz1090_pdc_boolean_map;
break;
- case PIN_CONFIG_SLEW_RATE:
- *shift = REG_GPIO_CONTROL2_PDC_SR_S;
- *width = 1;
- *map = tz1090_pdc_boolean_map;
- break;
case PIN_CONFIG_DRIVE_STRENGTH:
*shift = REG_GPIO_CONTROL2_PDC_DR_S;
*width = 2;
diff --git a/drivers/pinctrl/pinctrl-tz1090.c b/drivers/pinctrl/pinctrl-tz1090.c
index 02ff3a2..4edae08 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,
*width = 1;
*map = tz1090_boolean_map;
break;
- case PIN_CONFIG_SLEW_RATE:
- *reg = REG_PINCTRL_SR;
- *width = 1;
- *map = tz1090_boolean_map;
- break;
case PIN_CONFIG_DRIVE_STRENGTH:
*reg = REG_PINCTRL_DR;
*width = 2;
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/