ARM: dts: apq8064: remove redundant i2c pinctrl properties
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Fri, 18 Sep 2015 12:30:13 +0000 (13:30 +0100)
committerAndy Gross <agross@codeaurora.org>
Tue, 13 Oct 2015 21:39:55 +0000 (16:39 -0500)
This patch removes i2c pinctrl properties from board which which are now
mentioned in the SOC specific file. This will avoid redundant properties
across multiple board fiiles.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
arch/arm/boot/dts/qcom-apq8064.dtsi

index 47c0282bdfca7ce11a8ce0e05119f8df229b9a4f..80ab5b88b0f47f856ec4f801b9624c44d35267b1 100644 (file)
        };
 
        soc {
-               pinctrl@800000 {
-                       i2c1_pins: i2c1 {
-                               mux {
-                                       pins = "gpio20", "gpio21";
-                                       function = "gsbi1";
-                               };
-                       };
-               };
-
                rpm@108000 {
                        regulators {
                                vin_lvs1_3_6-supply = <&pm8921_s4>;
@@ -96,8 +87,6 @@
                        i2c@12460000 {
                                status = "okay";
                                clock-frequency = <200000>;
-                               pinctrl-0 = <&i2c1_pins>;
-                               pinctrl-names = "default";
 
                                eeprom: eeprom@50 {
                                        compatible = "24c02";
index f3100da082b2a3cbe1a1229a1f6be0a21ab4ca5a..b701f33436bb0a7b50e81b7db366aff5ecb76896 100644 (file)
                        qcom,mode = <GSBI_PROT_I2C>;
                        i2c3: i2c@16280000 {
                                status = "okay";
-                               pinctrl-0 = <&i2c3_pins>;
-                               pinctrl-names = "default";
                        };
                };
 
                        i2c@12460000 {
                                status = "okay";
                                clock-frequency = <200000>;
-                               pinctrl-0 = <&i2c1_pins>;
-                               pinctrl-names = "default";
 
                                eeprom: eeprom@52 {
                                        compatible = "atmel,24c128";
 
                        serial@16540000 {
                                status = "ok";
-
                                pinctrl-names = "default";
                                pinctrl-0 = <&uart_pins>;
                        };
index d2e94d647c27936c682c7a4d6bb9033c769173e7..53d53118943354314562c5d930ab42601f836453 100644 (file)
 
                        i2c1: i2c@12460000 {
                                compatible = "qcom,i2c-qup-v1.1.1";
+                               pinctrl-0 = <&i2c1_pins>;
+                               pinctrl-names = "default";
                                reg = <0x12460000 0x1000>;
                                interrupts = <0 194 IRQ_TYPE_NONE>;
                                clocks = <&gcc GSBI1_QUP_CLK>, <&gcc GSBI1_H_CLK>;
                        ranges;
                        i2c3: i2c@16280000 {
                                compatible = "qcom,i2c-qup-v1.1.1";
+                               pinctrl-0 = <&i2c3_pins>;
+                               pinctrl-names = "default";
                                reg = <0x16280000 0x1000>;
                                interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;
                                clocks = <&gcc GSBI3_QUP_CLK>,