From 526162cdb5a17a08e4558afacf1b9ed81cd66e91 Mon Sep 17 00:00:00 2001 From: yan Date: Wed, 15 Jul 2020 18:34:54 +0800 Subject: [PATCH 1/2] fixup red_led node error Signed-off-by: yan --- arch/arm64/boot/dts/amlogic/kvim3_linux.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/kvim3_linux.dts b/arch/arm64/boot/dts/amlogic/kvim3_linux.dts index 0b81d4d9afe45..8959ee4881f51 100644 --- a/arch/arm64/boot/dts/amlogic/kvim3_linux.dts +++ b/arch/arm64/boot/dts/amlogic/kvim3_linux.dts @@ -202,7 +202,7 @@ }; red_led { - label = "red_red"; + label = "red_led"; gpios = <&gpio_expander 5 GPIO_ACTIVE_HIGH>; default-state ="off"; linux,default-trigger="none"; From ce3bdb1f276eb2a1d6eff0635e18f56c6680a418 Mon Sep 17 00:00:00 2001 From: yan Date: Fri, 17 Jul 2020 17:24:46 +0800 Subject: [PATCH 2/2] Add 1wire supports Signed-off-by: yan --- arch/arm64/boot/dts/amlogic/kvim2_linux.dts | 6 ++++++ arch/arm64/boot/dts/amlogic/kvim3_linux.dts | 6 ++++++ arch/arm64/boot/dts/amlogic/kvim_linux.dts | 7 +++++++ arch/arm64/configs/kvims_defconfig | 3 +++ 4 files changed, 22 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/kvim2_linux.dts b/arch/arm64/boot/dts/amlogic/kvim2_linux.dts index 5416b082904e0..40cb1d253f971 100644 --- a/arch/arm64/boot/dts/amlogic/kvim2_linux.dts +++ b/arch/arm64/boot/dts/amlogic/kvim2_linux.dts @@ -1192,6 +1192,12 @@ key-permit = "read","write","del"; }; };//End unifykey + + onewire:onewire { + compatible = "w1-gpio"; + gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>; + status = "disable"; + }; }; &pinctrl_periphs{ diff --git a/arch/arm64/boot/dts/amlogic/kvim3_linux.dts b/arch/arm64/boot/dts/amlogic/kvim3_linux.dts index 8959ee4881f51..08e8457e7c4b3 100644 --- a/arch/arm64/boot/dts/amlogic/kvim3_linux.dts +++ b/arch/arm64/boot/dts/amlogic/kvim3_linux.dts @@ -809,6 +809,12 @@ status = "okay"; }; + onewire:onewire { + compatible = "w1-gpio"; + gpios = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>; + status = "disable"; + }; + sensor: sensor { compatible = "soc, sensor"; status = "okay"; diff --git a/arch/arm64/boot/dts/amlogic/kvim_linux.dts b/arch/arm64/boot/dts/amlogic/kvim_linux.dts index 937c3cca8da47..87d1849b6c239 100644 --- a/arch/arm64/boot/dts/amlogic/kvim_linux.dts +++ b/arch/arm64/boot/dts/amlogic/kvim_linux.dts @@ -1139,6 +1139,13 @@ key-permit = "read","write","del"; }; };//End unifykey + + onewire:onewire { + compatible = "w1-gpio"; + gpios = <&gpio_ao GPIOAO_1 GPIO_ACTIVE_HIGH>; + status = "disable"; + }; + }; &pinctrl_periphs{ diff --git a/arch/arm64/configs/kvims_defconfig b/arch/arm64/configs/kvims_defconfig index 76c24d1e0d3a9..4000184d31552 100644 --- a/arch/arm64/configs/kvims_defconfig +++ b/arch/arm64/configs/kvims_defconfig @@ -503,6 +503,9 @@ CONFIG_SPI_MESON_SPICC=y CONFIG_SPI_SPIDEV=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_PCA953X=y +CONFIG_W1=y +CONFIG_W1_MASTER_GPIO=y +CONFIG_W1_SLAVE_THERM=y CONFIG_THERMAL=y CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y