aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsuel Smith <ansuelsmth@gmail.com>2020-01-26 02:24:34 +0100
committerPetr Štetiar <ynezz@true.cz>2020-03-03 23:38:23 +0100
commit57ea767a53c1f08204de6f285a843aacf0f4ef9c (patch)
tree7b2aaeee36bb20479df5e17e185430dcfbff2860
parent9a1ec4d3f4fca05275be28a6927b08c6cd43d97d (diff)
downloadupstream-57ea767a53c1f08204de6f285a843aacf0f4ef9c.tar.gz
upstream-57ea767a53c1f08204de6f285a843aacf0f4ef9c.tar.bz2
upstream-57ea767a53c1f08204de6f285a843aacf0f4ef9c.zip
ipq806x: remove skeleton definition
This was already deprecated. With kernel 5.4 it has been removed. Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
-rw-r--r--target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi11
1 files changed, 7 insertions, 4 deletions
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi
index f95b0b4f95..d88a27af5f 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi
@@ -1,6 +1,5 @@
/dts-v1/;
-#include "skeleton.dtsi"
#include <dt-bindings/clock/qcom,gcc-ipq806x.h>
#include <dt-bindings/mfd/qcom-rpm.h>
#include <dt-bindings/clock/qcom,rpmcc.h>
@@ -15,6 +14,10 @@
compatible = "qcom,ipq8064";
interrupt-parent = <&intc>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ memory { device_type = "memory"; reg = <0 0>; };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;
@@ -1294,7 +1297,7 @@
status = "disabled";
};
- nand: nand@1ac00000 {
+ nand_controller: nand-controller@1ac00000 {
compatible = "qcom,ipq806x-nand";
reg = <0x1ac00000 0x800>;
@@ -1377,7 +1380,7 @@
gmac2: ethernet@37400000 {
device_type = "network";
- compatible = "qcom,ipq806x-gmac";
+ compatible = "qcom,ipq806x-gmac", "snps,dwmac";
reg = <0x37400000 0x200000>;
interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "macirq";
@@ -1400,7 +1403,7 @@
gmac3: ethernet@37600000 {
device_type = "network";
- compatible = "qcom,ipq806x-gmac";
+ compatible = "qcom,ipq806x-gmac", "snps,dwmac";
reg = <0x37600000 0x200000>;
interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "macirq";