diff --git a/arch/arm/dts/ipq9574-al02-c1.dts b/arch/arm/dts/ipq9574-al02-c1.dts index e2213ea4cb..ac06adf9b0 100644 --- a/arch/arm/dts/ipq9574-al02-c1.dts +++ b/arch/arm/dts/ipq9574-al02-c1.dts @@ -21,8 +21,6 @@ console = "/serial@78B1000"; uart2 = "/serial@78B2000"; usb0 = "/xhci@8a00000"; - pci0 = "/pci@28000000"; - pci1 = "/pci@10000000"; pci2 = "/pci@20000000"; pci3 = "/pci@18000000"; nand = "/nand-controller@79B0000"; @@ -128,36 +126,6 @@ }; }; - pci0: pci@28000000 { - status = "ok"; - perst_gpio = <23>; - pci_gpio { - pci_rst { - gpio = <23>; - func = <0>; - pull = ; - oe = ; - od_en = ; - drvstr = ; - }; - }; - }; - - pci1: pci@10000000 { - status = "ok"; - perst_gpio = <26>; - pci_gpio { - pci_rst { - gpio = <26>; - func = <0>; - pull = ; - oe = ; - od_en = ; - drvstr = ; - }; - }; - }; - pci2: pci@20000000 { status = "ok"; perst_gpio = <29>; diff --git a/arch/arm/dts/ipq9574-db-al01-c1.dts b/arch/arm/dts/ipq9574-db-al01-c1.dts index 6b1a0ac145..1bc30f2a79 100644 --- a/arch/arm/dts/ipq9574-db-al01-c1.dts +++ b/arch/arm/dts/ipq9574-db-al01-c1.dts @@ -80,26 +80,6 @@ }; }; - i2c0: i2c@78BA000 { - i2c_gpio { - gpio1 { - gpio = <48>; - func = <1>; - pull = ; - drvstr = ; - oe = ; - }; - - gpio2 { - gpio = <49>; - func = <1>; - pull = ; - drvstr = ; - oe = ; - }; - }; - }; - nand: nand-controller@79B0000 { status = "okay"; nand_gpio { diff --git a/arch/arm/dts/ipq9574-db-al02-c1.dts b/arch/arm/dts/ipq9574-db-al02-c1.dts index c280251905..afa5040e22 100644 --- a/arch/arm/dts/ipq9574-db-al02-c1.dts +++ b/arch/arm/dts/ipq9574-db-al02-c1.dts @@ -80,26 +80,6 @@ }; }; - i2c0: i2c@78BA000 { - i2c_gpio { - gpio1 { - gpio = <48>; - func = <1>; - pull = ; - drvstr = ; - oe = ; - }; - - gpio2 { - gpio = <49>; - func = <1>; - pull = ; - drvstr = ; - oe = ; - }; - }; - }; - nand: nand-controller@79B0000 { status = "okay"; nand_gpio { diff --git a/arch/arm/dts/ipq9574-db-al02-c3.dts b/arch/arm/dts/ipq9574-db-al02-c3.dts index f7956a9047..823833e1e6 100644 --- a/arch/arm/dts/ipq9574-db-al02-c3.dts +++ b/arch/arm/dts/ipq9574-db-al02-c3.dts @@ -21,31 +21,6 @@ i2c0 = "/i2c@78B9000"; }; - i2c@78B9000 { - compatible = "qcom,qup-i2c"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x78B9000 0x600>; - clock-frequency = <400000>; - i2c_gpio { - gpio1 { - gpio = <50>; - func = <2>; - pull = ; - drvstr = ; - oe = ; - }; - - gpio2 { - gpio = <51>; - func = <2>; - pull = ; - drvstr = ; - oe = ; - }; - }; - }; - ess-switch { /* Overriding port5 configuration to support SFP instead * of QCA808x. diff --git a/arch/arm/dts/ipq9574-soc.dtsi b/arch/arm/dts/ipq9574-soc.dtsi index 75e7f57a56..fe3e0e785f 100644 --- a/arch/arm/dts/ipq9574-soc.dtsi +++ b/arch/arm/dts/ipq9574-soc.dtsi @@ -118,6 +118,31 @@ }; }; + i2c@78B9000 { + compatible = "qcom,qup-i2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x78B9000 0x600>; + clock-frequency = <400000>; + i2c_gpio { + gpio1 { + gpio = <50>; + func = <2>; + pull = ; + drvstr = ; + oe = ; + }; + + gpio2 { + gpio = <51>; + func = <2>; + pull = ; + drvstr = ; + oe = ; + }; + }; + }; + i2c@78B8000 { compatible = "qcom,qup-i2c"; #address-cells = <1>;