ODROID-XU4: Introduce device tree overlay

.gitignore

@@ -17,6 +17,7 @@
 *.c.[012]*.*
 *.dt.yaml
 *.dtb
+*.dtbo
 *.dtb.S
 *.dwo
 *.elf

Makefile

@@ -1252,6 +1252,13 @@ dtbs_check: dt_binding_check
 dtbs_install:
 	$(Q)$(MAKE) $(dtbinst)=$(dtstree)
 
+%.dtbo:
+	$(Q)$(MAKE) -C $(dtstree)/overlays $@
+
+PHONY += dtbos
+dtbos:
+	$(Q)$(MAKE) -C $(dtstree)/overlay
+
 ifdef CONFIG_OF_EARLY_FLATTREE
 all: dtbs
 endif

arch/arm/boot/dts/Makefile

@@ -1303,3 +1303,6 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
 	aspeed-bmc-opp-zaius.dtb \
 	aspeed-bmc-portwell-neptune.dtb \
 	aspeed-bmc-quanta-q71l.dtb
+
+DTC_FLAGS ?= -@
+subdir-y := overlays

arch/arm/boot/dts/exynos5422-odroidxu4.dts

@@ -14,7 +14,7 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-	model = "Hardkernel Odroid XU4";
+	model = "Hardkernel ODROID-XU4";
 	compatible = "hardkernel,odroid-xu4", "samsung,exynos5800", \
 		     "samsung,exynos5";
 
@@ -143,25 +143,25 @@
 
 /* i2c@12C70000 */
 &i2c_1 {
-	status = "okay";
+	status = "disabled";
 	samsung,i2c-max-bus-freq = <400000>;
 };
 
 /* i2c@12cb0000 */
 &hsi2c_5 {
-	status = "okay";
+	status = "disabled";
 	samsung,hs-mode;
 	clock-frequency = <400000>;
 };
 
 &spi_1 {
-	status = "okay";
+	status = "disabled";
 	samsung,spi-src-clk = <0>;
 	num-cs = <2>;
 	cs-gpios = <&gpa2 5 GPIO_ACTIVE_HIGH>, <&gpx2 1 GPIO_ACTIVE_HIGH>;
 
 	spidev: spidev@0 {
-		status = "okay";
+		status = "disabled";
 		reg = <0>;
 		compatible = "odroid,spidev";
 		spi-max-frequency = <1000000>;
@@ -230,3 +230,20 @@
 		};
 	};
 };
+
+&serial_0 {
+	status = "disabled";
+};
+
+&serial_1 {
+	status = "disabled";
+};
+
+&serial_2 {
+	// onboard 4 pin UART connector
+	status = "okay";
+};
+
+&serial_3 {
+	status = "disabled";
+};

arch/arm/boot/dts/overlays/Makefile

@@ -0,0 +1,32 @@
+# Overlays for the Odroid platform
+
+DTC ?= dtc
+DTCO_FLAGS ?= \
+	-Wno-unit_address_vs_reg \
+	-@
+
+OBJ := $(patsubst %.dts, %.dtbo, $(wildcard *.dts))
+
+dtbo-y := \
+	spidev1-overlay.dtbo \
+	i2c1-overlay.dtbo \
+	i2c5-overlay.dtbo \
+	uart0-overlay.dtbo \
+	hktft32-overlay.dtbo \
+	hktft35-overlay.dtbo \
+	hktft-cs-ogst-overlay.dtbo
+
+%.dtbo: %.dts
+	@echo "  DTCO    $@"
+	@$(DTC) $(DTCO_FLAGS) -I dts -O dtb -o $@ $^
+
+dtbos: $(dtbo-y)
+
+all: $(dtbos)
+
+clean:
+	@rm -rf *.dtbo
+
+.PHONY: all clean dtbos
+
+always += $(dtbo-y)

arch/arm/boot/dts/overlays/hktft-cs-ogst-overlay.dts

@@ -0,0 +1,36 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&i2c_1>;
+
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+
+	fragment@1 {
+		target = <&hsi2c_5>;
+
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+
+	fragment@2 {
+		target = <&spi_1>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@3 {
+		target = <&hktft_cs_ogst>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};

arch/arm/boot/dts/overlays/hktft32-overlay.dts

@@ -0,0 +1,36 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&i2c_1>;
+
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+
+	fragment@1 {
+		target = <&hsi2c_5>;
+
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+
+	fragment@2 {
+		target = <&spi_1>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@3 {
+		target = <&hktft32>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};

arch/arm/boot/dts/overlays/hktft35-overlay.dts

@@ -0,0 +1,36 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&i2c_1>;
+
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+
+	fragment@1 {
+		target = <&hsi2c_5>;
+
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+
+	fragment@2 {
+		target = <&spi_1>;
+
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+
+	fragment@3 {
+		target = <&hktft35>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};

arch/arm/boot/dts/overlays/i2c1-overlay.dts

@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&i2c_1>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};

arch/arm/boot/dts/overlays/i2c5-overlay.dts

@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&hsi2c_5>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};

arch/arm/boot/dts/overlays/spidev1-overlay.dts

@@ -0,0 +1,20 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&spi_1>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@1 {
+		target = <&spidev>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};

arch/arm/boot/dts/overlays/uart0-overlay.dts

@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&serial_0>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};

arch/arm/configs/odroidxu4_defconfig

@@ -2263,6 +2263,7 @@ CONFIG_RTLWIFI_DEBUG=y
 CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8XXXU=m
 CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_88XXAU=m
 # CONFIG_RTW88 is not set
 CONFIG_WLAN_VENDOR_RSI=y
 # CONFIG_RSI_91X is not set

drivers/net/wireless/realtek/Kconfig

@@ -16,5 +16,6 @@ source "drivers/net/wireless/realtek/rtl818x/Kconfig"
 source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
 source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
 source "drivers/net/wireless/realtek/rtw88/Kconfig"
+source "drivers/net/wireless/realtek/rtl88xxau/Kconfig"
 
 endif # WLAN_VENDOR_REALTEK

drivers/net/wireless/realtek/Makefile

@@ -8,4 +8,4 @@ obj-$(CONFIG_RTL8187)		+= rtl818x/
 obj-$(CONFIG_RTLWIFI)		+= rtlwifi/
 obj-$(CONFIG_RTL8XXXU)		+= rtl8xxxu/
 obj-$(CONFIG_RTW88)		+= rtw88/
-
+obj-$(CONFIG_88XXAU)		+= rtl88xxau/

drivers/net/wireless/realtek/rtl88xxau/.gitignore

@@ -0,0 +1,12 @@
+*.o
+*.cmd
+*.ko
+*.cm
+Module.symvers
+modules.order
+*.mod.c
+.tmp_versions
+.cache.mk
+*.mod
+*.o.d
+*.c.orig 

drivers/net/wireless/realtek/rtl88xxau/Kconfig

@@ -0,0 +1,6 @@
+config 88XXAU
+	tristate "Realtek 88XXau USB WiFi"
+	depends on USB
+	---help---
+	  Help message of 88XXau
+