From beb0862c02762f3be8856dcd000a50c4ffed4075 Mon Sep 17 00:00:00 2001 From: suyuan168 <175338101@qq.com> Date: Sun, 3 Jul 2022 01:01:09 +0800 Subject: [PATCH] Update qcom-ipq4019-nhx4019.dts --- .../arm/boot/dts/qcom-ipq4019-nhx4019.dts | 151 ++++++++---------- 1 file changed, 65 insertions(+), 86 deletions(-) diff --git a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-nhx4019.dts b/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-nhx4019.dts index ae7284a5..8e7836f1 100644 --- a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-nhx4019.dts +++ b/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-nhx4019.dts @@ -38,7 +38,7 @@ status = "okay"; pinctrl-0 = <&mdio_pins>; pinctrl-names = "default"; - reset-gpios = <&tlmm 47 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio 47 GPIO_ACTIVE_LOW>; reset-delay-us = <2000>; }; @@ -93,24 +93,6 @@ edma@c080000 { status = "okay"; }; - - m2_pins: m2_pinmux { - mux_1 { - pins = "gpio49", "gpio42", "gpio43", "gpio48"; - function = "gpio"; - drive-strength = <2>; - bias-none; - output-down; - }; - - mux_2 { - pins = "gpio19", "gpio50", "gpio51", "gpio46"; - function = "gpio"; - drive-strength = <2>; - bias-none; - output-high; - }; - }; }; leds { @@ -118,42 +100,42 @@ led_sys: status { label = "nhx:system"; - gpio = <&tlmm 4 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 4 GPIO_ACTIVE_HIGH>; }; lte1 { label = "nhx:5g1"; - gpio = <&tlmm 3 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 3 GPIO_ACTIVE_HIGH>; }; lterssi1 { label = "nhx:5g2"; - gpio = <&tlmm 2 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 2 GPIO_ACTIVE_HIGH>; }; lterssi2 { label = "nhx:5g3"; - gpio = <&tlmm 1 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 1 GPIO_ACTIVE_HIGH>; }; lterssi3 { label = "nhx:wifi2"; - gpio = <&tlmm 36 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 36 GPIO_ACTIVE_HIGH>; }; wifi { label = "nhx:wifi5"; - gpio = <&tlmm 37 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 37 GPIO_ACTIVE_HIGH>; }; err { label = "nhx:net"; - gpio = <&tlmm 44 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 44 GPIO_ACTIVE_HIGH>; }; net { label = "nhx:xnet"; - gpio = <&tlmm 0 GPIO_ACTIVE_HIGH>; + gpio = <&gpio 0 GPIO_ACTIVE_HIGH>; }; }; @@ -162,10 +144,62 @@ reset { label = "reset"; - gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,code = ; }; - }; + }; + + gpio_export { + compatible = "gpio-export"; + #size-cells = <0>; + + 3vpower { + gpio-export,name = "3vpower"; + gpio-export,output = <1>; + gpio = <&gpio 19 GPIO_ACTIVE_HIGH>; + }; + + m2power { + gpio-export,name = "m2power"; + gpio-export,output = <1>; + gpio = <&gpio 48 GPIO_ACTIVE_LOW>; + }; + + m2reset { + gpio-export,name = "m2reset"; + gpio-export,output = <1>; + gpio = <&gpio 49 GPIO_ACTIVE_LOW>; + }; + + m2dcpower { + gpio-export,name = "m2dcpower"; + gpio-export,output = <1>; + gpio = <&gpio 51 GPIO_ACTIVE_HIGH>; + }; + + pcie1dcpower { + gpio-export,name = "pcie1dcpower"; + gpio-export,output = <1>; + gpio = <&gpio 50 GPIO_ACTIVE_HIGH>; + }; + + pcie1rst { + gpio-export,name = "pcie1rst"; + gpio-export,output = <1>; + gpio = <&gpio 42 GPIO_ACTIVE_LOW>; + }; + + pcie2dcpower { + gpio-export,name = "pcie2dcpower"; + gpio-export,output = <1>; + gpio = <&gpio 46 GPIO_ACTIVE_HIGH>; + }; + pcie2rst { + gpio-export,name = "pcie2rst"; + gpio-export,output = <1>; + gpio = <&gpio 43 GPIO_ACTIVE_LOW>; + }; + }; }; &blsp_dma { @@ -273,8 +307,8 @@ &pcie0 { status = "okay"; - perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>; - wake-gpio = <&tlmm 40 GPIO_ACTIVE_LOW>; + perst-gpio = <&gpio 38 GPIO_ACTIVE_LOW>; + wake-gpio = <&gpio 40 GPIO_ACTIVE_LOW>; /* Free slot for use */ bridge@0,0 { @@ -360,61 +394,6 @@ bias-disable; }; }; - - - gpio-export { - compatible = "gpio-export"; - pinctrl-0 = <&m2_pins>; - pinctrl-names = "default"; - - 3vpower { - gpio-export,name = "3vpower"; - gpio-export,output = <1>; - gpio = <&tlmm 19 GPIO_ACTIVE_LOW>; - }; - - m2power { - gpio-export,name = "m2power"; - gpio-export,output = <1>; - gpio = <&tlmm 48 GPIO_ACTIVE_LOW>; - }; - - m2reset { - gpio-export,name = "m2reset"; - gpio-export,output = <1>; - gpio = <&tlmm 49 GPIO_ACTIVE_LOW>; - }; - - m2_dc_en { - gpio-export,name = "m2_dc_en"; - gpio-export,output = <1>; - gpio = <&tlmm 51 GPIO_ACTIVE_LOW>; // high enbale - }; - - pcie1_dc_en { - gpio-export,name = "pcie1_dc_en"; - gpio-export,output = <1>; - gpio = <&tlmm 50 GPIO_ACTIVE_HIGH>; - }; - - pcie1_reset { - gpio-export,name = "pcie1_reset"; - gpio-export,output = <1>; - gpio = <&tlmm 42 GPIO_ACTIVE_LOW>; - }; - - pcie2_dc_en { - gpio-export,name = "pcie2_dc_en"; - gpio-export,output = <1>; - gpio = <&tlmm 46 GPIO_ACTIVE_HIGH>; - }; - - pcie2_reset { - gpio-export,name = "pcie2_reset"; - gpio-export,output = <1>; - gpio = <&tlmm 43 GPIO_ACTIVE_LOW>; - }; - }; }; &gmac0 {