This fixes a kernel build problem.
The removed parts of the patch are already applied upstream.
Fixes: 9ad3ef27b9 ("kernel: bump 5.4 to 5.4.153")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
		
	
		
			
				
	
	
		
			88 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			88 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From 3724107421d95c5a46b19b950b04de2a05c1f757 Mon Sep 17 00:00:00 2001
 | 
						|
From: Pankaj Bansal <pankaj.bansal@nxp.com>
 | 
						|
Date: Wed, 8 May 2019 17:49:14 +0530
 | 
						|
Subject: [PATCH] arm64: dts: fsl: ls1028a: add flexcan node
 | 
						|
 | 
						|
Add flexcan node in LS1028A SOC file as well as in QDS and RDB files.
 | 
						|
The device tree bindings used can be referred from
 | 
						|
Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
 | 
						|
 | 
						|
Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
 | 
						|
---
 | 
						|
 arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 10 +++++++++-
 | 
						|
 arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 18 +++++++++++++++++-
 | 
						|
 arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi    | 22 +++++++++++++++++++++-
 | 
						|
 3 files changed, 47 insertions(+), 3 deletions(-)
 | 
						|
 | 
						|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
 | 
						|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
 | 
						|
@@ -2,7 +2,7 @@
 | 
						|
 /*
 | 
						|
  * Device Tree file for NXP LS1028A QDS Board.
 | 
						|
  *
 | 
						|
- * Copyright 2018 NXP
 | 
						|
+ * Copyright 2018-2019 NXP
 | 
						|
  *
 | 
						|
  * Harninder Rai <harninder.rai@nxp.com>
 | 
						|
  *
 | 
						|
@@ -107,6 +107,14 @@
 | 
						|
 	};
 | 
						|
 };
 | 
						|
 
 | 
						|
+&can0 {
 | 
						|
+	status = "okay";
 | 
						|
+};
 | 
						|
+
 | 
						|
+&can1 {
 | 
						|
+	status = "okay";
 | 
						|
+};
 | 
						|
+
 | 
						|
 &duart0 {
 | 
						|
 	status = "okay";
 | 
						|
 };
 | 
						|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
 | 
						|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
 | 
						|
@@ -2,7 +2,7 @@
 | 
						|
 /*
 | 
						|
  * Device Tree file for NXP LS1028A RDB Board.
 | 
						|
  *
 | 
						|
- * Copyright 2018 NXP
 | 
						|
+ * Copyright 2018-2019 NXP
 | 
						|
  *
 | 
						|
  * Harninder Rai <harninder.rai@nxp.com>
 | 
						|
  *
 | 
						|
@@ -152,6 +152,22 @@
 | 
						|
 	};
 | 
						|
 };
 | 
						|
 
 | 
						|
+&can0 {
 | 
						|
+	status = "okay";
 | 
						|
+
 | 
						|
+	can-transceiver {
 | 
						|
+		max-bitrate = <5000000>;
 | 
						|
+	};
 | 
						|
+};
 | 
						|
+
 | 
						|
+&can1 {
 | 
						|
+	status = "okay";
 | 
						|
+
 | 
						|
+	can-transceiver {
 | 
						|
+		max-bitrate = <5000000>;
 | 
						|
+	};
 | 
						|
+};
 | 
						|
+
 | 
						|
 &duart0 {
 | 
						|
 	status = "okay";
 | 
						|
 };
 | 
						|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
 | 
						|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
 | 
						|
@@ -2,7 +2,7 @@
 | 
						|
 /*
 | 
						|
  * Device Tree Include file for NXP Layerscape-1028A family SoC.
 | 
						|
  *
 | 
						|
- * Copyright 2018 NXP
 | 
						|
+ * Copyright 2018-2019 NXP
 | 
						|
  *
 | 
						|
  * Harninder Rai <harninder.rai@nxp.com>
 | 
						|
  *
 |