lkml.org 
[lkml]   [2021]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 02/28] ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288
    Date
    From: Johan Jonker <jbx6244@gmail.com>

    [ Upstream commit dfbfb86a43f9a5bbd166d88bca9e07ee4e1bff31 ]

    A test with the command below aimed at powerpc generates
    notifications in the Rockchip ARM tree.

    Fix pinctrl "sleep" nodename by renaming it to "suspend"
    for rk3036-kylin and rk3288

    make ARCH=arm dtbs_check
    DT_SCHEMA_FILES=Documentation/devicetree/bindings/powerpc/sleep.yaml

    Signed-off-by: Johan Jonker <jbx6244@gmail.com>
    Link: https://lore.kernel.org/r/20210126110221.10815-1-jbx6244@gmail.com
    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/rk3036-kylin.dts | 2 +-
    arch/arm/boot/dts/rk3288.dtsi | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
    index fdb1570bc7d3..3371bc921aef 100644
    --- a/arch/arm/boot/dts/rk3036-kylin.dts
    +++ b/arch/arm/boot/dts/rk3036-kylin.dts
    @@ -424,7 +424,7 @@ sdmmc_pwr: sdmmc-pwr {
    };
    };

    - sleep {
    + suspend {
    global_pwroff: global-pwroff {
    rockchip,pins = <2 7 RK_FUNC_1 &pcfg_pull_none>;
    };
    diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
    index 23907d9ce89a..5dd37d09c1f1 100644
    --- a/arch/arm/boot/dts/rk3288.dtsi
    +++ b/arch/arm/boot/dts/rk3288.dtsi
    @@ -1453,7 +1453,7 @@ pcfg_pull_none_12ma: pcfg-pull-none-12ma {
    drive-strength = <12>;
    };

    - sleep {
    + suspend {
    global_pwroff: global-pwroff {
    rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>;
    };
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-14 22:10    [W:4.338 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site