[openwrt/openwrt] ipq40xx: OpenMesh A42 overhaul
LEDE Commits
lede-commits at lists.infradead.org
Wed Mar 14 11:40:10 PDT 2018
mkresin pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/d0e962140403eefbe70002ee4349ade1d8c119be
commit d0e962140403eefbe70002ee4349ade1d8c119be
Author: Christian Lamparter <chunkeey at gmail.com>
AuthorDate: Sat Mar 10 09:55:18 2018 +0100
ipq40xx: OpenMesh A42 overhaul
Sort the soc entries in the dts by address and use dtc labels whenever
possible.
Adjust the DTS files, the OpenMesh A42 is actually an IPQ4018 and not an
IPQ4019.
Signed-off-by: Sven Eckelmann <sven.eckelmann at openmesh.com>
Signed-off-by: Christian Lamparter <chunkeey at gmail.com>
---
.../{qcom-ipq4019-a42.dts => qcom-ipq4018-a42.dts} | 165 ++++++++++-----------
target/linux/ipq40xx/image/Makefile | 2 +-
.../patches-4.14/069-arm-boot-add-dts-files.patch | 2 +-
3 files changed, 81 insertions(+), 88 deletions(-)
diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-a42.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts
similarity index 74%
rename from target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-a42.dts
rename to target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts
index 887be99..772465c 100644
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-a42.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts
@@ -47,6 +47,14 @@
};
soc {
+ mdio at 90000 {
+ status = "okay";
+ };
+
+ ess-psgmii at 98000 {
+ status = "okay";
+ };
+
tcsr at 194b000 {
/* select hostmode */
compatible = "qcom,tcsr";
@@ -55,75 +63,26 @@
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>;
};
+ ess_tcsr at 1953000 {
+ compatible = "qcom,tcsr";
+ reg = <0x1953000 0x1000>;
+ qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
+ };
+
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";
+ usb2: usb2 at 60f8800 {
status = "ok";
- cs-gpios = <&tlmm 54 0>;
-
- m25p80 at 0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <24000000>;
-
- /* partitions are passed via bootloader */
- };
};
serial at 78af000 {
@@ -132,10 +91,6 @@
status = "ok";
};
- cryptobam: dma at 8e04000 {
- status = "ok";
- };
-
crypto at 8e3a000 {
status = "ok";
};
@@ -144,39 +99,13 @@
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";
- qcom,ath10k-calibration-variant = "OM-A42";
- };
-
- wifi at a800000 {
- status = "okay";
- qcom,ath10k-calibration-variant = "OM-A42";
- };
};
gpio-keys {
@@ -227,6 +156,56 @@
};
};
+&tlmm {
+ serial_pins: serial_pinmux {
+ mux {
+ pins = "gpio60", "gpio61";
+ function = "blsp_uart0";
+ bias-disable;
+ };
+ };
+
+ spi_0_pins: spi_0_pinmux {
+ pin {
+ function = "blsp_spi0";
+ pins = "gpio55", "gpio56", "gpio57";
+ drive-strength = <12>;
+ bias-disable;
+ };
+ pin_cs {
+ function = "gpio";
+ pins = "gpio54";
+ drive-strength = <2>;
+ bias-disable;
+ output-high;
+ };
+ };
+};
+
+&blsp_dma {
+ status = "ok";
+};
+
+&spi_0 {
+ pinctrl-0 = <&spi_0_pins>;
+ pinctrl-names = "default";
+ status = "ok";
+ cs-gpios = <&tlmm 54 0>;
+
+ m25p80 at 0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <24000000>;
+ /* partitions are passed via bootloader */
+ };
+};
+
+&cryptobam {
+ status = "ok";
+};
+
&gmac0 {
qcom,phy_mdio_addr = <4>;
qcom,poll_required = <1>;
@@ -242,3 +221,17 @@
qcom,forced_duplex = <1>;
vlan_tag = <1 0x10>;
};
+
+&usb2_hs_phy {
+ status = "ok";
+};
+
+&wifi0 {
+ status = "okay";
+ qcom,ath10k-calibration-variant = "OM-A42";
+};
+
+&wifi1 {
+ status = "okay";
+ qcom,ath10k-calibration-variant = "OM-A42";
+};
diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
index e584b6f..eb26082 100644
--- a/target/linux/ipq40xx/image/Makefile
+++ b/target/linux/ipq40xx/image/Makefile
@@ -61,7 +61,7 @@ TARGET_DEVICES += glinet_gl-b1300
define Device/openmesh_a42
$(call Device/FitImageLzma)
- DEVICE_DTS := qcom-ipq4019-a42
+ DEVICE_DTS := qcom-ipq4018-a42
BLOCKSIZE := 64k
SUPPORTED_DEVICES := openmesh,a42
DEVICE_TITLE := OpenMesh A42
diff --git a/target/linux/ipq40xx/patches-4.14/069-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-4.14/069-arm-boot-add-dts-files.patch
index e830565..128669f 100644
--- a/target/linux/ipq40xx/patches-4.14/069-arm-boot-add-dts-files.patch
+++ b/target/linux/ipq40xx/patches-4.14/069-arm-boot-add-dts-files.patch
@@ -14,7 +14,7 @@ Signed-off-by: John Crispin <john at phrozen.org>
qcom-apq8074-dragonboard.dtb \
qcom-apq8084-ifc6540.dtb \
qcom-apq8084-mtp.dtb \
-+ qcom-ipq4019-a42.dtb \
++ qcom-ipq4018-a42.dtb \
qcom-ipq4019-ap.dk01.1-c1.dtb \
+ qcom-ipq4019-ap.dk04.1-c1.dtb \
+ qcom-ipq4019-fritz4040.dtb \
More information about the lede-commits
mailing list