Message ID | 20220506152809.295409-16-marcel@ziswiler.com |
---|---|
State | New |
Headers | show |
Series | ARM: dts: imx7-colibri: device tree improvements | expand |
diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi index 9796bfabe241..a89c868ff3ed 100644 --- a/arch/arm/boot/dts/imx7-colibri-aster.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi @@ -7,14 +7,6 @@ &adc1 { status = "okay"; }; -/* - * ADC2 is not available on the Aster board and - * conflicts with AD7879 resistive touchscreen. - */ -&adc2 { - status = "disabled"; -}; - &fec1 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi index 069f56272546..6ae38c1f38d4 100644 --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi @@ -16,10 +16,6 @@ &adc1 { status = "okay"; }; -&adc2 { - status = "okay"; -}; - /* * The Atmel maxtouch controller uses SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm2, pwm3. * So if you enable following capacitive touch controller, disable pwm2/pwm3 first. diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index da3df00c7d67..0fc4b33d97be 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -137,8 +137,9 @@ &adc1 { vref-supply = <®_DCDC3>; }; +/* ADC2 is not available as it conflicts with AD7879 resistive touchscreen. */ &adc2 { - vref-supply = <®_DCDC3>; + status = "disabled"; }; &cpu0 {