Skip to content

Commit

Permalink
Merge pull request hardkernel#22 from yan-wyb/khadas-vims-4.9.y
Browse files Browse the repository at this point in the history
add 1wire supports and fixup red_led node name error
  • Loading branch information
numbqq authored Jul 17, 2020
2 parents a7e6a31 + ce3bdb1 commit 4c96315
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 1 deletion.
6 changes: 6 additions & 0 deletions arch/arm64/boot/dts/amlogic/kvim2_linux.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
8 changes: 7 additions & 1 deletion arch/arm64/boot/dts/amlogic/kvim3_linux.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down
7 changes: 7 additions & 0 deletions arch/arm64/boot/dts/amlogic/kvim_linux.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
3 changes: 3 additions & 0 deletions arch/arm64/configs/kvims_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4c96315

Please sign in to comment.