From 0d5f20a81e6a512dcdaeeabd9f777c0c9175b301 Mon Sep 17 00:00:00 2001
From: YuzukiTsuru <gloomyghost@gloomyghost.com>
Date: Sun, 20 Feb 2022 16:16:38 +0800
Subject: [PATCH] dts: add spi1 devices

---
 .../devicetree/linux/devicetree.dts           |  4 +--
 .../devicetree/linux/suniv-f1c100s.dtsi       | 34 +++++++++++--------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/buildroot/board/YuzukiHD/YuzukiRuler/devicetree/linux/devicetree.dts b/buildroot/board/YuzukiHD/YuzukiRuler/devicetree/linux/devicetree.dts
index 90259f77..f8998d10 100644
--- a/buildroot/board/YuzukiHD/YuzukiRuler/devicetree/linux/devicetree.dts
+++ b/buildroot/board/YuzukiHD/YuzukiRuler/devicetree/linux/devicetree.dts
@@ -121,8 +121,8 @@
         rgb;
         fps = <30>;
         buswidth = <8>;
-        reset-gpios = <&pio 4 7 GPIO_ACTIVE_LOW>;
-        dc-gpios = <&pio 4 10 GPIO_ACTIVE_LOW>;
+        reset = <&pio 4 7 GPIO_ACTIVE_LOW>;
+        dc = <&pio 4 10 GPIO_ACTIVE_LOW>;
         debug = <0>;
     };
 };
diff --git a/buildroot/board/allwinner/suniv-f1c100s/devicetree/linux/suniv-f1c100s.dtsi b/buildroot/board/allwinner/suniv-f1c100s/devicetree/linux/suniv-f1c100s.dtsi
index 2ae5e7a1..8a9ff8f7 100644
--- a/buildroot/board/allwinner/suniv-f1c100s/devicetree/linux/suniv-f1c100s.dtsi
+++ b/buildroot/board/allwinner/suniv-f1c100s/devicetree/linux/suniv-f1c100s.dtsi
@@ -122,8 +122,7 @@
 		};
 
 		spi0: spi@1c05000 {
-			compatible = "allwinner,suniv-f1c100s-spi",
-					 "allwinner,sun8i-h3-spi";
+			compatible = "allwinner,suniv-f1c100s-spi", "allwinner,sun8i-h3-spi";
 			reg = <0x01c05000 0x1000>;
 			interrupts = <10>;
 			clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_BUS_SPI0>;
@@ -136,18 +135,20 @@
 			#size-cells = <0>;
 		};
 
-		spi1: spi@1c06000 {
-			compatible = "allwinner,suniv-f1c100s-spi",
-					 "allwinner,sun8i-h3-spi";
-			reg = <0x01c06000 0x1000>;
-			interrupts = <11>;
-			clocks = <&ccu CLK_BUS_SPI1>, <&ccu CLK_BUS_SPI1>;
-			clock-names = "ahb", "mod";
-			resets = <&ccu RST_BUS_SPI1>;
-			status = "disabled";
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
+		spi1:spi@1c06000 {
+            compatible = "allwinner,suniv-f1c100s-spi", "allwinner,sun8i-h3-spi";
+            reg = <0x1c06000 0x1000>;
+            interrupts = <11>;
+            clocks = <&ccu CLK_BUS_SPI1>, <&ccu CLK_BUS_SPI1>;
+            clock-names = "ahb", "mod";
+            resets = <&ccu RST_BUS_SPI1>;
+            status = "disabled";
+            #address-cells = <1>;
+            #size-cells = <0>;
+            bias-pull-up;
+            pinctrl-names = "default";
+            pinctrl-0 = <&spi1_pins>;
+        };
 
 		tve0: tv-encoder@1c0a000 {
 			compatible = "allwinner,suniv-f1c100s-tv-encoder",
@@ -371,6 +372,11 @@
 				bias-pull-up;
 			};
 
+			spi1_pins: spi1-pins{
+                pins = "PA2", "PA0", "PA3", "PA1";
+                function = "spi1";
+            };
+
 			mmc0_pins: mmc0-pins {
 				pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5";
 				function = "mmc0";