[PATCH 4.4 49/63] Revert "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux"

[Greg Kroah-Hartman]

4.4-stable review patch.  If anyone has any objections, please let me know.

--

From: Greg Kroah-Hartman 

This reverts commit c86bfc7b7b01c4b98c29a39bd60e61fa8e337ebf which was
commit 74402055a2d3ec998a1ded599e86185a27d9bbf4 upstream.

The backport merged incorrectly, so I'm dropping it.

Reported-by: Ben Hutchings 
Cc: Adam Ford 
Cc: Tony Lindgren 
Signed-off-by: Greg Kroah-Hartman 


---
 arch/arm/boot/dts/logicpd-torpedo-som.dtsi |8 
 1 file changed, 8 deletions(-)

--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@ -90,8 +90,6 @@
 };
 
  {
-   pinctrl-names = "default";
-   pinctrl-0 = <_pins>;
clock-frequency = <260>;
 
twl: twl@48 {
@@ -148,12 +146,6 @@
OMAP3630_CORE2_IOPAD(0x25da, PIN_INPUT_PULLUP | 
MUX_MODE2)   /* etk_ctl.sdmmc3_cmd */
>;
};
-   i2c1_pins: pinmux_i2c1_pins {
-   pinctrl-single,pins = <
-   OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0)
/* i2c1_scl.i2c1_scl */
-   OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)
/* i2c1_sda.i2c1_sda */
-   >;
-   };
 };
 
 #include "twl4030.dtsi"

[PATCH 4.4 49/63] Revert "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux"

[Greg Kroah-Hartman]

4.4-stable review patch.  If anyone has any objections, please let me know.

--

From: Greg Kroah-Hartman 

This reverts commit c86bfc7b7b01c4b98c29a39bd60e61fa8e337ebf which was
commit 74402055a2d3ec998a1ded599e86185a27d9bbf4 upstream.

The backport merged incorrectly, so I'm dropping it.

Reported-by: Ben Hutchings 
Cc: Adam Ford 
Cc: Tony Lindgren 
Signed-off-by: Greg Kroah-Hartman 


---
 arch/arm/boot/dts/logicpd-torpedo-som.dtsi |8 
 1 file changed, 8 deletions(-)

--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@ -90,8 +90,6 @@
 };
 
  {
-   pinctrl-names = "default";
-   pinctrl-0 = <_pins>;
clock-frequency = <260>;
 
twl: twl@48 {
@@ -148,12 +146,6 @@
OMAP3630_CORE2_IOPAD(0x25da, PIN_INPUT_PULLUP | 
MUX_MODE2)   /* etk_ctl.sdmmc3_cmd */
>;
};
-   i2c1_pins: pinmux_i2c1_pins {
-   pinctrl-single,pins = <
-   OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0)
/* i2c1_scl.i2c1_scl */
-   OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)
/* i2c1_sda.i2c1_sda */
-   >;
-   };
 };
 
 #include "twl4030.dtsi"