shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'odroidg12-4.9.y' of github.com:hardkernel/linux into odroidg12-4.9.y

Browse Source 
Change-Id: Id0ab847ce1d6421c9ba42ffa6a78b36f74d4a1c7
This commit is contained in:
Mauro (mdrjr) Ribeiro
2024-09-02 00:50:49 -03:00
parent ac47d57241 0e658067af
commit 939a58db01
10 changed files with 202 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile
View File

@@ -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 \
@@ -29,7 +30,10 @@ 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 \
weather_board_zero.dtbo \
circuitpython.dtbo
targets += $(dtbo-y)
always := $(dtbo-y)

50
arch/arm64/boot/dts/amlogic/overlays/odroidc4/circuitpython.dts Normal file
View File

@@ -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>;
};
};
};

19
arch/arm64/boot/dts/amlogic/overlays/odroidc4/dht11.dts Normal file
View File

@@ -0,0 +1,19 @@
/dts-v1/;
/plugin/;
#include <dt-bindings/gpio/meson-g12a-gpio.h>
#include <dt-bindings/gpio/gpio.h>
/ {
fragment@0 {
target-path = "/";
__overlay__ {
humidity_sensor {
compatible = "dht11";
gpios = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
status = "okay";
};
};
};
};

19
arch/arm64/boot/dts/amlogic/overlays/odroidc4/pps-gpio_p7.dts Normal file
View File

@@ -0,0 +1,19 @@
/dts-v1/;
/plugin/;
#include <dt-bindings/gpio/meson-g12a-gpio.h>
#include <dt-bindings/gpio/gpio.h>
/ {
fragment@0 {
target-path = "/";
__overlay__ {
pps: pps {
compatible = "pps-gpio";
gpios = <&gpio GPIOX_5 GPIO_ACTIVE_HIGH>;
status = "okay";
};
};
};
};

17
arch/arm64/boot/dts/amlogic/overlays/odroidc4/weather_board_zero.dts Normal file
View File

@@ -0,0 +1,17 @@
/dts-v1/;
/plugin/;
/ {
fragment@0 {
target = <&i2c2>;
__overlay__ {
status = "okay";
shtc1: shtc1@70 {
status = "okay";
compatible = "shtc1";
reg = <0x70>;
};
};
};
};

5
arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile
View File

@@ -26,7 +26,10 @@ 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 \
weather_board_zero.dtbo \
circuitpython.dtbo
targets += $(dtbo-y)
always := $(dtbo-y)

50
arch/arm64/boot/dts/amlogic/overlays/odroidn2/circuitpython.dts Normal file
View File

@@ -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>;
};
};
};

19
arch/arm64/boot/dts/amlogic/overlays/odroidn2/dht11.dts Normal file
View File

@@ -0,0 +1,19 @@
/dts-v1/;
/plugin/;
#include <dt-bindings/gpio/meson-g12a-gpio.h>
#include <dt-bindings/gpio/gpio.h>
/ {
fragment@0 {
target-path = "/";
__overlay__ {
humidity_sensor {
compatible = "dht11";
gpios = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
status = "okay";
};
};
};
};

17
arch/arm64/boot/dts/amlogic/overlays/odroidn2/weather_board_zero.dts Normal file
View File

@@ -0,0 +1,17 @@
/dts-v1/;
/plugin/;
/ {
fragment@0 {
target = <&i2c2>;
__overlay__ {
status = "okay";
shtc1: shtc1@70 {
status = "okay";
compatible = "shtc1";
reg = <0x70>;
};
};
};
};

4
arch/arm64/configs/odroidg12_defconfig
View File

@@ -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
@@ -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