From patchwork Wed Jan 18 12:13:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 45237 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2318401wrn; Wed, 18 Jan 2023 04:52:41 -0800 (PST) X-Google-Smtp-Source: AMrXdXu9AByKs9q8Oy0ux4JcVefXiFDnNwrPEJV5ee2gJUcsgYB/O34Rwfj9AR3A6NaH5p5fJoXx X-Received: by 2002:a05:6a20:9b99:b0:b7:4f67:c2de with SMTP id mr25-20020a056a209b9900b000b74f67c2demr6667357pzb.40.1674046361574; Wed, 18 Jan 2023 04:52:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674046361; cv=none; d=google.com; s=arc-20160816; b=0ZV+h7/R4uCMOeLe356h+Nrt09dw8yx+s84c1MSfgHcGq9P+ML3Su1dpb0Dm7yqmn0 /mmiW9+cT2aCfSQyVxkU4yrpfduAqnuWdt0nosT5ZRSuK+402ozyPQagFqLq/6fT4/Mq zFTzsPpB6E+oTn+6BMtWuhwQpXYGED14LYG5y7qIqUgIZZHRtrRW4tW4UQECi3e6F4zY eHJh80TBtnpme9at8Ebg0doxmggvIRdPy8y43lNXW6LmrkfIasGsKLeGQWduc8l0mjKR RQ6SBEsQZdH3eY0XVPgXaIDviRKpsgzoIcQ6RDHL5DNiTUH3NxpifByVCE6er5hIaica rEaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language:cc:to :subject:from:user-agent:mime-version:date:message-id:dkim-signature; bh=zSiUjqeIhXTuZdT6eBiGLcbiQdlWY4D946T8IZEq1tM=; b=yfipNuEjpG0EgNarnPnlgFAN01HCfLtEUiEYbOXQA7kRS2kOGay6P/OU+DlDWgGj9p cvCnktV6mDzX8LOZc03Nl6XEaiDwYRT+jqg9m53EYTxcQssCdaEtcZqh3oK9nEp9eJ7p MoH6jXs78MBBzNm6lO3Z/6wxvrGgrICS57cXjd3gvbuIPhlH13MsT6Lkm19XGlT7JpOm 0+fvdpKYLRHE8SpNnMTMVoKTuyBRSynF0Jpk8+PBxsMT4FOcbNAAvnVECIVmDexkWvLs 1AJ7ruxUrOUBfuUaBj+ccbzXRkJQX5n8xjpYtoG48ojbXCdovc6I5nHZcNDNqblNJIir 0vUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dKanFbSa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f5-20020aa782c5000000b0058dada4acbasi7921304pfn.67.2023.01.18.04.52.28; Wed, 18 Jan 2023 04:52:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dKanFbSa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231167AbjARMwL (ORCPT + 99 others); Wed, 18 Jan 2023 07:52:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230367AbjARMvu (ORCPT ); Wed, 18 Jan 2023 07:51:50 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77CC64E50C; Wed, 18 Jan 2023 04:13:27 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id mp20so36146978ejc.7; Wed, 18 Jan 2023 04:13:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=zSiUjqeIhXTuZdT6eBiGLcbiQdlWY4D946T8IZEq1tM=; b=dKanFbSavWhQ2T04eS+23uXizOzrzix2u0Cn/8NyzbdwfmUOqEwbG0Mvvs/5qQAZYw E9SMCML7RNO6mwGoYvIku1ZYootIDWCeVdQy4IOV9nnp5z9QMjUlEcQnoSIKsIEx4BuJ ANNkfnb3q0U5o5qoR2AxxjfX55b1fjCrbA/clrv/NzXcYQ1K6icZHfFK3HCaDyb2Mzbl W4iwTVmvr1HjtdQwfFXUlIwRHQJI+A58LMkUrbvyzCXpWKppAklGEwHAp0xqR1jcZ+pZ OJGYYZxgSkoRYiN5wwame4F5h8Vyoad7PzXPCsFNSiUysNL3v82BgUkf8PgkyPZ+MqE8 5OpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=zSiUjqeIhXTuZdT6eBiGLcbiQdlWY4D946T8IZEq1tM=; b=Wt82lhEoccIh4J4Tam9mIeJrwnBuhWghOLr1xb/8Asu7wJc00yveUtjis8WM1jY6AJ hOUOuewTZc0/sE5RBH0+1d2ZnR7UYFWcctwPK5/IRbFKkm3Tj/AuQj/HWKdlJjwyaaj5 grZYOR6CMZbetteq+C49kizbpmlXFsXhwrhXgeUgNweA1BHALU3msdpRLo/sj1AROsj5 emS70NVUOppdgc+m3k9MwyN/jXkFp93ysQYd/bOk950uyQ5zy116KrfEcANi4OAO/JFh uCClHZi3wBJVPV82bb/35UV8UJMKjkws1c2dnF432ABt1gjyy3NW7W7n950OOAwB4d40 4tew== X-Gm-Message-State: AFqh2kqAPmtd1AhQS2uVhVM2xX5dSELTAdQed2BXvoXJhyu6frJQ3d4A gVP6kdSwwNJF+PJe4aFp3os= X-Received: by 2002:a17:907:86a5:b0:870:d4f3:61b3 with SMTP id qa37-20020a17090786a500b00870d4f361b3mr8604731ejc.12.1674044005883; Wed, 18 Jan 2023 04:13:25 -0800 (PST) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id r24-20020aa7da18000000b004704658abebsm14187212eds.54.2023.01.18.04.13.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jan 2023 04:13:25 -0800 (PST) Message-ID: <08de3f4b-e33f-95c8-3297-814ea107272a@gmail.com> Date: Wed, 18 Jan 2023 13:13:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 From: Johan Jonker Subject: [PATCH v1 1/4] dt-bindings: gpio: rockchip,gpio-bank: add compatible string per SoC To: linus.walleij@linaro.org, brgl@bgdev.pl Cc: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, heiko@sntech.de, 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, kever.yang@rock-chips.com, sjg@chromium.org, philipp.tomsich@vrull.eu Content-Language: en-US X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755364837409138743?= X-GMAIL-MSGID: =?utf-8?q?1755364837409138743?= Currently all Rockchip gpio nodes have the same compatible. Replace all the compatibles in gpio nodes to be able to give them a consistent ID independent from probe order or alias. Signed-off-by: Johan Jonker --- .../bindings/gpio/rockchip,gpio-bank.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -- 2.20.1 diff --git a/Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml b/Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml index affd823c8..72fdfcc65 100644 --- a/Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml +++ b/Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml @@ -13,7 +13,22 @@ properties: compatible: enum: - rockchip,gpio-bank + - rockchip,px30-gpio-bank + - rockchip,rk3036-gpio-bank + - rockchip,rk3066a-gpio-bank + - rockchip,rk3128-gpio-bank + - rockchip,rk3188-gpio-bank - rockchip,rk3188-gpio-bank0 + - rockchip,rk3228-gpio-bank + - rockchip,rk3288-gpio-bank + - rockchip,rk3328-gpio-bank + - rockchip,rk3308-gpio-bank + - rockchip,rk3368-gpio-bank + - rockchip,rk3399-gpio-bank + - rockchip,rk3568-gpio-bank + - rockchip,rk3588-gpio-bank + - rockchip,rv1108-gpio-bank + - rockchip,rv1126-gpio-bank reg: maxItems: 1 From patchwork Wed Jan 18 12:14:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 45239 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2318498wrn; Wed, 18 Jan 2023 04:53:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXsGN8Sw0xZJPRy0KOkRhBwbqSR+t7WMb70annSm49199j2tX+fWUYACXM23/BgV6LEFo2TH X-Received: by 2002:a17:90a:71c3:b0:229:77f:6d2f with SMTP id m3-20020a17090a71c300b00229077f6d2fmr6996951pjs.44.1674046381193; Wed, 18 Jan 2023 04:53:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674046381; cv=none; d=google.com; s=arc-20160816; b=e3xF8+DLvXmjxcAF1NRXOUZEYWj7JumaxxaW4GY5+Bo8mhjWPatcAb0eTrD8JQvH6o Ojb0Sb1zv8AC0GXvo3s3OMS0SH0NgdEkKM7v+VT1fT4mT1MpDX1FqrmksN/0fAiRisbZ To1S112D9Eo8sdBdsmO0sHNOdG8b1OH5eMQbWKmjV+4uM2at3wSk60l/yaSbQ8qcFMfM Yb0MlKzN7UufIXOnBJczGEaoFM9sW7ff8S6MzqosIJtDmSuacEwVljx1YJYsCRL82FcK HJRNrn8UhTckXIqA/LAq4QvTpFUSJF26aDgTK5lQT4zpjAjwSO0kZATkwj1vV4pB8rz7 ZoZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :content-language:references:cc:to:subject:from:user-agent :mime-version:date:message-id:dkim-signature; bh=Wtk2BXPwNgByM5zuDKe4rCk59dgrkS/p4SHrhV34oT4=; b=iN7nF0A9veeEGTw1CEI3iLvCR93fc6eaZeugqlbPP+dHpqkKdIFBy6EdyPR67pikgg ResqIv/DETkAuxlElpSi7qv+clisQcCncfh7gh4mCyMPrEMxMl7VdzzFFoLQ3XsXruYX HzWAPx9lznnlXG2RPRCT4fd48XPwS9fMYtO/DZRSGgmGM750DxRI6h6lCERRcgNpN9iR Mm6fpQZ2V96N3ST4MQnNALncS/o2p60IHwAqG58BPgpgB287oysPNUcyA6c8WtF6sIyA N3RQKxOoMRZyw/v8/I5XvWmzQHS4W56q9UY49gKwv2ivXA2dlo8Xmj0UVmaAGGCgQ0j/ Kj1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dRbLYQYx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hg2-20020a17090b300200b002190ba4112dsi1914905pjb.94.2023.01.18.04.52.49; Wed, 18 Jan 2023 04:53:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dRbLYQYx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229961AbjARMw2 (ORCPT + 99 others); Wed, 18 Jan 2023 07:52:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230403AbjARMvw (ORCPT ); Wed, 18 Jan 2023 07:51:52 -0500 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF3E532534; Wed, 18 Jan 2023 04:14:50 -0800 (PST) Received: by mail-ej1-x62b.google.com with SMTP id qx13so24376541ejb.13; Wed, 18 Jan 2023 04:14:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=Wtk2BXPwNgByM5zuDKe4rCk59dgrkS/p4SHrhV34oT4=; b=dRbLYQYxGRZ9Qu14o1s800Vn/SHB+wdv54SmGe1yNc6KvREEPnXhkbtebRRmvk1H01 sLNE3xiLyhr1qi4t3owWDec2qXeSfbaFyLSyKiuXv1066wfMg6cY4OrdgbJXX0+g/2QO V5G1W6BMQCdAL6+T6kdEyaXFs684e6roz1FX3O8VnY4iSiJMeX13W3Y39q4jnmyz7vj8 g6frVN9d3Vzb7E/IQP6PM8gLuc9emKDFQg9dqix6PiXtyyMvarllngsiKid65dWz6mh3 qhmXv/vtUUkcYMs0Dm0nOEhjb4pDkuu3XykFnZvryWJIsycHJixvjhNROFo6jws7q00Y mRag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Wtk2BXPwNgByM5zuDKe4rCk59dgrkS/p4SHrhV34oT4=; b=2r1TT3UZX86Wv/koj5JYQONClex6Zj5tTPpnir/355UQYSSCJr+4nbTRgBnBqJbDde WbfOLWGNuvKmHNF1kLByIBXjxHXhIPsK5E1mX+MHQhAVVS+IS0JoXy8+XceGDqEnusDb 7QtVkDfXThkdzWcxEm3VAHL5n9eGnZiP9Z8NMPn37leNblLxm47vH6eYyKaZB/rk/EkY TQfgV+9Sj6P2XKnClaqpZZeq5EfW7OyQ5CabCW53uLXM9WKg21CAQs1xXqX+9A/KD5vn 5kJvGYOCA1z5Y2/xSEAIynknU0zMexdSuYcVmIsrXSvCKcbO34n13EfxnOWV6r9zEBNe Bs/Q== X-Gm-Message-State: AFqh2kpfye49WpInKIz09lbfFi5GFeINNF+t+LULEciPGhiSMcOt6X4K 01VJVeuZyUJTjqZo4c7Cpto= X-Received: by 2002:a17:906:dc44:b0:86d:abca:3f55 with SMTP id yz4-20020a170906dc4400b0086dabca3f55mr14748187ejb.15.1674044089413; Wed, 18 Jan 2023 04:14:49 -0800 (PST) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id 17-20020a170906059100b007c16f120aacsm14448690ejn.121.2023.01.18.04.14.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jan 2023 04:14:48 -0800 (PST) Message-ID: <1510c02c-f640-9924-e42e-fa34e28a580f@gmail.com> Date: Wed, 18 Jan 2023 13:14:47 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 From: Johan Jonker Subject: [PATCH v1 2/4] gpio: gpio-rockchip: add compatible string per SoC To: linus.walleij@linaro.org, brgl@bgdev.pl Cc: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, heiko@sntech.de, 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, kever.yang@rock-chips.com, sjg@chromium.org, philipp.tomsich@vrull.eu References: <08de3f4b-e33f-95c8-3297-814ea107272a@gmail.com> Content-Language: en-US In-Reply-To: <08de3f4b-e33f-95c8-3297-814ea107272a@gmail.com> X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755364858287504530?= X-GMAIL-MSGID: =?utf-8?q?1755364858287504530?= Currently all Rockchip gpio nodes have the same compatible. Replace all the compatibles in gpio nodes to be able to give them a consistent ID independent from probe order or alias. Signed-off-by: Johan Jonker --- For now only add new compatibles. No changes to rockchip_gpio_probe() function yet. --- drivers/gpio/gpio-rockchip.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -- 2.20.1 diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c index e5de15a2a..493207de1 100644 --- a/drivers/gpio/gpio-rockchip.c +++ b/drivers/gpio/gpio-rockchip.c @@ -790,7 +790,22 @@ static int rockchip_gpio_remove(struct platform_device *pdev) static const struct of_device_id rockchip_gpio_match[] = { { .compatible = "rockchip,gpio-bank", }, + { .compatible = "rockchip,px30-gpio-bank", }, + { .compatible = "rockchip,rk3036-gpio-bank", }, + { .compatible = "rockchip,rk3066a-gpio-bank", }, + { .compatible = "rockchip,rk3128-gpio-bank", }, + { .compatible = "rockchip,rk3188-gpio-bank", }, { .compatible = "rockchip,rk3188-gpio-bank0" }, + { .compatible = "rockchip,rk3228-gpio-bank", }, + { .compatible = "rockchip,rk3288-gpio-bank", }, + { .compatible = "rockchip,rk3328-gpio-bank", }, + { .compatible = "rockchip,rk3308-gpio-bank", }, + { .compatible = "rockchip,rk3368-gpio-bank", }, + { .compatible = "rockchip,rk3399-gpio-bank", }, + { .compatible = "rockchip,rk3568-gpio-bank", }, + { .compatible = "rockchip,rk3588-gpio-bank", }, + { .compatible = "rockchip,rv1108-gpio-bank", }, + { .compatible = "rockchip,rv1126-gpio-bank", }, { }, }; From patchwork Wed Jan 18 12:15:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 45240 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2318585wrn; Wed, 18 Jan 2023 04:53:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXs72lWEoWsoUAwkcDgVDay9tvIOljKkJo8iD/7RaNgWkkRtOPAE2zqG8Zxgw6+NCkCICEZ+ X-Received: by 2002:a17:902:7787:b0:194:5d26:11cc with SMTP id o7-20020a170902778700b001945d2611ccmr6921079pll.6.1674046389361; Wed, 18 Jan 2023 04:53:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674046389; cv=none; d=google.com; s=arc-20160816; b=L/FSOZyl1zvYxXE5ZJ7GQB5x39xqBkdOkeH6MS8bJVt5jyg6GPtUUkf9y+ByfBlt1X i+Ibi1K/+Kiy9w7UZBpwDGNzUfxwyGAtaRJCPJViyUptvvBdwYnS936qbVX8Ip7JK/aQ zK1yfLppGkTEWiYnsX30GQb/kcfiApDOOP8J1GX6oMf1IOYcGOv1gL6CYfJ1EWNGzf7/ a0rKOm3b1u/9ucJX5KvQtY+Z6UaNLg5q2cUn7r5aVlSI3eY+VbQMgoxnbzAwjh0fC6l9 6fSHArneNbKzc4BPbPen3zvGjcG6F5/H4ONy/2Ekk1FfzKa/+gvq+ujZHXcA0+JUTGKf sp9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :content-language:references:cc:to:subject:from:user-agent :mime-version:date:message-id:dkim-signature; bh=gEm5pfEFxLU82heBKI27UAFcsZk4bHDY3wzooSXrcko=; b=VjR2FNIy1pxjszplmHWVPDKZZeKNxwo1BALeo6ZlcWHzq0EeLIkon9O7sjOFW5YI6R 1xO7zFuTyWtVe26YfGdq27Iz4xH3uv6wXNpye8Cmx8cKsOYvTs06tTZrc0qG6HSWfkHC Fz5jOnugzYAj4ekX9xqdfTWrCTqmqNPVqxgmL9//FzV8E93UpEsO6mufLOX7+KnBG7fg EO0d1tz16GoLPiWZab1/xZDQO8P9/ehT3zC/x2pSG9Ypm1xLPwbpaXNWNqhUn/YiMTlk eJy0sf+zomNOfg87T3dg67V2uJJy274Scjg4asxNDQf9b9vtIbYFAHsMRClPl/8BoUb4 JGmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VaFHPja+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q67-20020a632a46000000b004cd2eebb381si9654603pgq.57.2023.01.18.04.52.56; Wed, 18 Jan 2023 04:53:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VaFHPja+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231216AbjARMwf (ORCPT + 99 others); Wed, 18 Jan 2023 07:52:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230424AbjARMvy (ORCPT ); Wed, 18 Jan 2023 07:51:54 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1439137572; Wed, 18 Jan 2023 04:15:04 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id hw16so70904771ejc.10; Wed, 18 Jan 2023 04:15:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=gEm5pfEFxLU82heBKI27UAFcsZk4bHDY3wzooSXrcko=; b=VaFHPja+bPQ5/gm1MJ2pBOe+AJxl9fP51w3flhiEtvNn+z7klWeMihJ3F4LhurbmIz yhPRLCjCd0Fb9XnBOunXGr+ljgkoTC4aGXj2nvDKlG5uHf1B2ndiDzSjpSNf+/D85qct 22P5GEXeV4k9BwwwUqcl5SAFGfXkutYeF4/DX27j6hvDgeQlT+eDCk6KbisRsgWtZdrb aylEKrJT3HjBYFrtYGKKLH7h8dEeUUnHqkuEKVOu+tP7Mbrw5PZ6aOJYMobD58ctCWJB bEZL7GrP+Sxlf5VfQkbLjd5QTc1/WMa3AOiB+58zYyMThmol6M+/JOWERSD6aL9hjgUx 5YtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gEm5pfEFxLU82heBKI27UAFcsZk4bHDY3wzooSXrcko=; b=HIQcYK29RPBBM/yb1FxwCmvN4YrCZfNh6JVRkDJlBu4kqmd73yOWEQCCJCM8NeeQk/ yVO9oUx1hu3du6BNOD2au5FW9kgTJp6tyUaVh9n/SOlJCybnz7E9EbqbajAWQq6NqlIt 9lXum/JWlZ6TREyRJ4s/oNyI8uvl5GL4YV4l6Di/GeN8+jDcrfe/ujs5H+2MBzBxqHD2 w6tDDijVvc/6HJ0WPpXBQNhC/oz2XvfHR4/2+1EstkOMfEsFTTjxGkiNOlJ26vD13C2y i0Ag7oJzHMW4m2W6seWCvQodBi2XbfaXYRQ84HM7nPXTAPbOO6bhwsQJPBBTiGd/aQL0 V/CQ== X-Gm-Message-State: AFqh2kp9+DfqtFqUqmDZCCH71CtX16Q9EngTb/Ba8Bnjx79M08HaZtJp qt9fuEPkTxM1bkw9McRROQk= X-Received: by 2002:a17:906:eb8e:b0:871:6b9d:dbc with SMTP id mh14-20020a170906eb8e00b008716b9d0dbcmr6731822ejb.21.1674044102576; Wed, 18 Jan 2023 04:15:02 -0800 (PST) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id s24-20020a170906c31800b0086dee4e5555sm5251042ejz.87.2023.01.18.04.15.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jan 2023 04:15:02 -0800 (PST) Message-ID: <8bf935cf-8f99-d30e-e92c-bff58da0018c@gmail.com> Date: Wed, 18 Jan 2023 13:15:01 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 From: Johan Jonker Subject: [PATCH v1 3/4] ARM: dts: rockchip: replace compatible gpio nodes To: linus.walleij@linaro.org, brgl@bgdev.pl Cc: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, heiko@sntech.de, 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, kever.yang@rock-chips.com, sjg@chromium.org, philipp.tomsich@vrull.eu References: <08de3f4b-e33f-95c8-3297-814ea107272a@gmail.com> Content-Language: en-US In-Reply-To: <08de3f4b-e33f-95c8-3297-814ea107272a@gmail.com> X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755364867127642055?= X-GMAIL-MSGID: =?utf-8?q?1755364867127642055?= Currently all Rockchip gpio nodes have the same compatible. Replace all the compatibles in gpio nodes to be able to give them a consistent ID independent from probe order or alias. Signed-off-by: Johan Jonker --- arch/arm/boot/dts/rk3036.dtsi | 6 +++--- arch/arm/boot/dts/rk3066a.dtsi | 12 ++++++------ arch/arm/boot/dts/rk3128.dtsi | 8 ++++---- arch/arm/boot/dts/rk3188.dtsi | 6 +++--- arch/arm/boot/dts/rk322x.dtsi | 8 ++++---- arch/arm/boot/dts/rk3288.dtsi | 18 +++++++++--------- arch/arm/boot/dts/rv1108.dtsi | 8 ++++---- arch/arm/boot/dts/rv1126.dtsi | 10 +++++----- arch/arm64/boot/dts/rockchip/px30.dtsi | 8 ++++---- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 8 ++++---- 10 files changed, 46 insertions(+), 46 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index 78686fc72..6b1fe6054 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -576,7 +576,7 @@ ranges; gpio0: gpio@2007c000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3036-gpio-bank"; reg = <0x2007c000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO0>; @@ -589,7 +589,7 @@ }; gpio1: gpio@20080000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3036-gpio-bank"; reg = <0x20080000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO1>; @@ -602,7 +602,7 @@ }; gpio2: gpio@20084000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3036-gpio-bank"; reg = <0x20084000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO2>; diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi index de9915d94..59cdc2893 100644 --- a/arch/arm/boot/dts/rk3066a.dtsi +++ b/arch/arm/boot/dts/rk3066a.dtsi @@ -274,7 +274,7 @@ ranges; gpio0: gpio@20034000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3066a-gpio-bank"; reg = <0x20034000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO0>; @@ -287,7 +287,7 @@ }; gpio1: gpio@2003c000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3066a-gpio-bank"; reg = <0x2003c000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO1>; @@ -300,7 +300,7 @@ }; gpio2: gpio@2003e000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3066a-gpio-bank"; reg = <0x2003e000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO2>; @@ -313,7 +313,7 @@ }; gpio3: gpio@20080000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3066a-gpio-bank"; reg = <0x20080000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO3>; @@ -326,7 +326,7 @@ }; gpio4: gpio@20084000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3066a-gpio-bank"; reg = <0x20084000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO4>; @@ -339,7 +339,7 @@ }; gpio6: gpio@2000a000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3066a-gpio-bank"; reg = <0x2000a000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO6>; diff --git a/arch/arm/boot/dts/rk3128.dtsi b/arch/arm/boot/dts/rk3128.dtsi index b63bd4ad3..384230279 100644 --- a/arch/arm/boot/dts/rk3128.dtsi +++ b/arch/arm/boot/dts/rk3128.dtsi @@ -471,7 +471,7 @@ ranges; gpio0: gpio@2007c000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3128-gpio-bank"; reg = <0x2007c000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO0>; @@ -482,7 +482,7 @@ }; gpio1: gpio@20080000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3128-gpio-bank"; reg = <0x20080000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO1>; @@ -493,7 +493,7 @@ }; gpio2: gpio@20084000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3128-gpio-bank"; reg = <0x20084000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO2>; @@ -504,7 +504,7 @@ }; gpio3: gpio@20088000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3128-gpio-bank"; reg = <0x20088000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO3>; diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi index 44b54af0b..09540d779 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -238,7 +238,7 @@ }; gpio1: gpio@2003c000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3188-gpio-bank"; reg = <0x2003c000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO1>; @@ -251,7 +251,7 @@ }; gpio2: gpio@2003e000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3188-gpio-bank"; reg = <0x2003e000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO2>; @@ -264,7 +264,7 @@ }; gpio3: gpio@20080000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3188-gpio-bank"; reg = <0x20080000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO3>; diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi index ffc16d6b9..c1a6bab37 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -949,7 +949,7 @@ ranges; gpio0: gpio@11110000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3228-gpio-bank"; reg = <0x11110000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO0>; @@ -962,7 +962,7 @@ }; gpio1: gpio@11120000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3228-gpio-bank"; reg = <0x11120000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO1>; @@ -975,7 +975,7 @@ }; gpio2: gpio@11130000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3228-gpio-bank"; reg = <0x11130000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO2>; @@ -988,7 +988,7 @@ }; gpio3: gpio@11140000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3228-gpio-bank"; reg = <0x11140000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO3>; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 2ca76b69a..ad2ea13c6 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -1425,7 +1425,7 @@ ranges; gpio0: gpio@ff750000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3288-gpio-bank"; reg = <0x0 0xff750000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO0>; @@ -1438,7 +1438,7 @@ }; gpio1: gpio@ff780000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3288-gpio-bank"; reg = <0x0 0xff780000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO1>; @@ -1451,7 +1451,7 @@ }; gpio2: gpio@ff790000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3288-gpio-bank"; reg = <0x0 0xff790000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO2>; @@ -1464,7 +1464,7 @@ }; gpio3: gpio@ff7a0000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3288-gpio-bank"; reg = <0x0 0xff7a0000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO3>; @@ -1477,7 +1477,7 @@ }; gpio4: gpio@ff7b0000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3288-gpio-bank"; reg = <0x0 0xff7b0000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO4>; @@ -1490,7 +1490,7 @@ }; gpio5: gpio@ff7c0000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3288-gpio-bank"; reg = <0x0 0xff7c0000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO5>; @@ -1503,7 +1503,7 @@ }; gpio6: gpio@ff7d0000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3288-gpio-bank"; reg = <0x0 0xff7d0000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO6>; @@ -1516,7 +1516,7 @@ }; gpio7: gpio@ff7e0000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3288-gpio-bank"; reg = <0x0 0xff7e0000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO7>; @@ -1529,7 +1529,7 @@ }; gpio8: gpio@ff7f0000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3288-gpio-bank"; reg = <0x0 0xff7f0000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO8>; diff --git a/arch/arm/boot/dts/rv1108.dtsi b/arch/arm/boot/dts/rv1108.dtsi index abf3006f0..2b459506e 100644 --- a/arch/arm/boot/dts/rv1108.dtsi +++ b/arch/arm/boot/dts/rv1108.dtsi @@ -596,7 +596,7 @@ ranges; gpio0: gpio@20030000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rv1108-gpio-bank"; reg = <0x20030000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO0_PMU>; @@ -609,7 +609,7 @@ }; gpio1: gpio@10310000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rv1108-gpio-bank"; reg = <0x10310000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO1>; @@ -622,7 +622,7 @@ }; gpio2: gpio@10320000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rv1108-gpio-bank"; reg = <0x10320000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO2>; @@ -635,7 +635,7 @@ }; gpio3: gpio@10330000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rv1108-gpio-bank"; reg = <0x10330000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO3>; diff --git a/arch/arm/boot/dts/rv1126.dtsi b/arch/arm/boot/dts/rv1126.dtsi index 1f07d0a4f..d30deb73e 100644 --- a/arch/arm/boot/dts/rv1126.dtsi +++ b/arch/arm/boot/dts/rv1126.dtsi @@ -428,7 +428,7 @@ ranges; gpio0: gpio@ff460000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rv1126-gpio-bank"; reg = <0xff460000 0x100>; interrupts = ; clocks = <&pmucru PCLK_GPIO0>, <&pmucru DBCLK_GPIO0>; @@ -439,7 +439,7 @@ }; gpio1: gpio@ff620000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rv1126-gpio-bank"; reg = <0xff620000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO1>, <&cru DBCLK_GPIO1>; @@ -450,7 +450,7 @@ }; gpio2: gpio@ff630000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rv1126-gpio-bank"; reg = <0xff630000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO2>, <&cru DBCLK_GPIO2>; @@ -461,7 +461,7 @@ }; gpio3: gpio@ff640000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rv1126-gpio-bank"; reg = <0xff640000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO3>, <&cru DBCLK_GPIO3>; @@ -472,7 +472,7 @@ }; gpio4: gpio@ff650000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rv1126-gpio-bank"; reg = <0xff650000 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO4>, <&cru DBCLK_GPIO4>; diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi index 4f6959eb5..6c7a6817c 100644 --- a/arch/arm64/boot/dts/rockchip/px30.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30.dtsi @@ -1382,7 +1382,7 @@ ranges; gpio0: gpio@ff040000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,px30-gpio-bank"; reg = <0x0 0xff040000 0x0 0x100>; interrupts = ; clocks = <&pmucru PCLK_GPIO0_PMU>; @@ -1394,7 +1394,7 @@ }; gpio1: gpio@ff250000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,px30-gpio-bank"; reg = <0x0 0xff250000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO1>; @@ -1406,7 +1406,7 @@ }; gpio2: gpio@ff260000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,px30-gpio-bank"; reg = <0x0 0xff260000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO2>; @@ -1418,7 +1418,7 @@ }; gpio3: gpio@ff270000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,px30-gpio-bank"; reg = <0x0 0xff270000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO3>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi index 6d7a7bf72..868e5e6b5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -1045,7 +1045,7 @@ ranges; gpio0: gpio@ff210000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3328-gpio-bank"; reg = <0x0 0xff210000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO0>; @@ -1058,7 +1058,7 @@ }; gpio1: gpio@ff220000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3328-gpio-bank"; reg = <0x0 0xff220000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO1>; @@ -1071,7 +1071,7 @@ }; gpio2: gpio@ff230000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3328-gpio-bank"; reg = <0x0 0xff230000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO2>; @@ -1084,7 +1084,7 @@ }; gpio3: gpio@ff240000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3328-gpio-bank"; reg = <0x0 0xff240000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO3>; From patchwork Wed Jan 18 12:15:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 45246 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2318983wrn; Wed, 18 Jan 2023 04:54:06 -0800 (PST) X-Google-Smtp-Source: AMrXdXsFwaU58KEqj3CgFd2ZyqqGIe7AiI3Wpf/Ye/E2ZQS2FcapPbH5IxlIoHfPOrRgGcVxaLfD X-Received: by 2002:a17:902:f28a:b0:194:8c76:42dd with SMTP id k10-20020a170902f28a00b001948c7642ddmr6323320plc.19.1674046446435; Wed, 18 Jan 2023 04:54:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674046446; cv=none; d=google.com; s=arc-20160816; b=PqSnqRXeVZEfJJn1GHCo5ZCRWefSKCC7FX+DY2nVhxv+uv3jbuaPPvCRqEDXuYqcwV h5LzSm3C91/97TfuoKHcmHR+5X3mvfjpuJp2mUGYCYq1TBvHvODf2rII4yrtWQKYVMY/ mZ78ZZ1nKXJy5ziu/RUPgUGUe4inxBFCWTOiklQ4RfdHXu9f3W2FXQeU/8fJZmRX7ueN pCitzDJh8FUyy8gug2zkgM/gRbBurLj9YXirKtx2fXUxexLBZkRcP/bmM7DucjInvU5l NUyXB/M31+GIcHcSa5mKN8Lr4nXtzVJmhWrUbj6Twpaebp1+3LlMeCbnyINcqFFeGifo atgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :content-language:references:cc:to:subject:from:user-agent :mime-version:date:message-id:dkim-signature; bh=rY2dhN6VM8uIQ/kU2pyaCHeRarUbTmENra0xJ5LCaDk=; b=VSES51RiN/v3io8BZ4xCSze6CRQ2zRepSQJUpZuoEcoO385gGTRN7I9aiHLYSDKhwh q+wbco53rTNfYY2No9Yw6Tbkclo8drOtL6jIAJKcs9x2se01sD0wguSTC6qrqluA9P2k /SbSvsw+c+NIEPkyYyTmWG13hMWW2gljM7Hc441Vn86bHy+/OMgRqiKmXsui5bY/8QQK 4npOdLfO1IdcgFN7UnBezftCwujNxui/sBzMGL7gHOnxc4gefTouEEUZCPjsHxcMzHr5 HAG8hzPHrcngYfHp+bo1wP0gsMavzXmM7pl9qAQ5qJ7XV5ucjVLvcRDm1sfPmCL5869W TOIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eMLrMHme; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d9-20020a170902cec900b0018c35376fdcsi12314838plg.78.2023.01.18.04.53.54; Wed, 18 Jan 2023 04:54:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eMLrMHme; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231262AbjARMxU (ORCPT + 99 others); Wed, 18 Jan 2023 07:53:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230490AbjARMvz (ORCPT ); Wed, 18 Jan 2023 07:51:55 -0500 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2548D47EDC; Wed, 18 Jan 2023 04:15:15 -0800 (PST) Received: by mail-ej1-x62c.google.com with SMTP id ss4so75467069ejb.11; Wed, 18 Jan 2023 04:15:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=rY2dhN6VM8uIQ/kU2pyaCHeRarUbTmENra0xJ5LCaDk=; b=eMLrMHme1tSAjFfNRARv0F24d/PKkbFHuQFqgCIaE/6J2P0I5VVv30UcRbhXM5xk// wh9Ril8dIvu97wTPhEzZ7ej31pKddKbIr+gDPBgmuH5ZLCyBzjkYTqw0R0XHafTbYLEI J1NgWu+mfkqtIr6+Zouyvu/SfN6ILjxch0cJhMLkgglT69AXHwkWysdqseixoKh69dvQ BFYB05Rfi8sHUJKEB3InOMCb9tNC1knUnlR9oZS/twaLfZ6E+SAcenGd8qLsumGCfTZm TXbJUZh5wMbx7siyXv6Szn04pBR6defyzG6EFnWc97z1h/uRVWkt+Bdx81BJM+H8w5R1 TItQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rY2dhN6VM8uIQ/kU2pyaCHeRarUbTmENra0xJ5LCaDk=; b=uCViiZlLjdtMUaJzWZpDFMadLUx/Wt3fzQ6+15BQN5Hr2DQvPjzSJSG5Pljoqi+Uoe xSoXylp0J1H+AIvb29zRoLhzhsUZKdc9FdaZG/O7n51h/60Gp6owoUSLeuHKJ25hk4g9 HMlACvNt/vE83vROpVdsAWQnpKc5tCmJ/ZTUDiQHDf/WkiwLZ4SurOrur4DO3eGvdD4H hbgytX6L0M4unWvAB16uuiBwef+LkJNjV0UpSxy5NzQdYiizVI9OK20Kx/w8XFAzVj29 d4xopMBswCrrsLFLjoQkFrJRfd/WCVhRnSYA/6D/D39+JIvKteUZaR5cHFEkdfz7WXhM Japg== X-Gm-Message-State: AFqh2krndArkWpoREnknZA2ebhF17u+1fUUF8h7EaMWN28yxQxyul+5D EKVVtBdGaC8l9eLrUyLaCL4= X-Received: by 2002:a17:907:86a5:b0:870:d4f3:61b3 with SMTP id qa37-20020a17090786a500b00870d4f361b3mr8614201ejc.12.1674044114443; Wed, 18 Jan 2023 04:15:14 -0800 (PST) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id x25-20020a170906b09900b0080345493023sm14348963ejy.167.2023.01.18.04.15.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jan 2023 04:15:14 -0800 (PST) Message-ID: <3e1e8687-ef64-8e96-df7f-fb28bf6ba547@gmail.com> Date: Wed, 18 Jan 2023 13:15:13 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 From: Johan Jonker Subject: [PATCH v1 4/4] arm64: dts: rockchip: replace compatible gpio nodes To: linus.walleij@linaro.org, brgl@bgdev.pl Cc: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, heiko@sntech.de, 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, kever.yang@rock-chips.com, sjg@chromium.org, philipp.tomsich@vrull.eu References: <08de3f4b-e33f-95c8-3297-814ea107272a@gmail.com> Content-Language: en-US In-Reply-To: <08de3f4b-e33f-95c8-3297-814ea107272a@gmail.com> X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755364926674391172?= X-GMAIL-MSGID: =?utf-8?q?1755364926674391172?= Currently all Rockchip gpio nodes have the same compatible. Replace all the compatibles in gpio nodes to be able to give them a consistent ID independent from probe order or alias. Signed-off-by: Johan Jonker --- arch/arm64/boot/dts/rockchip/rk3308.dtsi | 10 +++++----- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 8 ++++---- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 10 +++++----- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 10 +++++----- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 10 +++++----- 5 files changed, 24 insertions(+), 24 deletions(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi index dd228a256..fe3e665a9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi @@ -793,7 +793,7 @@ ranges; gpio0: gpio@ff220000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3308-gpio-bank"; reg = <0x0 0xff220000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO0>; @@ -804,7 +804,7 @@ }; gpio1: gpio@ff230000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3308-gpio-bank"; reg = <0x0 0xff230000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO1>; @@ -815,7 +815,7 @@ }; gpio2: gpio@ff240000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3308-gpio-bank"; reg = <0x0 0xff240000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO2>; @@ -826,7 +826,7 @@ }; gpio3: gpio@ff250000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3308-gpio-bank"; reg = <0x0 0xff250000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO3>; @@ -837,7 +837,7 @@ }; gpio4: gpio@ff260000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3308-gpio-bank"; reg = <0x0 0xff260000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO4>; diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi index a4c5aaf1f..322836326 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi @@ -978,7 +978,7 @@ ranges; gpio0: gpio@ff750000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3368-gpio-bank"; reg = <0x0 0xff750000 0x0 0x100>; clocks = <&cru PCLK_GPIO0>; interrupts = ; @@ -991,7 +991,7 @@ }; gpio1: gpio@ff780000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3368-gpio-bank"; reg = <0x0 0xff780000 0x0 0x100>; clocks = <&cru PCLK_GPIO1>; interrupts = ; @@ -1004,7 +1004,7 @@ }; gpio2: gpio@ff790000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3368-gpio-bank"; reg = <0x0 0xff790000 0x0 0x100>; clocks = <&cru PCLK_GPIO2>; interrupts = ; @@ -1017,7 +1017,7 @@ }; gpio3: gpio@ff7a0000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3368-gpio-bank"; reg = <0x0 0xff7a0000 0x0 0x100>; clocks = <&cru PCLK_GPIO3>; interrupts = ; diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 1881b4b71..0bb2ab134 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -2085,7 +2085,7 @@ ranges; gpio0: gpio@ff720000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3399-gpio-bank"; reg = <0x0 0xff720000 0x0 0x100>; clocks = <&pmucru PCLK_GPIO0_PMU>; interrupts = ; @@ -2098,7 +2098,7 @@ }; gpio1: gpio@ff730000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3399-gpio-bank"; reg = <0x0 0xff730000 0x0 0x100>; clocks = <&pmucru PCLK_GPIO1_PMU>; interrupts = ; @@ -2111,7 +2111,7 @@ }; gpio2: gpio@ff780000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3399-gpio-bank"; reg = <0x0 0xff780000 0x0 0x100>; clocks = <&cru PCLK_GPIO2>; interrupts = ; @@ -2124,7 +2124,7 @@ }; gpio3: gpio@ff788000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3399-gpio-bank"; reg = <0x0 0xff788000 0x0 0x100>; clocks = <&cru PCLK_GPIO3>; interrupts = ; @@ -2137,7 +2137,7 @@ }; gpio4: gpio@ff790000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3399-gpio-bank"; reg = <0x0 0xff790000 0x0 0x100>; clocks = <&cru PCLK_GPIO4>; interrupts = ; diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi index eed0059a6..401095ae9 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -1803,7 +1803,7 @@ ranges; gpio0: gpio@fdd60000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3568-gpio-bank"; reg = <0x0 0xfdd60000 0x0 0x100>; interrupts = ; clocks = <&pmucru PCLK_GPIO0>, <&pmucru DBCLK_GPIO0>; @@ -1814,7 +1814,7 @@ }; gpio1: gpio@fe740000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3568-gpio-bank"; reg = <0x0 0xfe740000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO1>, <&cru DBCLK_GPIO1>; @@ -1825,7 +1825,7 @@ }; gpio2: gpio@fe750000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3568-gpio-bank"; reg = <0x0 0xfe750000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO2>, <&cru DBCLK_GPIO2>; @@ -1836,7 +1836,7 @@ }; gpio3: gpio@fe760000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3568-gpio-bank"; reg = <0x0 0xfe760000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO3>, <&cru DBCLK_GPIO3>; @@ -1847,7 +1847,7 @@ }; gpio4: gpio@fe770000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3568-gpio-bank"; reg = <0x0 0xfe770000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO4>, <&cru DBCLK_GPIO4>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 005cde61b..adfb0dbbe 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -1639,7 +1639,7 @@ #size-cells = <2>; gpio0: gpio@fd8a0000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3588-gpio-bank"; reg = <0x0 0xfd8a0000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO0>, <&cru DBCLK_GPIO0>; @@ -1651,7 +1651,7 @@ }; gpio1: gpio@fec20000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3588-gpio-bank"; reg = <0x0 0xfec20000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO1>, <&cru DBCLK_GPIO1>; @@ -1663,7 +1663,7 @@ }; gpio2: gpio@fec30000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3588-gpio-bank"; reg = <0x0 0xfec30000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO2>, <&cru DBCLK_GPIO2>; @@ -1675,7 +1675,7 @@ }; gpio3: gpio@fec40000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3588-gpio-bank"; reg = <0x0 0xfec40000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO3>, <&cru DBCLK_GPIO3>; @@ -1687,7 +1687,7 @@ }; gpio4: gpio@fec50000 { - compatible = "rockchip,gpio-bank"; + compatible = "rockchip,rk3588-gpio-bank"; reg = <0x0 0xfec50000 0x0 0x100>; interrupts = ; clocks = <&cru PCLK_GPIO4>, <&cru DBCLK_GPIO4>;