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 <[email protected]>
(backported from 33f47c28c6e881936f1b8dbd200b4b5724738bd0)

diff --git a/target/linux/layerscape/patches-4.9/303-dts-layerscape-add-traverse-ls1043.patch b/target/linux/layerscape/patches-4.9/303-dts-layerscape-add-traverse-ls1043.patch
index 866fc54c0c312de220828dd85ed64eb7b27a9e19..21ac02ca989d263d52d1b94359d5c3e07c12805d 100644 (file)
--- a/target/linux/layerscape/patches-4.9/303-dts-layerscape-add-traverse-ls1043.patch
+++ b/target/linux/layerscape/patches-4.9/303-dts-layerscape-add-traverse-ls1043.patch
@@ -25,7 +25,7 @@ Signed-off-by: Mathew McBride <[email protected]>
  clean-files   := *.dtb
 --- a/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 {
        status = "disabled";
  };
@@ -34,6 +34,9 @@ Signed-off-by: Mathew McBride <[email protected]>
 + * 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 {
 +      compatible = "fsl,bman-fbpr";
 +      alloc-ranges = <0 0 0x10000 0>;
@@ -57,7 +60,7 @@ Signed-off-by: Mathew McBride <[email protected]>
 +};
 --- a/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 {
         status = "disabled";
  };
@@ -66,6 +69,9 @@ Signed-off-by: Mathew McBride <[email protected]>
 + * 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 {
 +      compatible = "fsl,bman-fbpr";
 +      alloc-ranges = <0 0 0x10000 0>;