From ace79dd1b0d99a3789809d94a00d230d76f61c57 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 18 Dec 2020 23:20:50 +0100 Subject: [PATCH] ARM: dts: ux500: Remove the GPADC HW IRQ The AB8505 variant lacks the hardware conversion IRQ, so do not put it in with this variant. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-ab8505.dtsi | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/ste-ab8505.dtsi b/arch/arm/boot/dts/ste-ab8505.dtsi index 17854b215eda..696e6691fe41 100644 --- a/arch/arm/boot/dts/ste-ab8505.dtsi +++ b/arch/arm/boot/dts/ste-ab8505.dtsi @@ -45,9 +45,8 @@ gpadc: ab8500-gpadc { compatible = "stericsson,ab8500-gpadc"; - interrupts = <32 IRQ_TYPE_LEVEL_HIGH - 39 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "HW_CONV_END", "SW_CONV_END"; + interrupts = <39 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "SW_CONV_END"; vddadc-supply = <&ab8500_ldo_adc_reg>; #address-cells = <1>; #size-cells = <0>; @@ -90,7 +89,7 @@ }; ab8500_battery: ab8500_battery { - status = "disabled"; + stericsson,battery-type = "LIPO"; thermistor-on-batctrl; };