From patchwork Sat Nov 27 12:09:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 12693823 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A2082C433F5 for ; Sat, 27 Nov 2021 12:11:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=fb1DsmtomO2cmO9E/K2Ge1H1gph7qlROohIrdmsrZHo=; b=kZWfeOhoH5VwGX TiJB8m2mswmA9ilbJyKRVgy5AQ5kpl2n6z5mUORtaZAHvhcfBmK7PolnfQxqKUY4hTx9CPWf9eTs5 UufOCEAGe/xwdvJ1w1UhQJFfuOhpAtxYs7UpYHK2Zw4RJ9fQNP5YEhhQ6/wdKguJ37L3WHmro1s2g k4b59RGR1eL2BGqOG0vXkjGo0X+0VcvOvEJls56otDC1Nw7RQBlxJPG5K/fC1Y+f05NqScTM51BHk 5Sb8yVB+4wdMYtGV7fHISHIToGiVwN+NRM/SrH0z4HLr+4PI5VDLrkup1qYnJ6nXYJHIITl5yYUfg 9mjbzjp6UHkY9RVAmVew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqwXB-00DYNq-7s; Sat, 27 Nov 2021 12:10:25 +0000 Received: from mout.kundenserver.de ([212.227.126.131]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqwX7-00DYN3-G5 for linux-arm-kernel@lists.infradead.org; Sat, 27 Nov 2021 12:10:23 +0000 Received: from localhost.localdomain ([37.4.249.122]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MwQCb-1mavoj1X5J-00sKXL; Sat, 27 Nov 2021 13:10:16 +0100 From: Stefan Wahren To: Rob Herring , Florian Fainelli , Nicolas Saenz Julienne Cc: bcm-kernel-feedback-list@broadcom.com, Phil Elwell , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren Subject: [PATCH] ARM: dts: bcm2711-rpi-400: Fix GPIO expander labels Date: Sat, 27 Nov 2021 13:09:42 +0100 Message-Id: <1638014982-4878-1-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 X-Provags-ID: V03:K1:uQqM6d0BB68FYa0lHKhX0wIPpb69pYOP8KFWBf5nyTLHPnjr3ub zb9NlnUo/y0IDGvsSbGYbqqr1bH1LJh/AjtXXxQTDIvl3G8XC0NXEMG13kg3XmGAwOPatfY rL04e6GAKIG00pq3P22em0fYUjnMgdPQ/ic3N4mvsOVyNl3e0JK3k/DaFutxsrisnR8sBUH 82Rv5+wix/bSMk2hKZEMw== X-UI-Out-Filterresults: notjunk:1;V03:K0:rCMYXyRFLXk=:R4mbl6ScX9HiXXP9HIGtEG wsr/JX4qOu0IaVCl3JqylL9ivA6RzMdlkeBEja2s3774PLKaTzOoU5j+AcB9bMlWCXRunf6ku GgfbqZrMBM8vV/XbQuBOVxmsp6+7y/7wZWMsftzSmUG8xgqkMxuN9uK8B6P3OZ1tURF/0tgKa dWmunYcC+vam0lnclTTOK6GKploCalz8b7a1L89q0SI3vRH5gCcVCGjlC3RkEYDO/qZSj1pxD SDTt0am/3s2ZJxnPBx4OEdn6Sahz6/W4UykEJuquYrD3p6vY9yLihEt9IL6F9pC4nkpvZGmqg jT9Pwp+G0EikWHgcg25t95fcjU5flEk8HwoNtxplH1c4uTJ2RPgvXZV/ALSIxhcHkZrgVWByF zuiTEpSmAR7BMycKsgeApA/WnYRF9EoRY8OtDJTvgI6NTqa05bu35vZ6MCcVGwnGrMZXL9cUX r8RXBcbM3ajugK4o9v+jgHKPJ2Qwh7T1om0jZO/cawdoCzLxfzqn89uv4vOWwWF+Ibc/WPkSj hK7nrTvgLO5WzZRALd4VF/KRPL34YwSS/5PmhyE314PjLUXVzwLkNc0RP73nOoe/9qSH0EzFG /mk/Z6YVldqiRg0BYQlhzQOReQGXyZw4qkUwb1TOa9wRdq6k0DOuZBGFZkwCmIXSUlQcM9Yzz xUCcANieiVUm0KosF/cj0h3MvMiFzlNABAz33CEyg8HJnvZFegWq2mgbt4LyigMXS82eOknCu npAqRo/aHIp+OUpJ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211127_041021_852425_E9088A5D X-CRM114-Status: GOOD ( 11.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Phil Elwell Recently 2 labels of the RPi 400 GPIO expander has been fixed in the vendor tree. So upstream this change to be in sync. Fixes: 1c701accecf2 ("ARM: dts: Add Raspberry Pi 400 support") Signed-off-by: Phil Elwell Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts index f4d2fc2..82c5ea1 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts @@ -31,9 +31,9 @@ "", "GLOBAL_RESET", "VDD_SD_IO_SEL", - "CAM_GPIO", + "GLOBAL_SHUTDOWN", "SD_PWR_ON", - "SD_OC_N"; + "SHUTDOWN_REQUEST"; }; &genet_mdio {