mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "arm: dts: ipq9574: Remove duplicate i2c config"

Browse source
This commit is contained in:
Linux Build Service Account 2021-09-07 07:08:44 -07:00 • committed by Gerrit - the friendly Code Review server
commit 9c2646a753
5 changed files with 25 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
arch/arm/dts/ipq9574-al02-c1.dts
View file

@ -21,8 +21,6 @@
console = "/serial@78B1000"; console = "/serial@78B1000";
uart2 = "/serial@78B2000"; uart2 = "/serial@78B2000";
usb0 = "/xhci@8a00000"; usb0 = "/xhci@8a00000";
pci0 = "/pci@28000000";
pci1 = "/pci@10000000";
pci2 = "/pci@20000000"; pci2 = "/pci@20000000";
pci3 = "/pci@18000000"; pci3 = "/pci@18000000";
nand = "/nand-controller@79B0000"; 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 = <GPIO_PULL_UP>;
oe = <GPIO_OD_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
drvstr = <GPIO_8MA>;
};
};
};
pci1: pci@10000000 {
status = "ok";
perst_gpio = <26>;
pci_gpio {
pci_rst {
gpio = <26>;
func = <0>;
pull = <GPIO_PULL_DOWN>;
oe = <GPIO_OD_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
drvstr = <GPIO_8MA>;
};
};
};
pci2: pci@20000000 { pci2: pci@20000000 {
status = "ok"; status = "ok";
perst_gpio = <29>; perst_gpio = <29>;

20
arch/arm/dts/ipq9574-db-al01-c1.dts
View file

@ -80,26 +80,6 @@
}; };
}; };
i2c0: i2c@78BA000 {
i2c_gpio {
gpio1 {
gpio = <48>;
func = <1>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_8MA>;
oe = <GPIO_OE_ENABLE>;
};
gpio2 {
gpio = <49>;
func = <1>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_8MA>;
oe = <GPIO_OE_ENABLE>;
};
};
};
nand: nand-controller@79B0000 { nand: nand-controller@79B0000 {
status = "okay"; status = "okay";
nand_gpio { nand_gpio {

20
arch/arm/dts/ipq9574-db-al02-c1.dts
View file

@ -80,26 +80,6 @@
}; };
}; };
i2c0: i2c@78BA000 {
i2c_gpio {
gpio1 {
gpio = <48>;
func = <1>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_8MA>;
oe = <GPIO_OE_ENABLE>;
};
gpio2 {
gpio = <49>;
func = <1>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_8MA>;
oe = <GPIO_OE_ENABLE>;
};
};
};
nand: nand-controller@79B0000 { nand: nand-controller@79B0000 {
status = "okay"; status = "okay";
nand_gpio { nand_gpio {

25
arch/arm/dts/ipq9574-db-al02-c3.dts
View file

@ -21,31 +21,6 @@
i2c0 = "/i2c@78B9000"; 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 = <GPIO_PULL_UP>;
drvstr = <GPIO_8MA>;
oe = <GPIO_OE_ENABLE>;
};
gpio2 {
gpio = <51>;
func = <2>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_8MA>;
oe = <GPIO_OE_ENABLE>;
};
};
};
ess-switch { ess-switch {
/* Overriding port5 configuration to support SFP instead /* Overriding port5 configuration to support SFP instead
* of QCA808x. * of QCA808x.

25
arch/arm/dts/ipq9574-soc.dtsi
View file

@ -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 = <GPIO_PULL_UP>;
drvstr = <GPIO_8MA>;
oe = <GPIO_OE_ENABLE>;
};
gpio2 {
gpio = <51>;
func = <2>;
pull = <GPIO_PULL_UP>;
drvstr = <GPIO_8MA>;
oe = <GPIO_OE_ENABLE>;
};
};
};
i2c@78B8000 { i2c@78B8000 {
compatible = "qcom,qup-i2c"; compatible = "qcom,qup-i2c";
#address-cells = <1>; #address-cells = <1>;