ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-30 10:39:04 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

layerscape: Fix build in dtb

Browse Source 
This fixes a kernel build problem.
The removed parts of the patch are already applied upstream.

Fixes: b4ed8a9275 ("kernel: bump 5.4 to 5.4.154")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 9501ce909f)
This commit is contained in:
Hauke Mehrtens 2021-10-22 22:09:16 +02:00
parent 2274e4c1fc
commit 7bf7f78891
23 changed files with 37 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
target/linux/layerscape/patches-5.4/302-dts-0058-arm64-dts-fsl-ls1028a-add-flexcan-node.patch
View File

@ -85,30 +85,3 @@ Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
*
* Harninder Rai <harninder.rai@nxp.com>
*
@@ -301,6 +301,26 @@
reg = <0x0 0x2190000 0x0 0x10000>;
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&sysclk>, <&clockgen 4 1>;
+ clock-names = "ipg", "per";
+ status = "disabled";
+ };
+
+ can0: can@2180000 {
+ compatible = "fsl,ls1028ar1-flexcan",
+ "fsl,lx2160ar1-flexcan";
+ reg = <0x0 0x2180000 0x0 0x10000>;
+ interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&sysclk>, <&clockgen 4 1>;
+ clock-names = "ipg", "per";
+ status = "disabled";
+ };
+
+ can1: can@2190000 {
+ compatible = "fsl,ls1028ar1-flexcan",
+ "fsl,lx2160ar1-flexcan";
+ reg = <0x0 0x2190000 0x0 0x10000>;
+ interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&sysclk>, <&clockgen 4 1>;
clock-names = "ipg", "per";
status = "disabled";
};

2
target/linux/layerscape/patches-5.4/302-dts-0066-arm64-dts-ls1028a-add-gpu-node.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Yuantian Tang <andy.tang@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -556,6 +556,16 @@
@@ -536,6 +536,16 @@
clock-names = "wdog_clk", "apb_pclk";
};

2
target/linux/layerscape/patches-5.4/302-dts-0067-arm64-dts-fsl-add-optee-node-for-ls1028.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Sahil Malhotra <sahil.malhotra@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -789,6 +789,13 @@
@@ -769,6 +769,13 @@
};
};

2
target/linux/layerscape/patches-5.4/302-dts-0069-arm64-dts-ls1028a-Add-ftm_alarm0-DT-node.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
cpus {
#address-cells = <1>;
#size-cells = <0>;
@@ -787,6 +791,19 @@
@@ -767,6 +771,19 @@
little-endian;
};
};

4
target/linux/layerscape/patches-5.4/302-dts-0074-arm64-dts-fsl-ls1028a-Add-Felix-switch-port-DT-node.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -768,7 +768,9 @@
@@ -748,7 +748,9 @@
/* PF1: VF0-1 BAR0 - non-prefetchable memory */
0x82000000 0x0 0x00000000 0x1 0xf8210000 0x0 0x020000
/* PF1: VF0-1 BAR2 - prefetchable memory */
@ -33,7 +33,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
enetc_port0: ethernet@0,0 {
compatible = "fsl,enetc";
@@ -784,12 +786,66 @@
@@ -764,12 +766,66 @@
#address-cells = <1>;
#size-cells = <0>;
};

4
target/linux/layerscape/patches-5.4/302-dts-0076-arm64-dts-ls1028a-support-Felix-PF5-INTB-interrupt.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -750,7 +750,6 @@
@@ -730,7 +730,6 @@
reg = <0x01 0xf0000000 0x0 0x100000>;
#address-cells = <3>;
#size-cells = <2>;
@ -23,7 +23,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
msi-parent = <&its>;
device_type = "pci";
bus-range = <0x0 0x0>;
@@ -803,6 +802,8 @@
@@ -783,6 +782,8 @@
switch@0,5 {
compatible = "mscc,felix-switch";
reg = <0x000500 0 0 0 0>;

4
target/linux/layerscape/patches-5.4/302-dts-0077-arm64-dts-ls1028a-Add-ethernet-property-for-l2switch.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -832,6 +832,7 @@
@@ -812,6 +812,7 @@
};
port@5 {
reg = <5>;
@ -22,7 +22,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
fixed-link {
speed = <1000>;
full-duplex;
@@ -839,7 +840,7 @@
@@ -819,7 +820,7 @@
};
};
};

2
target/linux/layerscape/patches-5.4/302-dts-0078-arm64-dts-fix-endianness-of-rcpm.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -854,6 +854,7 @@
@@ -834,6 +834,7 @@
compatible = "fsl,ls1028a-rcpm", "fsl,qoriq-rcpm-2.1+";
reg = <0x0 0x1e34040 0x0 0x1c>;
#fsl,rcpm-wakeup-cells = <7>;

4
target/linux/layerscape/patches-5.4/302-dts-0079-arm64-dts-ls1028a-Fix-interrupt-map-property-of-PCIe.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -713,10 +713,10 @@
@@ -693,10 +693,10 @@
msi-parent = <&its>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
@ -28,7 +28,7 @@ Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
status = "disabled";
};
@@ -738,10 +738,10 @@
@@ -718,10 +718,10 @@
msi-parent = <&its>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;

4
target/linux/layerscape/patches-5.4/302-dts-0088-arm64-dts-ls1028a-fix-dwc-pci-over-smmu.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -707,6 +707,7 @@
@@ -687,6 +687,7 @@
#size-cells = <2>;
device_type = "pci";
dma-coherent;
@ -24,7 +24,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
bus-range = <0x0 0xff>;
ranges = <0x81000000 0x0 0x00000000 0x80 0x00010000 0x0 0x00010000 /* downstream I/O */
0x82000000 0x0 0x40000000 0x80 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
@@ -732,6 +733,7 @@
@@ -712,6 +713,7 @@
#size-cells = <2>;
device_type = "pci";
dma-coherent;

2
target/linux/layerscape/patches-5.4/302-dts-0089-arm64-dts-ls1028a-Update-the-clock-providers-for-the.patch
View File

@ -43,7 +43,7 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
reboot {
compatible ="syscon-reboot";
regmap = <&rst>;
@@ -880,7 +866,8 @@
@@ -860,7 +846,8 @@
interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,
<0 223 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "DE", "SE";

2
target/linux/layerscape/patches-5.4/302-dts-0090-arm64-dts-ls1028a-Update-clock-cells-of-dpclk-node.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
clocks = <&osc_27m>;
};
@@ -866,7 +866,7 @@
@@ -846,7 +846,7 @@
interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,
<0 223 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "DE", "SE";

2
target/linux/layerscape/patches-5.4/302-dts-0091-arm64-dts-ls1028a-Add-properties-for-HD-Display-cont.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Wen He <wen.he_1@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -874,7 +874,23 @@
@@ -854,7 +854,23 @@
port {
dp0_out: endpoint {

4
target/linux/layerscape/patches-5.4/302-dts-0093-arm64-dts-fsl-Specify-phy-mode-for-CPU-ports.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -813,6 +813,8 @@
@@ -793,6 +793,8 @@
/* internal to-cpu ports */
port@4 {
reg = <4>;
@ -24,7 +24,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
fixed-link {
speed = <1000>;
full-duplex;
@@ -821,6 +823,8 @@
@@ -801,6 +803,8 @@
port@5 {
reg = <5>;
ethernet = <&enetc_port3>;

2
target/linux/layerscape/patches-5.4/302-dts-0094-arm64-dts-fsl-Drop-compatible-string-from-Felix-swit.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -788,7 +788,6 @@
@@ -768,7 +768,6 @@
little-endian;
};
switch@0,5 {

2
target/linux/layerscape/patches-5.4/302-dts-0095-arm64-dts-fsl-ls1028a-Specify-that-the-Felix-port-4-.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -815,7 +815,7 @@
@@ -805,7 +805,7 @@
phy-mode = "gmii";
fixed-link {

8
target/linux/layerscape/patches-5.4/302-dts-0096-arm64-dts-fsl-ls1028a-Disable-eno3-and-make-swp5-the.patch
View File

@ -27,7 +27,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -773,7 +773,7 @@
@@ -753,7 +753,7 @@
#address-cells = <1>;
#size-cells = <0>;
};
@ -36,7 +36,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
compatible = "fsl,enetc";
reg = <0x000200 0 0 0 0>;
fixed-link {
@@ -812,6 +812,7 @@
@@ -792,6 +792,7 @@
/* internal to-cpu ports */
port@4 {
reg = <4>;
@ -44,7 +44,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
phy-mode = "gmii";
fixed-link {
@@ -821,7 +822,6 @@
@@ -801,7 +802,6 @@
};
port@5 {
reg = <5>;
@ -52,7 +52,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
phy-mode = "gmii";
fixed-link {
@@ -834,6 +834,8 @@
@@ -814,6 +814,8 @@
enetc_port3: ethernet@0,6 {
compatible = "fsl,enetc";
reg = <0x000600 0 0 0 0>;

6
target/linux/layerscape/patches-5.4/302-dts-0098-LF-403-ARM64-dts-fsl-Add-clock-names-mclk0-for-SAI-n.patch
View File

@ -67,7 +67,7 @@ Signed-off-by: Alison Wang <alison.wang@nxp.com>
<&edma0 1 44>;
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -562,8 +562,9 @@
@@ -542,8 +542,9 @@
reg = <0x0 0xf100000 0x0 0x10000>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
@ -79,7 +79,7 @@ Signed-off-by: Alison Wang <alison.wang@nxp.com>
dma-names = "tx", "rx";
dmas = <&edma0 1 4>,
<&edma0 1 3>;
@@ -576,8 +577,9 @@
@@ -556,8 +557,9 @@
reg = <0x0 0xf110000 0x0 0x10000>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
@ -91,7 +91,7 @@ Signed-off-by: Alison Wang <alison.wang@nxp.com>
dma-names = "tx", "rx";
dmas = <&edma0 1 6>,
<&edma0 1 5>;
@@ -590,8 +592,9 @@
@@ -570,8 +572,9 @@
reg = <0x0 0xf130000 0x0 0x10000>;
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 1>, <&clockgen 4 1>,

4
target/linux/layerscape/patches-5.4/302-dts-0099-arm64-dts-layerscape-apply-dma-coherent-for-dwc3-nod.patch
View File

@ -34,7 +34,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
sata: sata@3200000 {
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -399,6 +399,7 @@
@@ -379,6 +379,7 @@
snps,dis_rxdet_inp3_quirk;
snps,quirk-frame-length-adjustment = <0x20>;
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@ -42,7 +42,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
};
usb1: usb@3110000 {
@@ -409,6 +410,7 @@
@@ -389,6 +390,7 @@
snps,dis_rxdet_inp3_quirk;
snps,quirk-frame-length-adjustment = <0x20>;
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;

2
target/linux/layerscape/patches-5.4/302-dts-0103-arm64-dts-ls1028a-Update-edma-compatible-to-fit-eDMA.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Peng Ma <peng.ma@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -345,7 +345,7 @@
@@ -325,7 +325,7 @@
edma0: dma-controller@22c0000 {
#dma-cells = <2>;

4
target/linux/layerscape/patches-5.4/302-dts-0110-arm64-dts-ls1028a-Disable-swp5-by-default.patch
View File

@ -12,11 +12,11 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -828,6 +828,7 @@
@@ -808,6 +808,7 @@
port@5 {
reg = <5>;
phy-mode = "gmii";
+ status = "disabled";
fixed-link {
speed = <1000>;
speed = <2500>;

6
target/linux/layerscape/patches-5.4/302-dts-0112-arm64-dts-fsl-ls1028a-prepare-dts-for-overlay.patch
View File

@ -385,7 +385,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
&sai4 {
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -792,30 +792,39 @@
@@ -772,30 +772,39 @@
clocks = <&clockgen 2 3>;
little-endian;
};
@ -432,7 +432,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
reg = <4>;
ethernet = <&enetc_port2>;
phy-mode = "gmii";
@@ -825,7 +834,8 @@
@@ -805,7 +814,8 @@
full-duplex;
};
};
@ -442,7 +442,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
reg = <5>;
phy-mode = "gmii";
status = "disabled";
@@ -837,6 +847,7 @@
@@ -817,6 +827,7 @@
};
};
};

2
target/linux/layerscape/patches-5.4/302-dts-0114-arm64-dts-fsl-ls1028a-add-labels-to-Ethernet-switch-.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -806,21 +806,25 @@
@@ -786,21 +786,25 @@
mscc_felix_port0: port@0 {
reg = <0>;
status = "disabled";