layerscape: fix Ethernet/DPAA/FMAN on Traverse boards after DTS refresh

Patch 303 is required for Traverse LS1043 targets when using the NXP DPAA1 driver.
The recent refresh of 4.9 patches on layerscape changed how FMan/BMan memory regions
were defined and meant Ethernet stopped working on these boards.

(Note that these definitions are only required for NXP's Ethernet driver, the new
upstream driver in >=4.15 works using the DTS provided in files/)

Signed-off-by: Mathew McBride <matt@traverse.com.au>
This commit is contained in:
Mathew McBride 2018-09-26 12:21:22 +00:00 committed by Hauke Mehrtens
parent 64756a9a30
commit 33f47c28c6

View file

@ -25,7 +25,7 @@ Signed-off-by: Mathew McBride <matt@traverse.com.au>
clean-files := *.dtb clean-files := *.dtb
--- a/arch/arm64/boot/dts/freescale/traverse-ls1043s.dts --- a/arch/arm64/boot/dts/freescale/traverse-ls1043s.dts
+++ b/arch/arm64/boot/dts/freescale/traverse-ls1043s.dts +++ b/arch/arm64/boot/dts/freescale/traverse-ls1043s.dts
@@ -330,3 +330,29 @@ @@ -330,3 +330,32 @@
&sata { &sata {
status = "disabled"; status = "disabled";
}; };
@ -34,6 +34,9 @@ Signed-off-by: Mathew McBride <matt@traverse.com.au>
+ * These kernels need additional setup for FMan/QMan DMA shared memory + * These kernels need additional setup for FMan/QMan DMA shared memory
+ */ + */
+ +
+#include "qoriq-qman-portals-sdk.dtsi"
+#include "qoriq-bman-portals-sdk.dtsi"
+
+&bman_fbpr { +&bman_fbpr {
+ compatible = "fsl,bman-fbpr"; + compatible = "fsl,bman-fbpr";
+ alloc-ranges = <0 0 0x10000 0>; + alloc-ranges = <0 0 0x10000 0>;
@ -57,7 +60,7 @@ Signed-off-by: Mathew McBride <matt@traverse.com.au>
+}; +};
--- a/arch/arm64/boot/dts/freescale/traverse-ls1043v.dts --- a/arch/arm64/boot/dts/freescale/traverse-ls1043v.dts
+++ b/arch/arm64/boot/dts/freescale/traverse-ls1043v.dts +++ b/arch/arm64/boot/dts/freescale/traverse-ls1043v.dts
@@ -251,3 +251,29 @@ @@ -251,3 +251,32 @@
&sata { &sata {
status = "disabled"; status = "disabled";
}; };
@ -66,6 +69,9 @@ Signed-off-by: Mathew McBride <matt@traverse.com.au>
+ * These kernels need additional setup for FMan/QMan DMA shared memory + * These kernels need additional setup for FMan/QMan DMA shared memory
+ */ + */
+ +
+#include "qoriq-qman-portals-sdk.dtsi"
+#include "qoriq-bman-portals-sdk.dtsi"
+
+&bman_fbpr { +&bman_fbpr {
+ compatible = "fsl,bman-fbpr"; + compatible = "fsl,bman-fbpr";
+ alloc-ranges = <0 0 0x10000 0>; + alloc-ranges = <0 0 0x10000 0>;