Merge "arm: dts: ipq5018: Update gpio config for MP02.1."

This commit is contained in:
Linux Build Service Account 2020-06-15 13:08:12 -07:00 committed by Gerrit - the friendly Code Review server
commit c02fa92142
2 changed files with 36 additions and 73 deletions

View file

@ -21,27 +21,35 @@
aliases {
console = "/serial@78AF000";
mmc = "/sdhci@7804000";
i2c0 = "/i2c@78b6000";
gmac_gpio = "/gmac_gpio";
usb0 = "/xhci@8a00000";
pci0 = "/pci@80000000";
pci1 = "/pci@a0000000";
};
console: serial@78AF000 {
status = "ok";
serial_gpio {
blsp0_mux_uart_rx {
gpio = <20>;
func = <0>;
pull = <GPIO_PULL_DOWN>;
drvstr = <GPIO_8MA>;
od_en = <GPIO_OD_DISABLE>;
};
blsp0_mux_uart_tx {
gpio = <21>;
func = <0>;
pull = <GPIO_PULL_DOWN>;
drvstr = <GPIO_8MA>;
od_en = <GPIO_OD_DISABLE>;
};
blsp0_uart_rx {
gpio = <28>;
func = <1>;
pull = <GPIO_PULL_DOWN>;
func = <3>;
pull = <GPIO_NO_PULL>;
drvstr = <GPIO_8MA>;
od_en = <GPIO_OD_DISABLE>;
};
blsp0_uart_tx {
gpio = <29>;
func = <1>;
func = <3>;
pull = <GPIO_NO_PULL>;
drvstr = <GPIO_8MA>;
od_en = <GPIO_OD_DISABLE>;
@ -49,32 +57,6 @@
};
};
pci0: pci@80000000 {
status = "ok";
pci_gpio {
pcie_rst_n_5G {
gpio = <15>;
func = <0>;
pull = <GPIO_NO_PULL>;
od_en = <GPIO_OD_DISABLE>;
drvstr = <GPIO_8MA>;
};
};
};
pci1: pci@a0000000 {
status = "ok";
pci_gpio {
pcie_rst_n_6G {
gpio = <27>;
func = <0>;
pull = <GPIO_NO_PULL>;
od_en = <GPIO_OD_DISABLE>;
drvstr = <GPIO_8MA>;
};
};
};
gmac_cfg {
gephy_led = <46>;
@ -86,5 +68,4 @@
};
};
};

View file

@ -21,27 +21,35 @@
aliases {
console = "/serial@78AF000";
mmc = "/sdhci@7804000";
i2c0 = "/i2c@78b6000";
gmac_gpio = "/gmac_gpio";
usb0 = "/xhci@8a00000";
pci0 = "/pci@80000000";
pci1 = "/pci@a0000000";
};
console: serial@78AF000 {
status = "ok";
serial_gpio {
blsp0_mux_uart_rx {
gpio = <20>;
func = <0>;
pull = <GPIO_PULL_DOWN>;
drvstr = <GPIO_8MA>;
od_en = <GPIO_OD_DISABLE>;
};
blsp0_mux_uart_tx {
gpio = <21>;
func = <0>;
pull = <GPIO_PULL_DOWN>;
drvstr = <GPIO_8MA>;
od_en = <GPIO_OD_DISABLE>;
};
blsp0_uart_rx {
gpio = <28>;
func = <1>;
pull = <GPIO_PULL_DOWN>;
func = <3>;
pull = <GPIO_NO_PULL>;
drvstr = <GPIO_8MA>;
od_en = <GPIO_OD_DISABLE>;
};
blsp0_uart_tx {
gpio = <29>;
func = <1>;
func = <3>;
pull = <GPIO_NO_PULL>;
drvstr = <GPIO_8MA>;
od_en = <GPIO_OD_DISABLE>;
@ -49,35 +57,9 @@
};
};
pci0: pci@80000000 {
status = "ok";
pci_gpio {
pcie_rst_n_5G {
gpio = <15>;
func = <0>;
pull = <GPIO_NO_PULL>;
od_en = <GPIO_OD_DISABLE>;
drvstr = <GPIO_8MA>;
};
};
};
pci1: pci@a0000000 {
status = "ok";
pci_gpio {
pcie_rst_n_6G {
gpio = <27>;
func = <0>;
pull = <GPIO_NO_PULL>;
od_en = <GPIO_OD_DISABLE>;
drvstr = <GPIO_8MA>;
};
};
};
gmac_cfg {
gephy_led = <46>
;
gephy_led = <46>;
gmac1_cfg {
unit = <0>;
base = <0x39C00000>;