From patchwork Tue May 12 20:35:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 200721 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=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham 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 5A1DBC2D0F7 for ; Tue, 12 May 2020 20:35:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 32C1620740 for ; Tue, 12 May 2020 20:35:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SIYsMCCp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731065AbgELUfg (ORCPT ); Tue, 12 May 2020 16:35:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728882AbgELUfg (ORCPT ); Tue, 12 May 2020 16:35:36 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA314C061A0C; Tue, 12 May 2020 13:35:34 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id e1so3599768wrt.5; Tue, 12 May 2020 13:35:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=I9uvG2eCuivrXNCRIMZW/mu9KPh6v7hx44Xi50W3e7M=; b=SIYsMCCpNn9yTurKHtC9iaFOvGRu2pSw4QAtSl6kVos739KlbXvBFbl6wwuJYTfwfh Qrfz2hCU+q8L58f4ZFCWTKAyn83O5P9Z/WnrtTMP1/3rb6geJNlw4kiBzQXvOav7indi az5I2I8lUCLDpd+TB9b94PKqgdReAg02RWeXZiMqjU9mQjDJHQuueFZvdbPNMhi8mQpY jD2a86Mwd1cocsWcImudYIrO78SMZR8GLP1Z9b+KqouGHYmiHNj+WXNEYVTpnYPa1ORP AqijUUxHr2gAwe0Wa3ORtu8tZ3i2G57v9VxHMieGZcuh96NFSBYe7oUkewZMYPTyzocO iFxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=I9uvG2eCuivrXNCRIMZW/mu9KPh6v7hx44Xi50W3e7M=; b=JrX4UUIIbMJWVCl5vLxZONJfum+LE4ZsCoc8/fyBYRM6BImbXzXN7T3eTApnAwaO2F 0NC1/fwjqFKNtRRS5iMAjZFMML39kqP4GizfpspUQSF96oKwxwRL1Om/gJLXEpldB9SU JH+uapPec8hBUnmc7mh4Mic/N8MTGmmkV9nssL2Ee+ThMrxW2qJEsW3Vx4376mcfAxyA ntZZ+gUeLg8p3I8hwAT3iYHkv9jQ8VIITpYwjsWzNAj8B9GR1j7wPeHg0b1VhIDKXJxa hTBCnQToMKZQbSbq8QdSGRofQwMyQStMijVhP5QIrfPaLPYcJxM/9ABuxF1Q1AwZVZ2j 12Lg== X-Gm-Message-State: AGi0PuZX5Blc8YHcqqzCmGArvEAbvm0ztTAhNUnq9Cj1USDhnZprCbjr CSW8Y309LYGzCzlFgTSBmnU= X-Google-Smtp-Source: APiQypKWLZsLTHLSTYERhLF5tW5EgNJ4+bDKF6Dsed3mTcw4kEbRCC24LhQ+8c+LiLB3dde9aQzP6Q== X-Received: by 2002:adf:ecc3:: with SMTP id s3mr18769535wro.301.1589315733685; Tue, 12 May 2020 13:35:33 -0700 (PDT) Received: from debian.home (ip51ccf9cd.speed.planet.nl. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id k131sm418219wma.2.2020.05.12.13.35.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 May 2020 13:35:32 -0700 (PDT) From: Johan Jonker To: heiko@sntech.de Cc: linus.walleij@linaro.org, robh+dt@kernel.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] arm64: dts: rockchip: replace RK_FUNC defines in rk3326-odroid-go2.dts Date: Tue, 12 May 2020 22:35:22 +0200 Message-Id: <20200512203524.7317-1-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The defines RK_FUNC_1 and RK_FUNC_2 are deprecated, so replace them with the preferred form. Restyle properties in the same line. Signed-off-by: Johan Jonker --- arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts index fe253669b..46826b6e2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts @@ -543,18 +543,15 @@ }; soc_slppin_gpio: soc_slppin_gpio { - rockchip,pins = - <0 RK_PA4 RK_FUNC_GPIO &pcfg_output_low>; + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_output_low>; }; soc_slppin_rst: soc_slppin_rst { - rockchip,pins = - <0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>; + rockchip,pins = <0 RK_PA4 2 &pcfg_pull_none>; }; soc_slppin_slp: soc_slppin_slp { - rockchip,pins = - <0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <0 RK_PA4 1 &pcfg_pull_none>; }; }; }; From patchwork Tue May 12 20:35:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 200720 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=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham 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 54CFFC2D0F9 for ; Tue, 12 May 2020 20:35:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2DEF520747 for ; Tue, 12 May 2020 20:35:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nceJPZeo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731193AbgELUfl (ORCPT ); Tue, 12 May 2020 16:35:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1731183AbgELUfi (ORCPT ); Tue, 12 May 2020 16:35:38 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7434AC061A0C; Tue, 12 May 2020 13:35:37 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id y16so10366156wrs.3; Tue, 12 May 2020 13:35:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=B1auPUCQJ6jnhcwlo7ZQktJWdnEzk2MQBv9Xkb5qeSw=; b=nceJPZeojs6qraZ8fSw/SYQJlTdlVDPgIYgLp301owRsMMVQaScvhpVAbEBY7DoCen hM6a+G6qSjNbGrcDnjjcTJVIOaUysZAmQi5H/IFhXPUL82iFLfqDtCYuocwh9pXjU/Dc 2g2Noow6pWxBbO/xkfGqnDoUXDqtf+EkarqnDTP5Ob4t7zFEP4nu850SIu8tX1gRL31d Hlxj23K5dXKqFmbKlaw3c9/AIOF83gCJgyq5LY+nYIn6SXGYLavTaxRPJ7HUoqQZpPLn 6PONYfvWuCpA02crwLMom9YiLzUOXwRmFlhZ84fQdsI/cgNwjgTFs1hOanrSQzkktKMy HjgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=B1auPUCQJ6jnhcwlo7ZQktJWdnEzk2MQBv9Xkb5qeSw=; b=o52x9CMlAWTVg1WW9S8jG1Au0gpEuoiUi3dj+1X9eFHAl5kL5fchzFlgfstSiAtinl OadpWYfpd9XbWE2lRaEFNAmdgI37nzZQVhJw8yXx6SXrFimJ1Gfx1Qtpa9vyMN7JIK+p a1T3+SEJi8RrDqJvCILJyotAkQ/wqzHWL2/DGEXcn0T4skBDLyZZ8Vw85gn/dGlfENc4 tvXke0we20wOhjWvWZV1QRhDy5HMEI4tJcdnV6Ud5cKwmH76tGASqvc6CHNUDrugyz2q 2ZVTBmENNJRga9UIDNvnOMOpF15BQLCs6Rq5zYu+cF0LnEZYlAdewTKjkQMQH7l344TU k8+A== X-Gm-Message-State: AGi0Pua/H7WzjsmhKM/WcfTt3EHmY3T1QP9GPgqdqx26IoIgdRFqfj9X jd1xxwXOVvlYp4gWWypB3C4= X-Google-Smtp-Source: APiQypLmrnkToJDCa/tZNLkmV4SRoLb0lnQbv6DphIFu9wMNPlB73GP2mZkrvbhGxQJldgXB7izfsA== X-Received: by 2002:a5d:400f:: with SMTP id n15mr15743833wrp.419.1589315736169; Tue, 12 May 2020 13:35:36 -0700 (PDT) Received: from debian.home (ip51ccf9cd.speed.planet.nl. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id k131sm418219wma.2.2020.05.12.13.35.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 May 2020 13:35:35 -0700 (PDT) From: Johan Jonker To: heiko@sntech.de Cc: linus.walleij@linaro.org, robh+dt@kernel.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] include: dt-bindings: rockchip: remove unused defines Date: Tue, 12 May 2020 22:35:24 +0200 Message-Id: <20200512203524.7317-3-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200512203524.7317-1-jbx6244@gmail.com> References: <20200512203524.7317-1-jbx6244@gmail.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The Rockchip dtsi and dts files have been bulk-converted for the remaining raw gpio numbers into their descriptive counterparts and also got rid of the unhelpful RK_FUNC_x -> x and RK_GPIOx -> x mappings, so remove the unused defines in 'rockchip.h' to prevent that someone start using them again. Signed-off-by: Johan Jonker --- include/dt-bindings/pinctrl/rockchip.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/include/dt-bindings/pinctrl/rockchip.h b/include/dt-bindings/pinctrl/rockchip.h index 6d6bac1c2..5f291045e 100644 --- a/include/dt-bindings/pinctrl/rockchip.h +++ b/include/dt-bindings/pinctrl/rockchip.h @@ -9,13 +9,6 @@ #ifndef __DT_BINDINGS_ROCKCHIP_PINCTRL_H__ #define __DT_BINDINGS_ROCKCHIP_PINCTRL_H__ -#define RK_GPIO0 0 -#define RK_GPIO1 1 -#define RK_GPIO2 2 -#define RK_GPIO3 3 -#define RK_GPIO4 4 -#define RK_GPIO6 6 - #define RK_PA0 0 #define RK_PA1 1 #define RK_PA2 2 @@ -50,9 +43,5 @@ #define RK_PD7 31 #define RK_FUNC_GPIO 0 -#define RK_FUNC_1 1 /* deprecated */ -#define RK_FUNC_2 2 /* deprecated */ -#define RK_FUNC_3 3 /* deprecated */ -#define RK_FUNC_4 4 /* deprecated */ #endif