From patchwork Thu Nov 24 10:01:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jonathan_Neusch=C3=A4fer?= X-Patchwork-Id: 13054755 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 6FE4FC433FE for ; Thu, 24 Nov 2022 10:02:48 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=Ac/dRRTNqthvx6d2PlvIl3QLrghuYArZ1MRZmpfxyos=; b=OBskCh6NtAyISw RssBVEbX9t2SgC6ovul5iQTlvOeaBJzXomNnVMlJ0POQQG9mt0ps2GThrzJ7L3mIc6VkOv6S4wTAU UFP8IMZvwkaf4SJWZVpTkecOg4yvkbrtTnGksnCcUxP5WyVADaEmK+J4QlDrq6/jKPez7NfNoUEdg 6Rv2T0n+EVyQx81QCxn/4E2juOjwP90pc5SspXEGWxrPYo+8GZy6OUsip/KIavZ4fUoQLSfX4ApAR h+3f/UWRadf6zYJPonVs/CRpQDn2hfQW5SrdO3/4aLgvFgueBNxFOMkskqVxeG1rWdQyeJEe4b2Kr ZyVUVZZBsVHAeIsQ/iiA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oy936-007PiL-6M; Thu, 24 Nov 2022 10:01:41 +0000 Received: from mout.gmx.net ([212.227.17.22]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oy92y-007PbI-UY for linux-arm-kernel@lists.infradead.org; Thu, 24 Nov 2022 10:01:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1669284079; bh=/9FLyEj0n+MtWEUQoIkaa/u0bNRlgIDP3h/BXKUCiKE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=Vqt+iezXMd5oCrYIPMXCWThYVsfWSeR554qJKc0wqV2PVFpz0HTXb7MU1e/KvMiBL VbqTW3vqDYzy+aQNoDnoyNmB+DQQZhGCI5WWBwf7Wk5lGrkSe4AakFLbpz3aYX+GvD 9cZy9erDwlNKE6oDYgeGYOSqIgKu+WFKmQuffFBV+n4+sWNx8ZNqAWIgSJ14OG0XiR kVP30V1rer1ch9jr0XQlbtfg/7drmI9PRbmC79MO1ohKpb6eWH1Z6d9C9LgoVMXTbL +wWWGvBI0nA3DUZdd1yQuYPlHo44DdQyjdvSCx9PSnmqw7pW1Tx8O61VHoYzrT9uu5 NW3aMIWMwJeXQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from probook ([95.223.44.31]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M72sJ-1opeam0Oyt-008Wfq; Thu, 24 Nov 2022 11:01:19 +0100 From: =?utf-8?q?Jonathan_Neusch=C3=A4fer?= To: linux-arm-kernel@lists.infradead.org Cc: =?utf-8?q?Jonathan_Neusch=C3=A4fer?= , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: dts: pxa2xx: Don't mention &pwri2c where it doesn't exist Date: Thu, 24 Nov 2022 11:01:12 +0100 Message-Id: <20221124100112.4172513-1-j.neuschaefer@gmx.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:9Ot0OMkcsI4e0y6ae0wMYriPlY4QX5twMZ+8eHAvrmRPa6fXQ5l pAXyEmVKQUVRuQDTtyRDb2SfEmO6blPrZoX6wWhuDshJ23pbJ6eHEYCoxIdu4V4z8fEtnuU EvsL5++SjRPYehyaevrA9rvvRa7bOMyRVOyJx9DZGjSj9fMFqeYatd9LqlrZCtc8Kolym+8 3lvvU7PksHWdjOQqPgGDA== UI-OutboundReport: notjunk:1;M01:P0:OqxOPpzUce4=;OCZyzyIV20RALRJbTrwMFo0RsGw Xl2sv39ADMu48CYJzu1OorDysyDb16YAWCK7slqoh3/sVd3h5SNp9BOnzVCkrTyOdI0LHIb6/ k1LJFO0z7RGNJ0HdeNsRimasxCxkAeBES1aCZuwVzSZ6Kwp3LdMBE1wqhRGuOSsrElcHep4Gs lfuaJ+CBaji344vBBTSterseeGuZuaNJZZSUxJLSH+lQavyoVpzJYiTF4tQieIV7zz6T/qAhY vBFYt+haqK63O5sdf01U6m7qJ8FA3hmoME826bp4NxkcefyOkJy3qb0eqTWTzN6rVfz5y0UYh V/UzZ0erjcuTqNaCTIbprWpORNjSdjlKVUCs+zn5UE7aV208SMwdavMKRsMNtEvF3KFI7VX53 8fo5Znrrihyzu6PvyZrlJW5vtDEJ2QplrY9jjxyLT8yv3gyXidGY8HFbGG6tN0gTFE6e0H25P UPyORXtJfgXzjvF0n+qBXFtt3TTKEJbo2tWNvadvCKQYkP2RVmC5RnDNPpe+N+sbNXFXHXIfL AQjNOCYsq1V+v84hF8KvozcZVnY8tPXN4U8+rIw3zRK59qfY7MYysD3C/zph7Ymx+w6f3fZsS LVydhWLeWVAR2xxc4wYOALYzQogoeaD9Zt8d0IrD7pvzZFZQ4FYdcGpyLI+SLDm93M76VgJzk EgOcVPVoZb7Ma3k51Ge04jzd3WPcYjfz08LKDk61o/KRWRhfj0nl6rml0VpgCuTl1nzq3hfyc URZ3cM9ShFQx5FCpzbIYkeQ6PmgGcv0+6n3fOrliwUzxbR3RY94JY3gmt0ALKcAGKiWC3DvUY fPrJXMk7I1ulvWbdRmlyg2/8lBKdgzswLDkSRSQkq+C9DGjPk8Y5f+ggTmYUnR6NIyO7o4qqL cdAqbft3BlBmUyuaUuGiIihGdkuKezFvIpek5otseJxexOji9tiBLFUTR6r62evQjVvemgkgo UbXN3g== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221124_020133_301505_01DE2D3D X-CRM114-Status: GOOD ( 13.30 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The pwri2c node does not exist in all PXA2xx SoCs (specifically not in PXA25x), and thus isn't defined in pxa2xx.dtsi. It is, however, currently mentioned in /aliases, causing an error when building a devicetree that doesn't define it. Move the mention of &pwri2c in /aliases to the files that define it (pxa27x.dtsi and pxa3xx.dtsi), to avoid the error mentioned above. Signed-off-by: Jonathan Neuschäfer Acked-by: Robert Jarzmik --- arch/arm/boot/dts/pxa27x.dtsi | 5 +++++ arch/arm/boot/dts/pxa2xx.dtsi | 3 +-- arch/arm/boot/dts/pxa3xx.dtsi | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) -- 2.35.1 diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi index a2cbfb3be6090..1f217eceabbf7 100644 --- a/arch/arm/boot/dts/pxa27x.dtsi +++ b/arch/arm/boot/dts/pxa27x.dtsi @@ -7,6 +7,11 @@ / { model = "Marvell PXA27x familiy SoC"; compatible = "marvell,pxa27x"; + aliases { + i2c0 = &pwri2c; + i2c1 = &pxai2c1; + }; + pxabus { pdma: dma-controller@40000000 { compatible = "marvell,pdma-1.0"; diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi index 84154c43fe654..1332183f87456 100644 --- a/arch/arm/boot/dts/pxa2xx.dtsi +++ b/arch/arm/boot/dts/pxa2xx.dtsi @@ -38,8 +38,7 @@ aliases { serial1 = &btuart; serial2 = &stuart; serial3 = &hwuart; - i2c0 = &pwri2c; - i2c1 = &pxai2c1; + i2c0 = &pxai2c1; }; cpus { diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi index f9c216f918653..57ff0a63e9acd 100644 --- a/arch/arm/boot/dts/pxa3xx.dtsi +++ b/arch/arm/boot/dts/pxa3xx.dtsi @@ -117,6 +117,11 @@ / { model = "Marvell PXA3xx familiy SoC"; compatible = "marvell,pxa3xx"; + aliases { + i2c0 = &pwri2c; + i2c1 = &pxai2c1; + }; + pxabus { pdma: dma-controller@40000000 { compatible = "marvell,pdma-1.0";