diff mbox series

ARM: imx6ul: drop the adc num-channels property

Message ID 26a24c593294d0fe9a9447f5a46c2f0b787fea4f.1653884613.git.baruch@tkos.co.il (mailing list archive)
State New, archived
Headers show
Series ARM: imx6ul: drop the adc num-channels property | expand

Commit Message

Baruch Siach May 30, 2022, 4:23 a.m. UTC 
The mainline vf610_adc driver never used this property.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 1 -
 arch/arm/boot/dts/imx6ul-phytec-segin.dtsi    | 5 -----
 arch/arm/boot/dts/imx6ul.dtsi                 | 1 -
 arch/arm/boot/dts/imx6ull-colibri.dtsi        | 1 -
 4 files changed, 8 deletions(-)

Comments

Marcel Ziswiler May 30, 2022, 7:57 a.m. UTC | #1 
On Mon, 2022-05-30 at 07:23 +0300, Baruch Siach wrote:
> The mainline vf610_adc driver never used this property.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

> ---
>  arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 1 -
>  arch/arm/boot/dts/imx6ul-phytec-segin.dtsi    | 5 -----
>  arch/arm/boot/dts/imx6ul.dtsi                 | 1 -
>  arch/arm/boot/dts/imx6ull-colibri.dtsi        | 1 -
>  4 files changed, 8 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi b/arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi
> index a6cf0f21c66d..43868311f48a 100644
> --- a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi
> +++ b/arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi
> @@ -72,7 +72,6 @@ reg_vref_adc: regulator-vref-adc {
>  &adc1 {
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_adc1>;
> -       num-channels = <3>;
>         vref-supply = <&reg_vref_adc>;
>         status = "okay";
>  };
> diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi
> index 0d4ba9494cf2..38ea4dcfa228 100644
> --- a/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi
> +++ b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi
> @@ -83,11 +83,6 @@ &adc1 {
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_adc1>;
>         vref-supply = <&reg_adc1_vref_3v3>;
> -       /*
> -        * driver can not separate a specific channel so we request 4 channels
> -        * here - we need only the fourth channel
> -        */
> -       num-channels = <4>;
>         status = "disabled";
>  };
>  
> diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
> index afeec01f6522..799d8d065731 100644
> --- a/arch/arm/boot/dts/imx6ul.dtsi
> +++ b/arch/arm/boot/dts/imx6ul.dtsi
> @@ -923,7 +923,6 @@ adc1: adc@2198000 {
>                                 reg = <0x02198000 0x4000>;
>                                 interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
>                                 clocks = <&clks IMX6UL_CLK_ADC1>;
> -                               num-channels = <2>;
>                                 clock-names = "adc";
>                                 fsl,adck-max-frequency = <30000000>, <40000000>,
>                                                          <20000000>;
> diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
> index 15621e03fa4d..623bb7585ad1 100644
> --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
> +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
> @@ -94,7 +94,6 @@ reg_eth_phy: regulator-eth-phy {
>  };
>  
>  &adc1 {
> -       num-channels = <10>;
>         vref-supply = <&reg_module_3v3_avdd>;
>         pinctrl-names = "default";
>         pinctrl-0 = <&pinctrl_adc1>;
Shawn Guo June 12, 2022, 3:29 a.m. UTC | #2 
On Mon, May 30, 2022 at 07:23:33AM +0300, Baruch Siach wrote:
> The mainline vf610_adc driver never used this property.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Applied, thanks!
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi b/arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi
index a6cf0f21c66d..43868311f48a 100644
--- a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi
+++ b/arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi
@@ -72,7 +72,6 @@  reg_vref_adc: regulator-vref-adc {
 &adc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_adc1>;
-	num-channels = <3>;
 	vref-supply = <&reg_vref_adc>;
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi
index 0d4ba9494cf2..38ea4dcfa228 100644
--- a/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi
+++ b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi
@@ -83,11 +83,6 @@  &adc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_adc1>;
 	vref-supply = <&reg_adc1_vref_3v3>;
-	/*
-	 * driver can not separate a specific channel so we request 4 channels
-	 * here - we need only the fourth channel
-	 */
-	num-channels = <4>;
 	status = "disabled";
 };
 
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index afeec01f6522..799d8d065731 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -923,7 +923,6 @@  adc1: adc@2198000 {
 				reg = <0x02198000 0x4000>;
 				interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6UL_CLK_ADC1>;
-				num-channels = <2>;
 				clock-names = "adc";
 				fsl,adck-max-frequency = <30000000>, <40000000>,
 							 <20000000>;
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index 15621e03fa4d..623bb7585ad1 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -94,7 +94,6 @@  reg_eth_phy: regulator-eth-phy {
 };
 
 &adc1 {
-	num-channels = <10>;
 	vref-supply = <&reg_module_3v3_avdd>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_adc1>;