Necessary pins are now grabbed by respective drivers. Unecessary hogpins are
simply removed.

Signed-off-by: Alexandre Belloni <alexandre.bell...@free-electrons.com>
---
 arch/arm/boot/dts/imx28-cfa10057.dts | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/arch/arm/boot/dts/imx28-cfa10057.dts 
b/arch/arm/boot/dts/imx28-cfa10057.dts
index 2da713c..0333c05 100644
--- a/arch/arm/boot/dts/imx28-cfa10057.dts
+++ b/arch/arm/boot/dts/imx28-cfa10057.dts
@@ -23,35 +23,16 @@
        apb@80000000 {
                apbh@80000000 {
                        pinctrl@80018000 {
-                               pinctrl-names = "default", "default";
-                               pinctrl-1 = <&hog_pins_cfa10057
-                                       &hog_pins_cfa10057_pullup>;
-
-                               hog_pins_cfa10057: hog-10057@0 {
+                               usb_pins_cfa10057: usb-10057@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <
                                                0x0073 /* 
MX28_PAD_GPMI_D7__GPIO_0_7 */
-                                               0x3053 /* 
MX28_PAD_AUART1_TX__GPIO_3_5 */
                                        >;
                                        fsl,drive-strength = <0>;
                                        fsl,voltage = <1>;
                                        fsl,pull-up = <0>;
                                };
 
-                               hog_pins_cfa10057_pullup: hog-10057-pullup@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               0x2133 /* 
MX28_PAD_SSP2_D3__GPIO_2_19 */
-                                               0x3183 /* 
MX28_PAD_I2C0_SCL__GPIO_3_24 */
-                                               0x3193 /* 
MX28_PAD_I2C0_SDA__GPIO_3_25 */
-                                               0x31a3 /* 
MX28_PAD_SAIF_SDATA0__GPIO_3_26 */
-                                               0x31e3 /* 
MX28_PAD_LCD_RESET__GPIO_3_30 */
-                                       >;
-                                       fsl,drive-strength = <0>;
-                                       fsl,voltage = <1>;
-                                       fsl,pull-up = <1>;
-                               };
-
                                lcdif_18bit_pins_cfa10057: lcdif-18bit@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <
@@ -164,6 +145,8 @@
 
                reg_usb1_vbus: usb1_vbus {
                        compatible = "regulator-fixed";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&usb_pins_cfa10057>;
                        regulator-name = "usb1_vbus";
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
-- 
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to