From 086daed0d911bfb748f38bc8770f22cdafe756f6 Mon Sep 17 00:00:00 2001 From: Steve Jeong Date: Thu, 30 Mar 2023 17:46:07 +0900 Subject: [PATCH 1/6] ODROID-N2/C4: dtb/dtbo: Add dht11 overlay. Signed-off-by: Steve Jeong Change-Id: I545b89d9e744b7fa5ebd63b631164651ebcb29ea --- .../dts/amlogic/overlays/odroidc4/Makefile | 3 ++- .../dts/amlogic/overlays/odroidc4/dht11.dts | 19 +++++++++++++++++++ .../dts/amlogic/overlays/odroidn2/Makefile | 3 ++- .../dts/amlogic/overlays/odroidn2/dht11.dts | 19 +++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 arch/arm64/boot/dts/amlogic/overlays/odroidc4/dht11.dts create mode 100644 arch/arm64/boot/dts/amlogic/overlays/odroidn2/dht11.dts diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile index c091e26d2b4f..f2649d3d8b59 100644 --- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile @@ -29,7 +29,8 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDC4) += spi0.dtbo \ pwm_b-backlight.dtbo \ gpio-joystick0.dtbo \ gpio-joystick1.dtbo \ - display_vu7c.dtbo + display_vu7c.dtbo \ + dht11.dtbo targets += $(dtbo-y) always := $(dtbo-y) diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/dht11.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/dht11.dts new file mode 100644 index 000000000000..0375aaba408a --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/dht11.dts @@ -0,0 +1,19 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + fragment@0 { + target-path = "/"; + + __overlay__ { + humidity_sensor { + compatible = "dht11"; + gpios = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>; + status = "okay"; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile index b1eea212f76c..e6bddba0df32 100644 --- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile @@ -26,7 +26,8 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDN2) += spi0.dtbo \ pwm_d-backlight.dtbo \ gpio-joystick0.dtbo \ gpio-joystick1.dtbo \ - display_vu7c.dtbo + display_vu7c.dtbo \ + dht11.dtbo targets += $(dtbo-y) always := $(dtbo-y) diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/dht11.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/dht11.dts new file mode 100644 index 000000000000..0375aaba408a --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/dht11.dts @@ -0,0 +1,19 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + fragment@0 { + target-path = "/"; + + __overlay__ { + humidity_sensor { + compatible = "dht11"; + gpios = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>; + status = "okay"; + }; + }; + }; +}; From 0fcea5007550fa68cf41f6f81d6422b84862448e Mon Sep 17 00:00:00 2001 From: Steve Jeong Date: Mon, 3 Apr 2023 16:18:07 +0900 Subject: [PATCH 2/6] ODROID-N2/C4: defconfig: CONFIG DHT11 (=m) Signed-off-by: Steve Jeong Change-Id: Ic07cda613fe3ed5e7116118f3dee13a53e5bd759 --- arch/arm64/configs/odroidg12_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/odroidg12_defconfig b/arch/arm64/configs/odroidg12_defconfig index 786a2ac697cb..52a975db89ee 100644 --- a/arch/arm64/configs/odroidg12_defconfig +++ b/arch/arm64/configs/odroidg12_defconfig @@ -5839,7 +5839,7 @@ CONFIG_IIO_KFIFO_BUF=y # Humidity sensors # # CONFIG_AM2315 is not set -# CONFIG_DHT11 is not set +CONFIG_DHT11=m # CONFIG_HDC100X is not set # CONFIG_HTU21 is not set # CONFIG_SI7005 is not set From 86c2451013abeeb68a196717193850bbe5fafca3 Mon Sep 17 00:00:00 2001 From: Luke Go Date: Tue, 29 Aug 2023 15:38:22 +0900 Subject: [PATCH 3/6] ODROID-COMMON: dtb/dtbo: Add weather_board_zero. Signed-off-by: Luke Go Change-Id: Icc5e5d247876e10b75f9ae6c732ced482bb18218 --- .../boot/dts/amlogic/overlays/odroidc4/Makefile | 3 ++- .../overlays/odroidc4/weather_board_zero.dts | 17 +++++++++++++++++ .../boot/dts/amlogic/overlays/odroidn2/Makefile | 3 ++- .../overlays/odroidn2/weather_board_zero.dts | 17 +++++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 arch/arm64/boot/dts/amlogic/overlays/odroidc4/weather_board_zero.dts create mode 100644 arch/arm64/boot/dts/amlogic/overlays/odroidn2/weather_board_zero.dts diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile index f2649d3d8b59..b769914306c7 100644 --- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile @@ -30,7 +30,8 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDC4) += spi0.dtbo \ gpio-joystick0.dtbo \ gpio-joystick1.dtbo \ display_vu7c.dtbo \ - dht11.dtbo + dht11.dtbo \ + weather_board_zero.dtbo targets += $(dtbo-y) always := $(dtbo-y) diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/weather_board_zero.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/weather_board_zero.dts new file mode 100644 index 000000000000..9147e7e657d0 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/weather_board_zero.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; +/ { + fragment@0 { + target = <&i2c2>; + + __overlay__ { + status = "okay"; + + shtc1: shtc1@70 { + status = "okay"; + compatible = "shtc1"; + reg = <0x70>; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile index e6bddba0df32..dcd35f7b733c 100644 --- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile @@ -27,7 +27,8 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDN2) += spi0.dtbo \ gpio-joystick0.dtbo \ gpio-joystick1.dtbo \ display_vu7c.dtbo \ - dht11.dtbo + dht11.dtbo \ + weather_board_zero.dtbo targets += $(dtbo-y) always := $(dtbo-y) diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/weather_board_zero.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/weather_board_zero.dts new file mode 100644 index 000000000000..9147e7e657d0 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/weather_board_zero.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; +/ { + fragment@0 { + target = <&i2c2>; + + __overlay__ { + status = "okay"; + + shtc1: shtc1@70 { + status = "okay"; + compatible = "shtc1"; + reg = <0x70>; + }; + }; + }; +}; From b217bb34730992669ae554c6f8b13ff8d159a795 Mon Sep 17 00:00:00 2001 From: Luke Go Date: Tue, 29 Aug 2023 16:24:54 +0900 Subject: [PATCH 4/6] ODROID-G12: config: shtc1: make builtin. Signed-off-by: Luke Go Change-Id: I86ea27721cb295b4bef500e73e7bbaf1e90558dc --- arch/arm64/configs/odroidg12_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/odroidg12_defconfig b/arch/arm64/configs/odroidg12_defconfig index 52a975db89ee..e4e640b611af 100644 --- a/arch/arm64/configs/odroidg12_defconfig +++ b/arch/arm64/configs/odroidg12_defconfig @@ -3575,7 +3575,7 @@ CONFIG_SENSORS_PWM_FAN=y # CONFIG_SENSORS_SHT15 is not set # CONFIG_SENSORS_SHT21 is not set # CONFIG_SENSORS_SHT3x is not set -CONFIG_SENSORS_SHTC1=m +CONFIG_SENSORS_SHTC1=y # CONFIG_SENSORS_SIS5595 is not set # CONFIG_SENSORS_DME1737 is not set # CONFIG_SENSORS_EMC1403 is not set From 743c8af5f84962c6206d1211b4f79d84f388b80c Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Tue, 4 Jun 2024 18:00:28 +0900 Subject: [PATCH 5/6] ODROID-C4: arm64/dts: add PPS support over gpio pin #7 Requested and tested by https://forum.odroid.com/viewtopic.php?p=386053#p386053 Change-Id: I7b58904f4caddca0c664896a4bfeaf84762b6b83 Signed-off-by: Dongjin Kim --- .../dts/amlogic/overlays/odroidc4/Makefile | 1 + .../amlogic/overlays/odroidc4/pps-gpio_p7.dts | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/overlays/odroidc4/pps-gpio_p7.dts diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile index b769914306c7..5f991fa4b43a 100644 --- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile @@ -20,6 +20,7 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDC4) += spi0.dtbo \ esp8089.dtbo \ sdio.dtbo \ fanspeed-full.dtbo \ + pps-gpio_p7.dtbo \ pps-gpio_p11.dtbo \ pps-gpio_p12.dtbo \ pwm_ab.dtbo \ diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pps-gpio_p7.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pps-gpio_p7.dts new file mode 100644 index 000000000000..b6e315588e81 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pps-gpio_p7.dts @@ -0,0 +1,19 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + fragment@0 { + target-path = "/"; + + __overlay__ { + pps: pps { + compatible = "pps-gpio"; + gpios = <&gpio GPIOX_5 GPIO_ACTIVE_HIGH>; + status = "okay"; + }; + }; + }; +}; From 0e658067af67835a625e41e289effc4ee390d62f Mon Sep 17 00:00:00 2001 From: Steve Jeong Date: Thu, 4 Jan 2024 07:45:42 +0000 Subject: [PATCH 6/6] ODROID-N2/C4: dtb/dtbo: Add circuitpython dtbo Signed-off-by: Steve Jeong Change-Id: I8badc228a63b63732cc4135c16124020ff28be07 --- .../dts/amlogic/overlays/odroidc4/Makefile | 3 +- .../overlays/odroidc4/circuitpython.dts | 50 +++++++++++++++++++ .../dts/amlogic/overlays/odroidn2/Makefile | 3 +- .../overlays/odroidn2/circuitpython.dts | 50 +++++++++++++++++++ 4 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 arch/arm64/boot/dts/amlogic/overlays/odroidc4/circuitpython.dts create mode 100644 arch/arm64/boot/dts/amlogic/overlays/odroidn2/circuitpython.dts diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile index 5f991fa4b43a..93ac695a7f19 100644 --- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile @@ -32,7 +32,8 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDC4) += spi0.dtbo \ gpio-joystick1.dtbo \ display_vu7c.dtbo \ dht11.dtbo \ - weather_board_zero.dtbo + weather_board_zero.dtbo \ + circuitpython.dtbo targets += $(dtbo-y) always := $(dtbo-y) diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/circuitpython.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/circuitpython.dts new file mode 100644 index 000000000000..2cb7b0460c13 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/circuitpython.dts @@ -0,0 +1,50 @@ +/dts-v1/; +/plugin/; + +/ { + fragment@0 { + target = <&i2c2>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@1 { + target = <&spicc0>; + + __overlay__ { + status = "okay"; + + #address-cells = <1>; + #size-cells = <0>; + + spidev: spidev@0 { + status = "okay"; + compatible = "linux,spidev"; + reg = <0>; + /* spi default max clock 100Mhz */ + spi-max-frequency = <100000000>; + }; + }; + }; + + fragment@2 { + target = <&uart_A>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@3 { + target = <&pwm_ef>; + + __overlay__ { + status = "okay"; + pinctrl-names = "pwm_pins", "gpio_periphs"; + pinctrl-0 = <&pwm_e_pins &pwm_f_pins1>; + pinctrl-1 = <&pwmef_to_gpios>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile index dcd35f7b733c..4f7bb4ef7e04 100644 --- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile @@ -28,7 +28,8 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDN2) += spi0.dtbo \ gpio-joystick1.dtbo \ display_vu7c.dtbo \ dht11.dtbo \ - weather_board_zero.dtbo + weather_board_zero.dtbo \ + circuitpython.dtbo targets += $(dtbo-y) always := $(dtbo-y) diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/circuitpython.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/circuitpython.dts new file mode 100644 index 000000000000..2cb7b0460c13 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/circuitpython.dts @@ -0,0 +1,50 @@ +/dts-v1/; +/plugin/; + +/ { + fragment@0 { + target = <&i2c2>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@1 { + target = <&spicc0>; + + __overlay__ { + status = "okay"; + + #address-cells = <1>; + #size-cells = <0>; + + spidev: spidev@0 { + status = "okay"; + compatible = "linux,spidev"; + reg = <0>; + /* spi default max clock 100Mhz */ + spi-max-frequency = <100000000>; + }; + }; + }; + + fragment@2 { + target = <&uart_A>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@3 { + target = <&pwm_ef>; + + __overlay__ { + status = "okay"; + pinctrl-names = "pwm_pins", "gpio_periphs"; + pinctrl-0 = <&pwm_e_pins &pwm_f_pins1>; + pinctrl-1 = <&pwmef_to_gpios>; + }; + }; +};