From: Deokgyu Yang <secugyu@gmail.com>
Date: Fri, 29 May 2020 03:23:26 +0000 (+0900)
Subject: ODROID-COMMON: arm64/dts: Extract spidev node from main dts to spi0 dtbo
X-Git-Tag: hardkernel-4.9.236-104~71
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b15333e5d19e3003b232d4443cec0baf67c4b326;p=platform%2Fkernel%2Flinux-amlogic.git

ODROID-COMMON: arm64/dts: Extract spidev node from main dts to spi0 dtbo

Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: I2ceb31b971970b96e0113e528b4c174d81d35258
---

diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
index 2e628cc..ddb1542 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
@@ -975,15 +975,6 @@
 
 	cs-gpios = <&gpio GPIOX_10 GPIO_ACTIVE_LOW>,
 		   <&gpio GPIOH_6 GPIO_ACTIVE_LOW>;
-
-	spidev: spidev@0 {
-		status = "disabled";
-
-		compatible = "linux,spidev";
-		/* spi default max clock 100Mhz */
-		spi-max-frequency = <100000000>;
-		reg = <0>;
-	};
 };
 
 &i2c2 {
diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
index c10c70b..7401f7f 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
@@ -740,14 +740,6 @@
 
 	cs-gpios = <&gpio GPIOX_10 GPIO_ACTIVE_LOW>,
 		<&gpio GPIOA_4 GPIO_ACTIVE_LOW>;
-
-	spidev: spidev@0 {
-		status = "disabled";
-		compatible = "linux,spidev";
-		reg = <0>;
-		/* spi default max clock 100Mhz */
-		spi-max-frequency = <100000000>;
-	};
 };
 
 &spifc {
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/spi0.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/spi0.dts
index 79a8111..7c6a43b6 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/spi0.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/spi0.dts
@@ -7,14 +7,17 @@
 
 		__overlay__ {
 			status = "okay";
-		};
-	};
 
-	fragment@1 {
-		target = <&spidev>;
+			#address-cells = <1>;
+			#size-cells = <0>;
 
-		__overlay__ {
-			status = "okay";
+			spidev: spidev@0 {
+				status = "okay";
+				compatible = "linux,spidev";
+				reg = <0>;
+				/* spi default max clock 100Mhz */
+				spi-max-frequency = <100000000>;
+			};
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/spi0.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/spi0.dts
index fdfd9bb..7c6a43b6 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/spi0.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/spi0.dts
@@ -1,23 +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";
-		};
-	};
 
-	fragment@1 {
-		target = <&spidev>;
+			#address-cells = <1>;
+			#size-cells = <0>;
 
-		__overlay__ {
-			status = "okay";
+			spidev: spidev@0 {
+				status = "okay";
+				compatible = "linux,spidev";
+				reg = <0>;
+				/* spi default max clock 100Mhz */
+				spi-max-frequency = <100000000>;
+			};
 		};
 	};
 };