From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 254C8C47E5F for ; Wed, 14 Jul 2021 19:58:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0B4EE613DD for ; Wed, 14 Jul 2021 19:58:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240790AbhGNUB3 (ORCPT ); Wed, 14 Jul 2021 16:01:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:46244 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241233AbhGNTu2 (ORCPT ); Wed, 14 Jul 2021 15:50:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D6E94613F6; Wed, 14 Jul 2021 19:47:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626292046; bh=8KSOoFh/pEvGwYuBxTPwz8GoV0hoP/FkpCdxg9hcglU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qxjy2ycyGq4tW3uDLsdgwxCK9NrZfuNl4NHE6YijGgq4JiirBaWue04EJ6M9wM/of JsYa49+nN6AbE2R5pxADV0DViO7nBv2Y3DfRRU7fUEWI/Ny/YUVpPGPQg6CDcUawU0 C0fH2iEKAKP8AdXnFrs1QUR3eePXk3aySxV/PA3dKMwwvuTcBDEQACLP3//s798yDM PAffSV+SR0C1S0s0fzrJPf1zPLJ+w+PJEMKaGwgf8Uxw0hw30zqxzHOgVCGaZ8Kd6I u+N2s8mtJNeT9LLR0blTmsOhbBfFg4rmia4EXqWBZUbZCSyTIWT98slJuln0Niz0U3 rVCf0N4DqH4qw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johan Jonker , Heiko Stuebner , Sasha Levin , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 02/28] ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288 Date: Wed, 14 Jul 2021 15:46:57 -0400 Message-Id: <20210714194723.55677-2-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714194723.55677-1-sashal@kernel.org> References: <20210714194723.55677-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johan Jonker [ 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 Link: https://lore.kernel.org/r/20210126110221.10815-1-jbx6244@gmail.com Signed-off-by: Heiko Stuebner Signed-off-by: Sasha Levin --- 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