From 2e46251b42d50201f81d08a6b4dede4d227632ef Mon Sep 17 00:00:00 2001
From: Hyeonki Hong <hhk7734@gmail.com>
Date: Fri, 29 May 2020 11:58:47 +0900
Subject: [PATCH] ODROID-COMMON: arm64/dts: move can0 node to each overlay
 directory

Change-Id: Id193255239af6dbe0b8e7a80779ea5f3cfee2e6b
---
 .../boot/dts/amlogic/meson64_odroidc4.dts     |  8 -------
 .../boot/dts/amlogic/meson64_odroidn2.dts     |  8 -------
 .../dts/amlogic/overlays/odroidc4/Makefile    |  3 ++-
 .../dts/amlogic/overlays/odroidc4/can0.dts    | 23 +++++++++++++++++++
 .../dts/amlogic/overlays/odroidn2/Makefile    |  3 ++-
 .../dts/amlogic/overlays/odroidn2/can0.dts    | 23 +++++++++++++++++++
 6 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 arch/arm64/boot/dts/amlogic/overlays/odroidc4/can0.dts
 create mode 100644 arch/arm64/boot/dts/amlogic/overlays/odroidn2/can0.dts

diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
index 2aced4990b9a..73088c06b2ab 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
@@ -902,14 +902,6 @@
 
 	cs-gpios = <&gpio GPIOX_10 GPIO_ACTIVE_LOW>,
 		   <&gpio GPIOH_6 GPIO_ACTIVE_LOW>;
-
-	can0: can@0 {
-		compatible = "microchip,mcp2515";
-		reg = <0>;
-		spi-max-frequency = <10000000>;
-		status = "disabled";
-		gpio-irq = <&gpio GPIOX_3 GPIO_ACTIVE_LOW>;
-	};
 };
 
 &i2c2 {
diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
index 2f319aec5764..adf5c860592e 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
@@ -498,12 +498,4 @@
 
 	cs-gpios = <&gpio GPIOX_10 GPIO_ACTIVE_LOW>,
 		   <&gpio GPIOA_4 GPIO_ACTIVE_LOW>;
-
-	can0: can@0 {
-		compatible = "microchip,mcp2515";
-		reg = <0>;
-		spi-max-frequency = <10000000>;
-		status = "disabled";
-		gpio-irq = <&gpio GPIOX_3 GPIO_ACTIVE_LOW>;
-	};
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile
index c0d8d456c692..8e5b0f15f94d 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile
@@ -11,7 +11,8 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDC4) += spi0.dtbo	\
 					ads7846.dtbo		\
 					sx865x-i2c1.dtbo	\
 					pcf8563.dtbo		\
-					onewire.dtbo
+					onewire.dtbo		\
+					can0.dtbo
 
 targets	+= $(dtbo-y)
 always	:= $(dtbo-y)
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/can0.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/can0.dts
new file mode 100644
index 000000000000..41b4cc728919
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/can0.dts
@@ -0,0 +1,23 @@
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/meson-g12a-gpio.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	fragment@0 {
+		target = <&spicc0>;
+
+		__overlay__ {
+			status = "okay";
+
+			can0: can@0 {
+				compatible = "microchip,mcp2515";
+				gpio-irq = <&gpio GPIOX_3 GPIO_ACTIVE_LOW>;
+				reg = <0>;
+				spi-max-frequency = <10000000>;
+				status = "okay";
+			};
+		};
+	};
+};
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile
index 21737cae8cd2..a63e7fa8e88b 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile
@@ -12,7 +12,8 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDN2) += spi0.dtbo		\
 					saradc.dtbo		\
 					irblaster.dtbo		\
 					odroidn2-opp.dtbo	\
-					onewire.dtbo
+					onewire.dtbo		\
+					can0.dtbo
 
 targets	+= $(dtbo-y)
 always	:= $(dtbo-y)
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/can0.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/can0.dts
new file mode 100644
index 000000000000..41b4cc728919
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/can0.dts
@@ -0,0 +1,23 @@
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/meson-g12a-gpio.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	fragment@0 {
+		target = <&spicc0>;
+
+		__overlay__ {
+			status = "okay";
+
+			can0: can@0 {
+				compatible = "microchip,mcp2515";
+				gpio-irq = <&gpio GPIOX_3 GPIO_ACTIVE_LOW>;
+				reg = <0>;
+				spi-max-frequency = <10000000>;
+				status = "okay";
+			};
+		};
+	};
+};
\ No newline at end of file