[openwrt/openwrt] ipq40xx: fix GL.iNet GL-B1300
LEDE Commits
lede-commits at lists.infradead.org
Sat Mar 17 04:32:17 PDT 2018
mkresin pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/403260dbf7490af84d05f59666c110686a9c0dfd
commit 403260dbf7490af84d05f59666c110686a9c0dfd
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Sat Mar 17 08:55:39 2018 +0100
ipq40xx: fix GL.iNet GL-B1300
The deletion of the mdio node childs was meant for testing and were
committed accidentally. Without the mdio nodes the network isn't
initialised.
While at it, remove the orphaned qcom-ipq4019-gl-b1300.dts as well.
Fixes: FS#1439
Signed-off-by: Mathias Kresin <dev at kresin.me>
---
.../arch/arm/boot/dts/qcom-ipq4019-gl-b1300.dts | 316 ---------------------
.../arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts | 3 -
2 files changed, 319 deletions(-)
diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-gl-b1300.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-gl-b1300.dts
deleted file mode 100644
index 53824e3..0000000
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-gl-b1300.dts
+++ /dev/null
@@ -1,316 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/soc/qcom,tcsr.h>
-
-/ {
- model = "GL.iNet GL-B1300";
- compatible = "glinet,gl-b1300", "qcom,ipq4019";
-
- memory {
- device_type = "memory";
- reg = <0x80000000 0x10000000>;
- };
-
- reserved-memory {
- #address-cells = <0x1>;
- #size-cells = <0x1>;
- ranges;
-
- apps_bl at 87000000 {
- reg = <0x87000000 0x400000>;
- no-map;
- };
-
- sbl at 87400000 {
- reg = <0x87400000 0x100000>;
- no-map;
- };
-
- cnss_debug at 87500000 {
- reg = <0x87500000 0x600000>;
- no-map;
- };
-
- cpu_context_dump at 87b00000 {
- reg = <0x87b00000 0x080000>;
- no-map;
- };
-
- tz_apps at 87b80000 {
- reg = <0x87b80000 0x280000>;
- no-map;
- };
-
- smem at 87e00000 {
- reg = <0x87e00000 0x080000>;
- no-map;
- };
-
- tz at 87e80000 {
- reg = <0x87e80000 0x180000>;
- no-map;
- };
- };
-
- soc {
- tcsr at 194b000 {
- /* select hostmode */
- compatible = "qcom,tcsr";
- reg = <0x194b000 0x100>;
- qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
- status = "ok";
- };
-
- ess_tcsr at 1953000 {
- compatible = "qcom,tcsr";
- reg = <0x1953000 0x1000>;
- qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
- };
-
- tcsr at 1949000 {
- compatible = "qcom,tcsr";
- reg = <0x1949000 0x100>;
- qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
- };
-
- tcsr at 1957000 {
- compatible = "qcom,tcsr";
- reg = <0x1957000 0x100>;
- qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
- };
-
- pinctrl at 1000000 {
- serial_pins: serial_pinmux {
- mux {
- pins = "gpio60", "gpio61";
- function = "blsp_uart0";
- bias-disable;
- };
- };
-
- spi_0_pins: spi_0_pinmux {
- pinmux {
- function = "blsp_spi0";
- pins = "gpio55", "gpio56", "gpio57";
- };
- pinmux_cs {
- function = "gpio";
- pins = "gpio54";
- };
- pinconf {
- pins = "gpio55", "gpio56", "gpio57";
- drive-strength = <12>;
- bias-disable;
- };
- pinconf_cs {
- pins = "gpio54";
- drive-strength = <2>;
- bias-disable;
- output-high;
- };
- };
- };
-
- blsp_dma: dma at 7884000 {
- status = "ok";
- };
-
- spi_0: spi at 78b5000 {
- pinctrl-0 = <&spi_0_pins>;
- pinctrl-names = "default";
- status = "ok";
- cs-gpios = <&tlmm 54 0>;
- };
-
- serial at 78af000 {
- pinctrl-0 = <&serial_pins>;
- pinctrl-names = "default";
- status = "ok";
- };
-
- cryptobam: dma at 8e04000 {
- status = "ok";
- };
-
- crypto at 8e3a000 {
- status = "ok";
- };
-
- watchdog at b017000 {
- status = "ok";
- };
-
- usb3_ss_phy: ssphy at 9a000 {
- status = "ok";
- };
-
- usb3_hs_phy: hsphy at a6000 {
- status = "ok";
- };
-
- usb3: usb3 at 8af8800 {
- status = "ok";
- };
-
- usb2_hs_phy: hsphy at a8000 {
- status = "ok";
- };
-
- usb2: usb2 at 60f8800 {
- status = "ok";
- };
-
- mdio at 90000 {
- status = "okay";
- };
-
- ess-switch at c000000 {
- status = "okay";
- };
-
- ess-psgmii at 98000 {
- status = "okay";
- };
-
- edma at c080000 {
- status = "okay";
- };
-
- wifi at a000000 {
- status = "okay";
- };
-
- wifi at a800000 {
- status = "okay";
- };
- };
-
- gpio-keys {
- compatible = "gpio-keys";
-
- wps {
- label = "wps";
- gpios = <&tlmm 5 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_WPS_BUTTON>;
- };
- reset {
- label = "reset";
- gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RESTART>;
- };
- };
-
- gpio-leds {
- compatible = "gpio-leds";
-
- power {
- label = "gl-b1300:green:power";
- gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>;
- default-state = "on";
- };
- mesh {
- label = "gl-b1300:green:mesh";
- gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>;
- };
- wlan {
- label = "gl-b1300:green:wlan";
- gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
- };
- };
-};
-
-&spi_0 {
- mx25l25635f at 0 {
- compatible = "mx25l25635f", "jedec,spi-nor";
- #address-cells = <1>;
- #size-cells = <1>;
- reg = <0>;
- spi-max-frequency = <24000000>;
-
- SBL1 at 0 {
- label = "SBL1";
- reg = <0x0 0x40000>;
- read-only;
- };
- MIBIB at 40000 {
- label = "MIBIB";
- reg = <0x40000 0x20000>;
- read-only;
- };
- QSEE at 60000 {
- label = "QSEE";
- reg = <0x60000 0x60000>;
- read-only;
- };
- CDT at c0000 {
- label = "CDT";
- reg = <0xc0000 0x10000>;
- read-only;
- };
- DDRPARAMS at d0000 {
- label = "DDRPARAMS";
- reg = <0xd0000 0x10000>;
- read-only;
- };
- APPSBLENV at e0000 {
- label = "APPSBLENV";
- reg = <0xe0000 0x10000>;
- read-only;
- };
- APPSBL at f0000 {
- label = "APPSBL";
- reg = <0xf0000 0x80000>;
- read-only;
- };
- ART at 170000 {
- label = "ART";
- reg = <0x170000 0x10000>;
- read-only;
- };
- kernel at 180000 {
- label = "kernel";
- reg = <0x180000 0x400000>;
- };
- rootfs at 580000 {
- label = "rootfs";
- reg = <0x580000 0x1a80000>;
- };
- firmware at 180000 {
- label = "firmware";
- reg = <0x180000 0x1e80000>;
- };
- };
-};
-
-&gmac0 {
- qcom,phy_mdio_addr = <4>;
- qcom,poll_required = <1>;
- qcom,forced_speed = <1000>;
- qcom,forced_duplex = <1>;
- vlan_tag = <2 0x20>;
-};
-
-&gmac1 {
- qcom,phy_mdio_addr = <3>;
- qcom,poll_required = <1>;
- qcom,forced_speed = <1000>;
- qcom,forced_duplex = <1>;
- vlan_tag = <1 0x10>;
-};
\ No newline at end of file
diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
index a4e285f..f3db47f 100644
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
@@ -79,9 +79,6 @@
soc {
mdio at 90000 {
status = "okay";
- /delete-node/ ethernet-phy at 2;
- /delete-node/ ethernet-phy at 3;
- /delete-node/ ethernet-phy at 4;
};
ess-psgmii at 98000 {
More information about the lede-commits
mailing list