lkml.org 
[lkml]   [2022]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 09/24] ARM: dts: imx7-colibri: move regulators
    Date
    From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

    Move regulators to module-level device tree given they are standard
    Colibri functionalities.

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

    (no changes since v1)

    arch/arm/boot/dts/imx7-colibri-aster.dtsi | 27 -------------
    arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 25 ------------
    arch/arm/boot/dts/imx7-colibri.dtsi | 39 ++++++++++++++++---
    arch/arm/boot/dts/imx7d-colibri-aster.dts | 1 -
    .../arm/boot/dts/imx7d-colibri-emmc-aster.dts | 1 -
    .../boot/dts/imx7d-colibri-emmc-eval-v3.dts | 1 -
    arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 1 +
    arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 1 -
    arch/arm/boot/dts/imx7d-colibri.dtsi | 1 +
    9 files changed, 35 insertions(+), 62 deletions(-)

    diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi
    index c12de1861c05..440f98dc323d 100644
    --- a/arch/arm/boot/dts/imx7-colibri-aster.dtsi
    +++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi
    @@ -3,33 +3,6 @@
    * Copyright 2017-2022 Toradex
    */

    -/ {
    - reg_3v3: regulator-3v3 {
    - compatible = "regulator-fixed";
    - regulator-name = "3.3V";
    - regulator-min-microvolt = <3300000>;
    - regulator-max-microvolt = <3300000>;
    - };
    -
    - reg_5v0: regulator-5v0 {
    - compatible = "regulator-fixed";
    - regulator-name = "5V";
    - regulator-min-microvolt = <5000000>;
    - regulator-max-microvolt = <5000000>;
    - };
    -
    - reg_usbh_vbus: regulator-usbh-vbus {
    - compatible = "regulator-fixed";
    - pinctrl-names = "default";
    - pinctrl-0 = <&pinctrl_usbh_reg>;
    - regulator-name = "VCC_USB[1-4]";
    - regulator-min-microvolt = <5000000>;
    - regulator-max-microvolt = <5000000>;
    - gpio = <&gpio4 7 GPIO_ACTIVE_LOW>;
    - vin-supply = <&reg_5v0>;
    - };
    -};
    -
    &adc1 {
    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 2e6678f81af6..33a9cbbca0d2 100644
    --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
    +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
    @@ -10,31 +10,6 @@ clk16m: clk16m {
    #clock-cells = <0>;
    clock-frequency = <16000000>;
    };
    -
    - reg_3v3: regulator-3v3 {
    - compatible = "regulator-fixed";
    - regulator-name = "3.3V";
    - regulator-min-microvolt = <3300000>;
    - regulator-max-microvolt = <3300000>;
    - };
    -
    - reg_5v0: regulator-5v0 {
    - compatible = "regulator-fixed";
    - regulator-name = "5V";
    - regulator-min-microvolt = <5000000>;
    - regulator-max-microvolt = <5000000>;
    - };
    -
    - reg_usbh_vbus: regulator-usbh-vbus {
    - compatible = "regulator-fixed";
    - pinctrl-names = "default";
    - pinctrl-0 = <&pinctrl_usbh_reg>;
    - regulator-name = "VCC_USB[1-4]";
    - regulator-min-microvolt = <5000000>;
    - regulator-max-microvolt = <5000000>;
    - gpio = <&gpio4 7 GPIO_ACTIVE_LOW>;
    - vin-supply = <&reg_5v0>;
    - };
    };

    &adc1 {
    diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
    index c5a58949d664..329638985db6 100644
    --- a/arch/arm/boot/dts/imx7-colibri.dtsi
    +++ b/arch/arm/boot/dts/imx7-colibri.dtsi
    @@ -62,20 +62,47 @@ lcd_panel_in: endpoint {
    };
    };

    - reg_module_3v3: regulator-module-3v3 {
    + reg_3v3: regulator-3v3 {
    compatible = "regulator-fixed";
    - regulator-name = "+V3.3";
    - regulator-min-microvolt = <3300000>;
    + regulator-always-on;
    regulator-max-microvolt = <3300000>;
    + regulator-min-microvolt = <3300000>;
    + regulator-name = "3.3V";
    + };
    +
    + reg_5v0: regulator-5v0 {
    + compatible = "regulator-fixed";
    regulator-always-on;
    + regulator-max-microvolt = <5000000>;
    + regulator-min-microvolt = <5000000>;
    + regulator-name = "5V";
    };

    - reg_module_3v3_avdd: regulator-module-3v3-avdd {
    + reg_module_3v3: regulator-module-3v3 {
    compatible = "regulator-fixed";
    - regulator-name = "+V3.3_AVDD_AUDIO";
    - regulator-min-microvolt = <3300000>;
    + regulator-always-on;
    regulator-max-microvolt = <3300000>;
    + regulator-min-microvolt = <3300000>;
    + regulator-name = "+V3.3";
    + };
    +
    + reg_module_3v3_avdd: regulator-module-3v3-avdd {
    + compatible = "regulator-fixed";
    regulator-always-on;
    + regulator-max-microvolt = <3300000>;
    + regulator-min-microvolt = <3300000>;
    + regulator-name = "+V3.3_AVDD_AUDIO";
    + };
    +
    + reg_usbh_vbus: regulator-usbh-vbus {
    + compatible = "regulator-fixed";
    + gpio = <&gpio4 7 GPIO_ACTIVE_LOW>; /* SODIMM 129 / USBH_PEN */
    + pinctrl-names = "default";
    + pinctrl-0 = <&pinctrl_usbh_reg>;
    + regulator-max-microvolt = <5000000>;
    + regulator-min-microvolt = <5000000>;
    + regulator-name = "VCC_USB[1-4]";
    + vin-supply = <&reg_5v0>;
    };

    sound {
    diff --git a/arch/arm/boot/dts/imx7d-colibri-aster.dts b/arch/arm/boot/dts/imx7d-colibri-aster.dts
    index 2ed1823c4805..cfd75e3424fa 100644
    --- a/arch/arm/boot/dts/imx7d-colibri-aster.dts
    +++ b/arch/arm/boot/dts/imx7d-colibri-aster.dts
    @@ -36,6 +36,5 @@ &panel_dpi {
    };

    &usbotg2 {
    - vbus-supply = <&reg_usbh_vbus>;
    status = "okay";
    };
    diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts b/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts
    index 33e1034b75a4..7b4451699478 100644
    --- a/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts
    +++ b/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts
    @@ -17,6 +17,5 @@ / {
    };

    &usbotg2 {
    - vbus-supply = <&reg_usbh_vbus>;
    status = "okay";
    };
    diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts b/arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts
    index 25d8d4583289..3e84018392ee 100644
    --- a/arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts
    +++ b/arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts
    @@ -16,6 +16,5 @@ / {
    };

    &usbotg2 {
    - vbus-supply = <&reg_usbh_vbus>;
    status = "okay";
    };
    diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
    index e77f0b26b6fb..45b12b0d8710 100644
    --- a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
    +++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
    @@ -47,6 +47,7 @@ &gpio6 {

    &usbotg2 {
    dr_mode = "host";
    + vbus-supply = <&reg_usbh_vbus>;
    };

    &usdhc3 {
    diff --git a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
    index 51561388fac5..7aabe5691459 100644
    --- a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
    +++ b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
    @@ -47,6 +47,5 @@ &pwm3 {
    };

    &usbotg2 {
    - vbus-supply = <&reg_usbh_vbus>;
    status = "okay";
    };
    diff --git a/arch/arm/boot/dts/imx7d-colibri.dtsi b/arch/arm/boot/dts/imx7d-colibri.dtsi
    index 48993abacae4..d1469aa8b025 100644
    --- a/arch/arm/boot/dts/imx7d-colibri.dtsi
    +++ b/arch/arm/boot/dts/imx7d-colibri.dtsi
    @@ -29,4 +29,5 @@ &gpmi {

    &usbotg2 {
    dr_mode = "host";
    + vbus-supply = <&reg_usbh_vbus>;
    };
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-05-16 15:50    [W:4.275 / U:1.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site