lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0207/1157] ARM: dts: imx7-colibri: move aliases, chosen, extcon and gpio-keys
    Date
    From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

    [ Upstream commit 0ef1969ea5699b00394e1a8c8c7f927b2d0bc5bb ]

    Move aliases, chosen, extcon and gpio-keys to module-level device tree
    given they are standard Colibri functionalities.

    Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/imx7-colibri-aster.dtsi | 18 ------------
    arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 31 --------------------
    arch/arm/boot/dts/imx7-colibri.dtsi | 32 +++++++++++++++++++++
    3 files changed, 32 insertions(+), 49 deletions(-)

    diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi
    index 69ee85084ad4..02c49ed686a8 100644
    --- a/arch/arm/boot/dts/imx7-colibri-aster.dtsi
    +++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi
    @@ -5,24 +5,6 @@
    */

    / {
    - chosen {
    - stdout-path = "serial0:115200n8";
    - };
    -
    - gpio-keys {
    - compatible = "gpio-keys";
    - pinctrl-names = "default";
    - pinctrl-0 = <&pinctrl_gpiokeys>;
    -
    - power {
    - label = "Wake-Up";
    - gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
    - linux,code = <KEY_WAKEUP>;
    - debounce-interval = <10>;
    - wakeup-source;
    - };
    - };
    -
    reg_3v3: regulator-3v3 {
    compatible = "regulator-fixed";
    regulator-name = "3.3V";
    diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
    index d6775e3c64f1..4cf4107fb642 100644
    --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
    +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
    @@ -4,15 +4,6 @@
    */

    / {
    - aliases {
    - rtc0 = &rtc;
    - rtc1 = &snvs_rtc;
    - };
    -
    - chosen {
    - stdout-path = "serial0:115200n8";
    - };
    -
    /* fixed crystal dedicated to mpc258x */
    clk16m: clk16m {
    compatible = "fixed-clock";
    @@ -20,27 +11,6 @@ clk16m: clk16m {
    clock-frequency = <16000000>;
    };

    - extcon_usbc_det: usbc-det {
    - compatible = "linux,extcon-usb-gpio";
    - id-gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>;
    - pinctrl-names = "default";
    - pinctrl-0 = <&pinctrl_usbc_det>;
    - };
    -
    - gpio-keys {
    - compatible = "gpio-keys";
    - pinctrl-names = "default";
    - pinctrl-0 = <&pinctrl_gpiokeys>;
    -
    - power {
    - label = "Wake-Up";
    - gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
    - linux,code = <KEY_WAKEUP>;
    - debounce-interval = <10>;
    - wakeup-source;
    - };
    - };
    -
    reg_3v3: regulator-3v3 {
    compatible = "regulator-fixed";
    regulator-name = "3.3V";
    @@ -148,7 +118,6 @@ &uart3 {
    };

    &usbotg1 {
    - extcon = <0>, <&extcon_usbc_det>;
    status = "okay";
    };

    diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
    index 4146564c3e4b..79f041988c7b 100644
    --- a/arch/arm/boot/dts/imx7-colibri.dtsi
    +++ b/arch/arm/boot/dts/imx7-colibri.dtsi
    @@ -6,6 +6,11 @@
    #include <dt-bindings/pwm/pwm.h>

    / {
    + aliases {
    + rtc0 = &rtc;
    + rtc1 = &snvs_rtc;
    + };
    +
    backlight: backlight {
    brightness-levels = <0 45 63 88 119 158 203 255>;
    compatible = "pwm-backlight";
    @@ -18,6 +23,32 @@ backlight: backlight {
    status = "disabled";
    };

    + chosen {
    + stdout-path = "serial0:115200n8";
    + };
    +
    + extcon_usbc_det: usbc-det {
    + compatible = "linux,extcon-usb-gpio";
    + debounce = <25>;
    + id-gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>; /* SODIMM 137 / USBC_DET */
    + pinctrl-names = "default";
    + pinctrl-0 = <&pinctrl_usbc_det>;
    + };
    +
    + gpio-keys {
    + compatible = "gpio-keys";
    + pinctrl-names = "default";
    + pinctrl-0 = <&pinctrl_gpiokeys>;
    +
    + wakeup {
    + debounce-interval = <10>;
    + gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* SODIMM 45 */
    + label = "Wake-Up";
    + linux,code = <KEY_WAKEUP>;
    + wakeup-source;
    + };
    + };
    +
    panel_dpi: panel-dpi {
    backlight = <&backlight>;
    compatible = "edt,et057090dhu";
    @@ -498,6 +529,7 @@ &uart3 {

    &usbotg1 {
    dr_mode = "otg";
    + extcon = <0>, <&extcon_usbc_det>;
    };

    &usdhc1 {
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 00:44    [W:4.035 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site