From: Felix Baumann Date: Wed, 8 Feb 2023 01:25:00 +0000 (+0100) Subject: ipq4019: fix dts white-space X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1c31ca5da9aaa043069bcdb209248a8c26bf690a;p=openwrt%2Fstaging%2Fnbd.git ipq4019: fix dts white-space Replace blanks with tabs Remove whitespace from otherwise empty lines Signed-off-by: Felix Baumann --- diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts index 724047c469..493905d56d 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts @@ -182,17 +182,17 @@ }; &gmac { - status = "okay"; + status = "okay"; }; &switch { - status = "okay"; + status = "okay"; }; &swport5 { - status = "okay"; + status = "okay"; - label = "lan"; + label = "lan"; }; &tlmm { diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts index a742138cdf..ad3d1ac120 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts @@ -196,9 +196,9 @@ }; partition@180000 { - label = "log"; - reg = <0x00180000 0x00020000>; - }; + label = "log"; + reg = <0x00180000 0x00020000>; + }; }; }; @@ -262,9 +262,9 @@ }; &blsp1_i2c3 { - status = "okay"; - pinctrl-0 = <&i2c_0_pins>; - pinctrl-names = "default"; + status = "okay"; + pinctrl-0 = <&i2c_0_pins>; + pinctrl-names = "default"; }; &usb2 { diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts index 07fa80742e..de3fa96922 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts @@ -222,18 +222,18 @@ }; &gmac { - status = "okay"; + status = "okay"; }; &switch { - status = "okay"; + status = "okay"; - /delete-property/ psgmii-ethphy; + /delete-property/ psgmii-ethphy; }; &swport5 { - status = "okay"; + status = "okay"; - label = "lan"; - phy-mode = "rgmii"; + label = "lan"; + phy-mode = "rgmii"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3-lte6-kit.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3-lte6-kit.dts index f6a42cfedb..6459fc3b92 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3-lte6-kit.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3-lte6-kit.dts @@ -158,12 +158,12 @@ line-name = "enable USB power"; }; - enable-mpcie-power { - gpio-hog; - gpios = <51 GPIO_ACTIVE_HIGH>; - output-high; - line-name = "enable mPCI-E power"; - }; + enable-mpcie-power { + gpio-hog; + gpios = <51 GPIO_ACTIVE_HIGH>; + output-high; + line-name = "enable mPCI-E power"; + }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts index e1e8cf2588..1f0572b879 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts @@ -7,513 +7,513 @@ #include / { - model = "Linksys WHW03 V2 (Velop)"; - compatible = "linksys,whw03v2", "qcom,ipq4019"; - - aliases { - led-boot = &led_blue; - led-failsafe = &led_red; - led-running = &led_green; - led-upgrade = &led_red; - }; - - // The arguments rootfstype and ro are needed - // to override the default bootargs - chosen { - bootargs-append = " root=/dev/ubiblock0_0 rootfstype=squashfs ro"; - stdout-path = &blsp1_uart1; - }; - - soc { - ess-tcsr@1953000 { - compatible = "qcom,tcsr"; - reg = <0x1953000 0x1000>; - qcom,ess-interface-select = ; - }; - - - tcsr@1949000 { - compatible = "qcom,tcsr"; - reg = <0x1949000 0x100>; - qcom,wifi_glb_cfg = ; - }; - - tcsr@194b000 { - compatible = "qcom,tcsr"; - reg = <0x194b000 0x100>; - qcom,usb-hsphy-mode-select = ; - }; - - tcsr@1957000 { - compatible = "qcom,tcsr"; - reg = <0x1957000 0x100>; - qcom,wifi_noc_memtype_m0_m2 = ; - }; - }; - - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; + model = "Linksys WHW03 V2 (Velop)"; + compatible = "linksys,whw03v2", "qcom,ipq4019"; + + aliases { + led-boot = &led_blue; + led-failsafe = &led_red; + led-running = &led_green; + led-upgrade = &led_red; + }; + + // The arguments rootfstype and ro are needed + // to override the default bootargs + chosen { + bootargs-append = " root=/dev/ubiblock0_0 rootfstype=squashfs ro"; + stdout-path = &blsp1_uart1; + }; + + soc { + ess-tcsr@1953000 { + compatible = "qcom,tcsr"; + reg = <0x1953000 0x1000>; + qcom,ess-interface-select = ; + }; + + + tcsr@1949000 { + compatible = "qcom,tcsr"; + reg = <0x1949000 0x100>; + qcom,wifi_glb_cfg = ; + }; + + tcsr@194b000 { + compatible = "qcom,tcsr"; + reg = <0x194b000 0x100>; + qcom,usb-hsphy-mode-select = ; + }; + + tcsr@1957000 { + compatible = "qcom,tcsr"; + reg = <0x1957000 0x100>; + qcom,wifi_noc_memtype_m0_m2 = ; + }; + }; + + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; }; &tlmm { - mdio_pins: mdio-pinmux { - mux-1 { - pins = "gpio6"; - function = "mdio"; - bias-pull-up; - }; - - mux-2 { - pins = "gpio7"; - function = "mdc"; - bias-pull-up; - }; - }; - - i2c_0_pins: i2c-0-pinmux { - mux { - function = "blsp_i2c0"; - pins = "gpio20", "gpio21"; - bias-disable; - }; - }; - - serial_0_pins: serial0-pinmux { - mux { - pins = "gpio16", "gpio17"; - function = "blsp_uart0"; - bias-disable; - }; - }; - - serial_1_pins: serial1-pinmux { - mux { - pins = "gpio8", "gpio9", "gpio10", "gpio11"; - function = "blsp_uart1"; - bias-disable; - }; - }; - - spi_0_pins: spi-0-pinmux { - mux { - function = "blsp_spi0"; - pins = "gpio13", "gpio14", "gpio15"; - drive-strength = <12>; - bias-disable; - }; - - mux-cs { - pins = "gpio12"; - drive-strength = <2>; - bias-disable; - output-high; - }; - }; - - spi_1_pins: spi-1-pinmux { - mux-1 { - function = "blsp_spi1"; - pins = "gpio44", "gpio46","gpio47"; - bias-disable; - }; - - mux-2 { - pins = "gpio31", "gpio45", "gpio49"; - function = "gpio"; - bias-pull-up; - output-high; - }; - - host-interrupt { - pins = "gpio42"; - function = "gpio"; - input; - }; - }; - - wifi_0_pins: wifi0-pinmux { - btcoexist { - bias-pull-up; - drive-strength = <6>; - function = "gpio"; - output-high; - pins = "gpio52"; - }; - }; - - zigbee-0 { - gpio-hog; - gpios = <29 GPIO_ACTIVE_HIGH>; - bias-disable; - output-low; - }; - - zigbee-1 { - gpio-hog; - gpios = <50 GPIO_ACTIVE_HIGH>; - bias-disable; - input; - }; - - bluetooth-enable { - gpio-hog; - gpios = <32 GPIO_ACTIVE_HIGH>; - output-high; - }; + mdio_pins: mdio-pinmux { + mux-1 { + pins = "gpio6"; + function = "mdio"; + bias-pull-up; + }; + + mux-2 { + pins = "gpio7"; + function = "mdc"; + bias-pull-up; + }; + }; + + i2c_0_pins: i2c-0-pinmux { + mux { + function = "blsp_i2c0"; + pins = "gpio20", "gpio21"; + bias-disable; + }; + }; + + serial_0_pins: serial0-pinmux { + mux { + pins = "gpio16", "gpio17"; + function = "blsp_uart0"; + bias-disable; + }; + }; + + serial_1_pins: serial1-pinmux { + mux { + pins = "gpio8", "gpio9", "gpio10", "gpio11"; + function = "blsp_uart1"; + bias-disable; + }; + }; + + spi_0_pins: spi-0-pinmux { + mux { + function = "blsp_spi0"; + pins = "gpio13", "gpio14", "gpio15"; + drive-strength = <12>; + bias-disable; + }; + + mux-cs { + pins = "gpio12"; + drive-strength = <2>; + bias-disable; + output-high; + }; + }; + + spi_1_pins: spi-1-pinmux { + mux-1 { + function = "blsp_spi1"; + pins = "gpio44", "gpio46","gpio47"; + bias-disable; + }; + + mux-2 { + pins = "gpio31", "gpio45", "gpio49"; + function = "gpio"; + bias-pull-up; + output-high; + }; + + host-interrupt { + pins = "gpio42"; + function = "gpio"; + input; + }; + }; + + wifi_0_pins: wifi0-pinmux { + btcoexist { + bias-pull-up; + drive-strength = <6>; + function = "gpio"; + output-high; + pins = "gpio52"; + }; + }; + + zigbee-0 { + gpio-hog; + gpios = <29 GPIO_ACTIVE_HIGH>; + bias-disable; + output-low; + }; + + zigbee-1 { + gpio-hog; + gpios = <50 GPIO_ACTIVE_HIGH>; + bias-disable; + input; + }; + + bluetooth-enable { + gpio-hog; + gpios = <32 GPIO_ACTIVE_HIGH>; + output-high; + }; }; &mdio { - status = "okay"; - pinctrl-0 = <&mdio_pins>; - pinctrl-names = "default"; - phy-reset-gpios = <&tlmm 19 GPIO_ACTIVE_LOW>; + status = "okay"; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; + phy-reset-gpios = <&tlmm 19 GPIO_ACTIVE_LOW>; }; ðphy0 { - status = "disabled"; + status = "disabled"; }; ðphy1 { - status = "disabled"; + status = "disabled"; }; ðphy2 { - status = "disabled"; + status = "disabled"; }; ðphy3 { - reg = <0x1b>; + reg = <0x1b>; }; ðphy4 { - reg = <0x1c>; + reg = <0x1c>; }; &psgmiiphy { - reg = <0x1d>; + reg = <0x1d>; }; &watchdog { - status = "okay"; + status = "okay"; }; &prng { - status = "okay"; + status = "okay"; }; &blsp_dma { - status = "okay"; + status = "okay"; }; &cryptobam { - num-channels = <4>; - qcom,num-ees = <2>; + num-channels = <4>; + qcom,num-ees = <2>; - status = "okay"; + status = "okay"; }; &crypto { - status = "okay"; + status = "okay"; }; &blsp1_uart1 { - status = "okay"; - pinctrl-0 = <&serial_0_pins>; - pinctrl-names = "default"; + status = "okay"; + pinctrl-0 = <&serial_0_pins>; + pinctrl-names = "default"; }; &blsp1_uart2 { - status = "okay"; - pinctrl-0 = <&serial_1_pins>; - pinctrl-names = "default"; + status = "okay"; + pinctrl-0 = <&serial_1_pins>; + pinctrl-names = "default"; - bluetooth { - compatible = "csr,8811"; + bluetooth { + compatible = "csr,8811"; - enable-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>; - }; + enable-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>; + }; }; &blsp1_spi2 { - pinctrl-0 = <&spi_1_pins>; - pinctrl-names = "default"; - status = "okay"; + pinctrl-0 = <&spi_1_pins>; + pinctrl-names = "default"; + status = "okay"; - cs-gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>; + cs-gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>; - zigbee@0 { - #address-cells = <1>; - #size-cells = <0>; + zigbee@0 { + #address-cells = <1>; + #size-cells = <0>; - compatible = "silabs,em3581"; - reg = <0>; - spi-max-frequency = <12000000>; - }; + compatible = "silabs,em3581"; + reg = <0>; + spi-max-frequency = <12000000>; + }; }; &blsp1_i2c3 { - pinctrl-0 = <&i2c_0_pins>; - pinctrl-names = "default"; - - status = "okay"; - - // RGB LEDs - pca9633: led-controller { - compatible = "nxp,pca9633"; - nxp,hw-blink; - reg = <0x62>; - #address-cells = <1>; - #size-cells = <0>; - - led_red: red@0 { - label = "red"; - color = ; - function = LED_FUNCTION_INDICATOR; - linux,default-trigger = "none"; - reg = <0>; - }; - - led_green: green@1 { - label = "green"; - color = ; - function = LED_FUNCTION_INDICATOR; - linux,default-trigger = "none"; - reg = <1>; - }; - - led_blue: blue@2 { - label = "blue"; - color = ; - function = LED_FUNCTION_INDICATOR; - linux,default-trigger = "default-on"; - reg = <2>; - }; - }; + pinctrl-0 = <&i2c_0_pins>; + pinctrl-names = "default"; + + status = "okay"; + + // RGB LEDs + pca9633: led-controller { + compatible = "nxp,pca9633"; + nxp,hw-blink; + reg = <0x62>; + #address-cells = <1>; + #size-cells = <0>; + + led_red: red@0 { + label = "red"; + color = ; + function = LED_FUNCTION_INDICATOR; + linux,default-trigger = "none"; + reg = <0>; + }; + + led_green: green@1 { + label = "green"; + color = ; + function = LED_FUNCTION_INDICATOR; + linux,default-trigger = "none"; + reg = <1>; + }; + + led_blue: blue@2 { + label = "blue"; + color = ; + function = LED_FUNCTION_INDICATOR; + linux,default-trigger = "default-on"; + reg = <2>; + }; + }; }; &usb3_ss_phy { - status = "okay"; + status = "okay"; }; &usb3_hs_phy { - status = "okay"; + status = "okay"; }; &usb2_hs_phy { - status = "okay"; + status = "okay"; }; &nand { - status = "okay"; - - nand@0 { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "SBL1"; - reg = <0x0 0x100000>; - read-only; - }; - - partition@100000 { - label = "MIBIB"; - reg = <0x100000 0x100000>; - read-only; - }; - - partition@200000 { - label = "QSEE"; - reg = <0x200000 0x100000>; - read-only; - }; - - partition@300000 { - label = "CDT"; - reg = <0x300000 0x80000>; - read-only; - }; - - partition@380000 { - label = "APPSBL"; - reg = <0x380000 0x200000>; - read-only; - }; - - partition@580000 { - label = "ART"; - reg = <0x580000 0x80000>; - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; - read-only; - - precal_art_1000: precal@1000 { - reg = <0x1000 0x2f20>; - }; - - precal_art_5000: precal@5000 { - reg = <0x5000 0x2f20>; - }; - - precal_art_9000: precal@9000 { - reg = <0x9000 0x2f20>; - }; - - macaddr_gmac0: macaddr@0 { - reg = <0x0 0x6>; - }; - - macaddr_gmac1: macaddr@6 { - reg = <0x6 0x6>; - }; - }; - - partition@600000 { - label = "u_env"; - reg = <0x600000 0x80000>; - }; - - partition@680000 { - label = "s_env"; - reg = <0x680000 0x40000>; - }; - - partition@6c0000 { - label = "devinfo"; - reg = <0x6c0000 0x40000>; - read-only; - }; - - partition@700000 { - label = "kernel"; - reg = <0x700000 0xa100000>; - }; - - partition@d00000 { - label = "rootfs"; - reg = <0xd00000 0x9b00000>; - }; - - partition@a800000 { - label = "alt_kernel"; - reg = <0xa800000 0xa100000>; - }; - - partition@ae00000 { - label = "alt_rootfs"; - reg = <0xae00000 0x9b00000>; - }; - - partition@14900000 { - label = "sysdiag"; - reg = <0x14900000 0x200000>; - read-only; - }; - - partition@14b00000 { - label = "syscfg"; - reg = <0x14b00000 0xb500000>; - read-only; - }; - }; - }; + status = "okay"; + + nand@0 { + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "SBL1"; + reg = <0x0 0x100000>; + read-only; + }; + + partition@100000 { + label = "MIBIB"; + reg = <0x100000 0x100000>; + read-only; + }; + + partition@200000 { + label = "QSEE"; + reg = <0x200000 0x100000>; + read-only; + }; + + partition@300000 { + label = "CDT"; + reg = <0x300000 0x80000>; + read-only; + }; + + partition@380000 { + label = "APPSBL"; + reg = <0x380000 0x200000>; + read-only; + }; + + partition@580000 { + label = "ART"; + reg = <0x580000 0x80000>; + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + read-only; + + precal_art_1000: precal@1000 { + reg = <0x1000 0x2f20>; + }; + + precal_art_5000: precal@5000 { + reg = <0x5000 0x2f20>; + }; + + precal_art_9000: precal@9000 { + reg = <0x9000 0x2f20>; + }; + + macaddr_gmac0: macaddr@0 { + reg = <0x0 0x6>; + }; + + macaddr_gmac1: macaddr@6 { + reg = <0x6 0x6>; + }; + }; + + partition@600000 { + label = "u_env"; + reg = <0x600000 0x80000>; + }; + + partition@680000 { + label = "s_env"; + reg = <0x680000 0x40000>; + }; + + partition@6c0000 { + label = "devinfo"; + reg = <0x6c0000 0x40000>; + read-only; + }; + + partition@700000 { + label = "kernel"; + reg = <0x700000 0xa100000>; + }; + + partition@d00000 { + label = "rootfs"; + reg = <0xd00000 0x9b00000>; + }; + + partition@a800000 { + label = "alt_kernel"; + reg = <0xa800000 0xa100000>; + }; + + partition@ae00000 { + label = "alt_rootfs"; + reg = <0xae00000 0x9b00000>; + }; + + partition@14900000 { + label = "sysdiag"; + reg = <0x14900000 0x200000>; + read-only; + }; + + partition@14b00000 { + label = "syscfg"; + reg = <0x14b00000 0xb500000>; + read-only; + }; + }; + }; }; &pcie0 { - status = "okay"; - - perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 40 GPIO_ACTIVE_LOW>; - clkreq-gpios = <&tlmm 39 GPIO_ACTIVE_LOW>; - - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - - wifi2: wifi@1,0 { - compatible = "qcom,ath10k"; - reg = <0x00010000 0 0 0 0>; - }; - }; + status = "okay"; + + perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 40 GPIO_ACTIVE_LOW>; + clkreq-gpios = <&tlmm 39 GPIO_ACTIVE_LOW>; + + bridge@0,0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + ranges; + + wifi2: wifi@1,0 { + compatible = "qcom,ath10k"; + reg = <0x00010000 0 0 0 0>; + }; + }; }; &qpic_bam { - status = "okay"; + status = "okay"; }; &gmac { - status = "okay"; + status = "okay"; }; &switch { - status = "okay"; + status = "okay"; }; &swport4 { - status = "okay"; - label = "lan"; + status = "okay"; + label = "lan"; - nvmem-cell-names = "mac-address"; - nvmem-cells = <&macaddr_gmac1>; + nvmem-cell-names = "mac-address"; + nvmem-cells = <&macaddr_gmac1>; }; &swport5 { - status = "okay"; - label = "wan"; + status = "okay"; + label = "wan"; - nvmem-cell-names = "mac-address"; - nvmem-cells = <&macaddr_gmac0>; + nvmem-cell-names = "mac-address"; + nvmem-cells = <&macaddr_gmac0>; }; &wifi0 { - pinctrl-0 = <&wifi_0_pins>; - pinctrl-names = "default"; + pinctrl-0 = <&wifi_0_pins>; + pinctrl-names = "default"; - status = "okay"; + status = "okay"; - qcom,coexist-support = <1>; - qcom,coexist-gpio-pin = <0x34>; + qcom,coexist-support = <1>; + qcom,coexist-gpio-pin = <0x34>; - ieee80211-freq-limit = <2401000 2473000>; - qcom,ath10k-calibration-variant = "linksys-whw03v2"; + ieee80211-freq-limit = <2401000 2473000>; + qcom,ath10k-calibration-variant = "linksys-whw03v2"; - nvmem-cell-names = "pre-calibration", "mac-address"; - nvmem-cells = <&precal_art_1000>, <&macaddr_gmac0>; - mac-address-increment = <1>; + nvmem-cell-names = "pre-calibration", "mac-address"; + nvmem-cells = <&precal_art_1000>, <&macaddr_gmac0>; + mac-address-increment = <1>; }; &wifi1 { - status = "okay"; - - ieee80211-freq-limit = <5170000 5250000>; - qcom,ath10k-calibration-variant = "linksys-whw03v2"; - - nvmem-cell-names = "pre-calibration", "mac-address"; - nvmem-cells = <&precal_art_5000>, <&macaddr_gmac0>; - mac-address-increment = <2>; + status = "okay"; + + ieee80211-freq-limit = <5170000 5250000>; + qcom,ath10k-calibration-variant = "linksys-whw03v2"; + + nvmem-cell-names = "pre-calibration", "mac-address"; + nvmem-cells = <&precal_art_5000>, <&macaddr_gmac0>; + mac-address-increment = <2>; }; &wifi2 { - status = "okay"; + status = "okay"; - ieee80211-freq-limit = <5735000 5835000>; - qcom,ath10k-calibration-variant = "linksys-whw03v2"; + ieee80211-freq-limit = <5735000 5835000>; + qcom,ath10k-calibration-variant = "linksys-whw03v2"; - nvmem-cell-names = "pre-calibration", "mac-address"; - nvmem-cells = <&precal_art_9000>, <&macaddr_gmac0>; - mac-address-increment = <3>; + nvmem-cell-names = "pre-calibration", "mac-address"; + nvmem-cells = <&precal_art_9000>, <&macaddr_gmac0>; + mac-address-increment = <3>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi index 51a37290a0..db9ca1e725 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi @@ -288,29 +288,29 @@ }; &gmac { - status = "okay"; + status = "okay"; }; &switch { - status = "okay"; + status = "okay"; }; &swport1 { - status = "okay"; + status = "okay"; }; &swport2 { - status = "okay"; + status = "okay"; }; &swport3 { - status = "okay"; + status = "okay"; }; &swport4 { - status = "okay"; + status = "okay"; }; &swport5 { - status = "okay"; + status = "okay"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts index 86f4514317..23abb3537c 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts @@ -92,7 +92,7 @@ /* No driver */ compatible = "isl,isl28022"; reg = <0x40>; - }; + }; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts index 08874bcf4f..8794d839a8 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts @@ -125,17 +125,17 @@ }; &gmac { - status = "okay"; + status = "okay"; }; &switch { - status = "okay"; + status = "okay"; }; &swport5 { - status = "okay"; + status = "okay"; - label = "lan"; + label = "lan"; }; &tlmm {