From: Romain Perier Date: Wed, 22 Jul 2015 05:44:06 +0000 (+0200) Subject: ARM: dts: rockchip: Use correct dts properties for tsadc node on veyron X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~7588^2~10^2~6 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=117ccc11ac271e446e6f0d65ed75d426a376ad45;p=mirror_ubuntu-artful-kernel.git ARM: dts: rockchip: Use correct dts properties for tsadc node on veyron tsadc-tshut-mode and tsadc-tshut-polarity properties don't exist. The rockchip thermal driver looks for rockchip,hw-tshut-mode and rockchip,hw-tshut-polarity instead, otherwise it might freeze or hang the device according to the default mode or polarity used. Signed-off-by: Romain Perier Signed-off-by: Heiko Stuebner --- diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi index 97af57742316..2fa7a0dc83f7 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -367,8 +367,8 @@ &tsadc { status = "okay"; - tsadc-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */ - tsadc-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */ + rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */ + rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */ }; &uart0 {