From f706bda18a23ab1172a82d0d553e023688136283 Mon Sep 17 00:00:00 2001
From: Joris van Vossen <joris.van.vossen@sintecs.nl>
Date: Tue, 13 Mar 2018 11:13:54 +0100
Subject: RTL8XXXU driver replaced with out-of-tree driver due to low WiFi
 signal. Added gpios and dspi to device tree.


diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
index 071fa88..32198e2 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@ -429,6 +429,19 @@
 			interrupt-controller;
 			#interrupt-cells = <2>;
 		};
+                
+                dspi: dspi@2100000 {
+                    compatible = "fsl,ls1012a-dspi", "fsl,ls1021a-v1.0-dspi";
+                    #address-cells = <1>;
+                    #size-cells = <0>;
+                    reg = <0x0 0x2100000 0x0 0x10000>;
+                    interrupts = <0 64 IRQ_TYPE_LEVEL_HIGH>;
+                    clock-names = "dspi";
+                    clocks = <&clockgen 4 0>;
+                    spi-num-chipselects = <3>;
+                    big-endian;
+                    status = "disabled";
+                };
 
 		qspi: quadspi@1550000 {
 			compatible = "fsl,ls1012a-qspi", "fsl,ls1021a-qspi";
diff --git a/arch/arm64/boot/dts/freescale/grapeboard.dts b/arch/arm64/boot/dts/freescale/grapeboard.dts
index c1d1242..238db43 100644
--- a/arch/arm64/boot/dts/freescale/grapeboard.dts
+++ b/arch/arm64/boot/dts/freescale/grapeboard.dts
@@ -18,6 +18,7 @@
 /dts-v1/;
 
 #include "fsl-ls1012a.dtsi"
+#include "include/dt-bindings/gpio/gpio.h"
 
 / {
 	model = "GrapeBoard";
@@ -38,6 +39,11 @@
 	status = "okay";
 };
 
+&dspi {
+        bus-num = <0>;
+        status = "okay";
+};
+
 &qspi {
 	num-cs = <2>;
 	bus-num = <0>;
@@ -53,6 +59,7 @@
 	};
 };
 
+
 &sata {
 	status = "okay";
 };
@@ -65,6 +72,64 @@
 	status = "okay";
 };
 
+&gpio0 {
+        ngpios = <32>;
+        gpio-line-names =   "RPI_GPIO_3", 
+                            "RPI_GPIO_4", 
+                            "RPI_GPIO_2", 
+                            "RPI_GPIO_1", 
+                            "reserved", 
+                            "reserved", 
+                            "reserved", 
+                            "reserved",
+                            "reserved", 
+                            "reserved", 
+                            "reserved", 
+                            "reserved", 
+                            "reserved", 
+                            "reserved", 
+                            "reserved", 
+                            "reserved",
+                            "reserved", 
+                            "reserved", 
+                            "reserved", 
+                            "reserved", 
+                            "reserved", 
+                            "reserved", 
+                            "CPU_IRQ", 
+                            "reserved",
+                            "RPI_GPIO_11", 
+                            "RPI_GPIO_15", 
+                            "RPI_GPIO_16", 
+                            "RPI_GPIO_5", 
+                            "RPI_GPIO_12", 
+                            "RPI_GPIO_14", 
+                            "reserved", 
+                            "reserved";
+};
+
+&gpio1 {
+        ngpios = <18>;
+        gpio-line-names =   "M2_GPIO_4", 
+                            "M2_GPIO_5", 
+                            "M2_GPIO_6", 
+                            "QPSI_A_MUX_SEL", 
+                            "RPI_GPIO_6", 
+                            "RPI_GPIO_7", 
+                            "RPI_GPIO_8", 
+                            "RPI_GPIO_9",
+                            "reserved", 
+                            "RPI_GPIO_10", 
+                            "RPI_GPIO_13", 
+                            "M2_CFG_1", 
+                            "M2_CFG_0", 
+                            "M2_CFG_2", 
+                            "M2_CFG_3", 
+                            "reserved",
+                            "reserved", 
+                            "TMP_DETECT_N";
+};
+
 &pfe {
 	status = "okay";
 	#address-cells = <1>;
diff --git a/arch/arm64/configs/grapeboard_wireless.config b/arch/arm64/configs/grapeboard_wireless.config
index 74ea291..bd819e2 100644
--- a/arch/arm64/configs/grapeboard_wireless.config
+++ b/arch/arm64/configs/grapeboard_wireless.config
@@ -1,21 +1,19 @@
 # wifi/bluetooth
-CONFIG_CFG80211=y
-CONFIG_MAC80211=y
-CONFIG_RTL8XXXU=y
-CONFIG_RTL8XXXU_UNTESTED=y
-#CONFIG_RTL8723BE=y
-#CONFIG_R8712U=y
-CONFIG_RTL_CARDS=y
-CONFIG_RFKILL=y
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+CONFIG_RFKILL=m
 
-CONFIG_BT=y
-CONFIG_BT_RFCOMM=y
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=y
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=m
+CONFIG_BT_BNEP_PROTO_FILTER=m
+CONFIG_BT_HIDP=m
 
-CONFIG_BT_HCIBTUSB=y
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_RTL=m
+
+# usb audio
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
-- 
cgit v0.10.2