Merge pull request armbian#1032 from rabits/fb-gpiomem-to-rockchip-ne…

…xt_master ASUS Tinkerboard: Ported /dev/gpiomem from default to next rockchip kernel
ei-ke · Jul 5, 2018 · 1670fd1 · 1670fd1
2 parents effbb42 + b40aeaa
commit 1670fd1
Show file tree

Hide file tree

Showing 3 changed files with 381 additions and 1 deletion.
diff --git a/config/kernel/linux-rockchip-next.config b/config/kernel/linux-rockchip-next.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.52 Kernel Configuration
+# Linux/arm 4.14.53 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -842,6 +842,7 @@ CONFIG_NF_LOG_COMMON=m
 CONFIG_NF_LOG_NETDEV=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
+# CONFIG_NF_CONNTRACK_ZONES is not set
 CONFIG_NF_CONNTRACK_PROCFS=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMEOUT=y
@@ -2223,6 +2224,8 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
 # CONFIG_TRACE_SINK is not set
+CONFIG_RK_CHAR_DRIVERS=y
+CONFIG_RK3288_DEVGPIOMEM=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
 

diff --git a/patch/kernel/rockchip-next/260_DTS_gpiomem_node.patch b/patch/kernel/rockchip-next/260_DTS_gpiomem_node.patch
@@ -0,0 +1,17 @@
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
+index 925b277..33b198e 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dts
++++ b/arch/arm/boot/dts/rk3288-tinker.dts
+@@ -100,6 +100,12 @@
+ 		};
+ 	};
+
++	rk3288-gpiomem {
++		compatible = "rockchip,rk3288-gpiomem";
++		reg = <0x0 0xff750000 0x0 0x1000>;
++		status = "okay";
++	};
++
+ 	sound {
+ 		compatible = "simple-audio-card";
+ 		simple-audio-card,format = "i2s";