[ rockchip-dev ] Add test 1-wire overlay

This commit is contained in:
Thomas McKahan 2018-12-13 23:45:53 -05:00
parent 98cc59c17a
commit 05387dc86f
2 changed files with 99 additions and 4 deletions

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.19.6 Kernel Configuration
# Linux/arm 4.19.9 Kernel Configuration
#
#
@ -2137,6 +2137,7 @@ CONFIG_RTL8814AU=m
CONFIG_WLAN_VENDOR_MEDIATEK=y
CONFIG_MT7601U=m
CONFIG_MT76_CORE=m
CONFIG_MT76_LEDS=y
CONFIG_MT76_USB=m
CONFIG_MT76x2_COMMON=m
CONFIG_MT76x0U=m
@ -2732,9 +2733,9 @@ CONFIG_W1_SLAVE_DS2423=m
CONFIG_W1_SLAVE_DS2431=m
CONFIG_W1_SLAVE_DS2433=m
# CONFIG_W1_SLAVE_DS2433_CRC is not set
# CONFIG_W1_SLAVE_DS2438 is not set
# CONFIG_W1_SLAVE_DS2780 is not set
# CONFIG_W1_SLAVE_DS2781 is not set
CONFIG_W1_SLAVE_DS2438=m
CONFIG_W1_SLAVE_DS2780=m
CONFIG_W1_SLAVE_DS2781=m
# CONFIG_W1_SLAVE_DS28E04 is not set
# CONFIG_W1_SLAVE_DS28E17 is not set
CONFIG_POWER_AVS=y

View File

@ -104,3 +104,97 @@ index db7399a49..6f14d9c7b 100644
# Add subdir path
extra-y := $(addprefix $(obj)/,$(extra-y))
diff --git a/arch/arm/boot/dts/overlay/Makefile b/arch/arm/boot/dts/overlay/Makefile
index b95172d18..f1c792059 100644
--- a/arch/arm/boot/dts/overlay/Makefile
+++ b/arch/arm/boot/dts/overlay/Makefile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
- rockchip-ds1307.dtbo
+ rockchip-ds1307.dtbo \
+ rockchip-w1-gpio.dtbo
scr-$(CONFIG_ARCH_ROCKCHIP) += \
rockchip-fixup.scr
diff --git a/arch/arm/boot/dts/overlay/README.rockchip-overlays b/arch/arm/boot/dts/overlay/README.rockchip-overlays
index ca8d80af1..14b22cc0c 100644
--- a/arch/arm/boot/dts/overlay/README.rockchip-overlays
+++ b/arch/arm/boot/dts/overlay/README.rockchip-overlays
@@ -9,6 +9,7 @@ rockchip (Rockchip)
### Provided overlays:
- ds1307
+- w1-gpio
### Overlay details:
@@ -16,3 +17,8 @@ rockchip (Rockchip)
Activates ds1307 rtc on i2c1
+### w1-gpio
+
+Activates 1-wire gpio master on GPIO0 17
+
+
diff --git a/arch/arm/boot/dts/overlay/rockchip-ds1307.dts b/arch/arm/boot/dts/overlay/rockchip-ds1307.dts
index e60a37e0f..af240e46b 100644
--- a/arch/arm/boot/dts/overlay/rockchip-ds1307.dts
+++ b/arch/arm/boot/dts/overlay/rockchip-ds1307.dts
@@ -1,4 +1,7 @@
-// Definitions for ds1307
+/* Definitions for ds1307
+* From ASUS: https://github.com/TinkerBoard/debian_kernel/commits/develop/arch/arm/boot/dts/overlays/ds1307-overlay.dts
+*/
+
/dts-v1/;
/plugin/;
@@ -10,6 +13,7 @@
__overlay__ {
rtc: ds1307@68 {
compatible = "dallas,ds1307";
+ reg = <0x68>;
status = "okay";
};
};
diff --git a/arch/arm/boot/dts/overlay/rockchip-w1-gpio.dts b/arch/arm/boot/dts/overlay/rockchip-w1-gpio.dts
new file mode 100644
index 000000000..02bb81a1e
--- /dev/null
+++ b/arch/arm/boot/dts/overlay/rockchip-w1-gpio.dts
@@ -0,0 +1,33 @@
+/* 1-Wire GPIO
+* From ASUS: https://github.com/TinkerBoard/debian_kernel/blob/develop/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts
+*
+*
+*/
+
+/dts-v1/;
+/plugin/;
+
+/ {
+ compatible = "rockchip,rk3288-tinker", "rockchip,rk3288";
+ fragment@0 {
+ target-path = "/";
+ __overlay__ {
+ w1: onewire@0 {
+ compatible = "w1-gpio";
+ pinctrl-names = "default";
+ pinctrl-0 = <&w1_pins>;
+ gpios = <&gpio0 17 0>;
+ status = "okay";
+ };
+ };
+ };
+
+ fragment@1 {
+ target = <&gpio0>;
+ __overlay__ {
+ w1_pins: w1_pins@0 {
+ rockchip,pins = <0 17 0 &pcfg_pull_up>;
+ };
+ };
+ };
+};