From patchwork Wed Apr 2 20:48:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 14036468 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 DC014C36018 for ; Wed, 2 Apr 2025 20:51:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Uzga02gahQxraS2M+4bHTPzRSV1Qy0HHYmWPiH16T9o=; b=XsJgE8C0C4e1Om14XCRq69mhlr Kt7knY5fBMO0G1H1CF+DWqPx6JGq7nY0azBAF7Mf2Q0WEpNKLo2FeTJgTslYXy2W4HT06igLVdVci P9LLL8dlaxQm8YC/CosepreuSECtLlp+nUJDkUA5QUUY2B/BHpdyYndedDSYHBvR1j1Ts/uQs0d43 xUC1HxyOne4ATKJnxj34M0GW6kEGd8kmxaYAtWgv+Gf6dzEzuG0743YYySdB0rxUvGIQ97Hxg6QEf eHbt9UQHssgAHNuEJs88HDeMRSKrE9IE/djoJ0KzphgLrxJSTRfsoOICRoTDQK4qHVwp17Aq/I30y Y8hSSD1Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u0533-00000007B3G-3jKV; Wed, 02 Apr 2025 20:50:57 +0000 Received: from zeus03.de ([194.117.254.33] helo=mail.zeus03.de) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u051H-00000007Aq8-2CPF for linux-arm-kernel@lists.infradead.org; Wed, 02 Apr 2025 20:49:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=Uzga02gahQxraS2M+4bHTPzRSV1Qy0HHYmWPiH16T9o=; b=cSH2Pf cJ4Ib1+KODs94a6JqGeqS1ALQq1MDEU7tYDZxXO3l3Ty5AhxwRclQrXgyJMNn/+V Lx/U/GaXJqLSjpPHQgUFd+4h5JiYgc+LIng/cmlbWW21X854lFTPu3lpHb/lFBZs Akq1nxUSw0omIOMLQsiMSvWVCTBUkMNSAgs4I7PrjFdOlqMkhW1/OIQhhQovpoW9 55rQeCicHZpJXzQUWZaJNIMdMO2RlxuOgzKLnpkC9Lcfb9/TP+Di8Bj0los2P72t /lFUsiBfKsRIhnnHt27NwEU5OdTE+gPpstdAt/jcFVwRSH60dd9ksbOqM4jBRpJ/ 0VUjjyeq70nTopOw== Received: (qmail 2132837 invoked from network); 2 Apr 2025 22:49:00 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 2 Apr 2025 22:49:00 +0200 X-UD-Smtp-Session: l3s3148p1@bJ5lyNExoLwujnsv From: Wolfram Sang To: linux-arm-kernel@lists.infradead.org Cc: Wolfram Sang , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org Subject: [PATCH 1/4] ARM: dts: at91: calao_usb: simplify memory node Date: Wed, 2 Apr 2025 22:48:51 +0200 Message-ID: <20250402204856.5197-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250402204856.5197-1-wsa+renesas@sang-engineering.com> References: <20250402204856.5197-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250402_134908_412223_E7C859D6 X-CRM114-Status: GOOD ( 10.96 ) 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 All devices have 64MB RAM. So, the memory node can bet put into the most generic DTSI. Signed-off-by: Wolfram Sang --- arch/arm/boot/dts/microchip/usb_a9260.dts | 4 ---- arch/arm/boot/dts/microchip/usb_a9260_common.dtsi | 4 ++++ arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/microchip/usb_a9260.dts b/arch/arm/boot/dts/microchip/usb_a9260.dts index e7f7b259ccf3..de19904e9e91 100644 --- a/arch/arm/boot/dts/microchip/usb_a9260.dts +++ b/arch/arm/boot/dts/microchip/usb_a9260.dts @@ -16,10 +16,6 @@ chosen { bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs"; }; - memory@20000000 { - reg = <0x20000000 0x4000000>; - }; - ahb { apb { shdwc: poweroff@fffffd10 { diff --git a/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi b/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi index 8c3530638c6d..b094c31033b5 100644 --- a/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi +++ b/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi @@ -16,6 +16,10 @@ main_xtal { }; }; + memory@20000000 { + reg = <0x20000000 0x4000000>; + }; + ahb { apb { dbgu: serial@fffff200 { diff --git a/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi b/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi index f1946e0996b7..b11ad0b29026 100644 --- a/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi +++ b/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi @@ -14,10 +14,6 @@ chosen { stdout-path = "serial0:115200n8"; }; - memory@20000000 { - reg = <0x20000000 0x4000000>; - }; - i2c-gpio-0 { rtc@56 { compatible = "microcrystal,rv3029"; From patchwork Wed Apr 2 20:48:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 14036472 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 30C89C36018 for ; Wed, 2 Apr 2025 20:56:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=CZC9VvPKRVEBlgzTsa7Oy41sSlv/BAQxlmUs8nA5twA=; b=IuRUjF3d77u2bPkDBY9KLEXdOy HT3N0ZKR264NX0KNrR5roIqP/dEWY8YP9L3XgDAgevasSlJTTQCMdPxthb9S+waiKPxoFkBOEcUNP xDDkwEbT1NYw/VeMohMb5H7HdNVGvYCi9yG1LhpkLv9sjqmD6e/HH8fscUGuyN9UCF4ApSd3bUm1U 01qwlPpgXL2l9M59cBomKpnXlh/U7Rbo4nlGDTUoN/vCmeisCKTaL7viVP6Ox42W/fbkPDhoGA0YI eTIFiBwPNmPPI4PIPqH5t5jfsSjVSRgaxr4RkU0UOBZfVNQuMwYn1l8HoMIW1eeFkOfNoDYN+ddXo 6P/n4wOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u058D-00000007BVs-43Fo; Wed, 02 Apr 2025 20:56:17 +0000 Received: from zeus03.de ([194.117.254.33] helo=mail.zeus03.de) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u051I-00000007AqF-1rmo for linux-arm-kernel@lists.infradead.org; Wed, 02 Apr 2025 20:49:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=CZC9VvPKRVEBlgzTsa7Oy41sSlv/BAQxlmUs8nA5twA=; b=EBzVnq Np3ujT6NMLvhJAyLG5/OCXlfpoRkrB60vdgSCVlndbpHBId3OpyjnrBDHDSi0Jxt OR/bZqNrStefxnvpnLSZ4oREwRP/poZ/8w5JByoqfAfgkQixpYd4lryPH+svleHs hwfBpcf/wdL3LcHyY8yakGodl6oD5VddgK7Kr6AtZ5ZnG3tU6qIxIUq5kheVYLYX D4aY0GuG5HvOVtYfbAyU+iGp9YgcVTaf2Qmpkr2Y9+J3CypoKB+QTpohgCUoYeHU WNGSGm4viqivjOq3LuOg0uKTyBSsiMtlIrBTOvypXY60tl4t1lN/o/dr2WWBUSOx NLUsfQhf9Q7rfWfw== Received: (qmail 2132881 invoked from network); 2 Apr 2025 22:49:01 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 2 Apr 2025 22:49:01 +0200 X-UD-Smtp-Session: l3s3148p1@w0RzyNExsLwujnsv From: Wolfram Sang To: linux-arm-kernel@lists.infradead.org Cc: Wolfram Sang , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org Subject: [PATCH 2/4] ARM: dts: at91: usb_a9260: use 'stdout-path' Date: Wed, 2 Apr 2025 22:48:52 +0200 Message-ID: <20250402204856.5197-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250402204856.5197-1-wsa+renesas@sang-engineering.com> References: <20250402204856.5197-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250402_134908_768473_98F0C090 X-CRM114-Status: GOOD ( 10.70 ) 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 Do not use the kernel command line for specifying the default serial console. Signed-off-by: Wolfram Sang --- arch/arm/boot/dts/microchip/usb_a9260.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/microchip/usb_a9260.dts b/arch/arm/boot/dts/microchip/usb_a9260.dts index de19904e9e91..1de2864b4cf6 100644 --- a/arch/arm/boot/dts/microchip/usb_a9260.dts +++ b/arch/arm/boot/dts/microchip/usb_a9260.dts @@ -13,7 +13,8 @@ / { compatible = "calao,usb-a9260", "atmel,at91sam9260", "atmel,at91sam9"; chosen { - bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs"; + bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs"; + stdout-path = "serial0:115200n8"; }; ahb { From patchwork Wed Apr 2 20:48:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 14036471 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 00E82C36018 for ; Wed, 2 Apr 2025 20:54:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=miiQgbVc/Fy7PZMHYxtwsXXU5MxHGcWvgj0JliIHdAo=; b=fLEl7l9hzRlZMU5ldsFzoumFrV FtE1qPq8dIFbKdjhbwdo8r6d3M4fbr1tgOvcaCRwsgIkNG/NvhIWStuv9SkupEk3fdsRSthvQaP0s L49tk87yCok61T+ruuEhonNnDpsZPojnlRFDjbd2YXnYSo27K6oOMVirBYqlT1GJ/zApnAnt3LIUu IhFqyTWcSjF7jdGkkPP2q0+whImxWEcUvmzTisJVLNsfFu9tNBFDoPJ642A5pHOUjPEQrORRZkaAs KqFYkroI4imU4q/y9GDd51wF3m0xXi5fp0v93styrhW/uDl+23Q+ZNyXIidLFRLpRWLz1Ymnbe7Ys H+AJOUNg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u056V-00000007BLf-1HJy; Wed, 02 Apr 2025 20:54:31 +0000 Received: from zeus03.de ([194.117.254.33] helo=mail.zeus03.de) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u051H-00000007AqG-2IrA for linux-arm-kernel@lists.infradead.org; Wed, 02 Apr 2025 20:49:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=miiQgbVc/Fy7PZMHYxtwsXXU5MxHGcWvgj0JliIHdAo=; b=bO4D2h n9CaRrILrppllC2U/zyLB6fq86N7gzmo2KWTwPtyRVcp9pnT3YXxPh3NQg88qQO6 sLQXMLmMwHU9zvkGBTVOo3bP7vw/Ey45ewDtXTbaLH1USNo3UOVrkFFPE0gojTIo L8Z9tS/Ca7Fq9fuqx3TNMSpPSOPoT9Vn0qz1FcPfjQWLXaUlWZbhH7Z06OzxA/2M JflW43kHkgS97c0k57ntYcPSW4dwg6lg/H5uxTSsPJOg4J13DrdCK4V76Cp1tfXX AC47PIDc2e2Bs99Dx/iO0eHLFqe5vLzWDYImz9tIQEfDttgK30D1ihU4gR9Ik6hJ jcuq7RCJUabKLVpA== Received: (qmail 2132930 invoked from network); 2 Apr 2025 22:49:02 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 2 Apr 2025 22:49:02 +0200 X-UD-Smtp-Session: l3s3148p1@hnmGyNExuLwujnsv From: Wolfram Sang To: linux-arm-kernel@lists.infradead.org Cc: Wolfram Sang , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org Subject: [PATCH 3/4] ARM: dts: at91: calao_usb: simplify chosen node Date: Wed, 2 Apr 2025 22:48:53 +0200 Message-ID: <20250402204856.5197-4-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250402204856.5197-1-wsa+renesas@sang-engineering.com> References: <20250402204856.5197-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250402_134908_413458_BE32A0B2 X-CRM114-Status: GOOD ( 11.15 ) 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 All devices use equal parameters in 'chosen'. So, the memory node can bet put into the most generic DTSI. Signed-off-by: Wolfram Sang --- arch/arm/boot/dts/microchip/usb_a9260.dts | 5 ----- arch/arm/boot/dts/microchip/usb_a9260_common.dtsi | 5 +++++ arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/microchip/usb_a9260.dts b/arch/arm/boot/dts/microchip/usb_a9260.dts index 1de2864b4cf6..3b61e7145060 100644 --- a/arch/arm/boot/dts/microchip/usb_a9260.dts +++ b/arch/arm/boot/dts/microchip/usb_a9260.dts @@ -12,11 +12,6 @@ / { model = "Calao USB A9260"; compatible = "calao,usb-a9260", "atmel,at91sam9260", "atmel,at91sam9"; - chosen { - bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs"; - stdout-path = "serial0:115200n8"; - }; - ahb { apb { shdwc: poweroff@fffffd10 { diff --git a/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi b/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi index b094c31033b5..da32c5fdcc47 100644 --- a/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi +++ b/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi @@ -6,6 +6,11 @@ */ / { + chosen { + bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs"; + stdout-path = "serial0:115200n8"; + }; + clocks { slow_xtal { clock-frequency = <32768>; diff --git a/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi b/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi index b11ad0b29026..6bc307c91d65 100644 --- a/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi +++ b/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi @@ -9,11 +9,6 @@ #include "usb_a9260_common.dtsi" / { - chosen { - bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs"; - stdout-path = "serial0:115200n8"; - }; - i2c-gpio-0 { rtc@56 { compatible = "microcrystal,rv3029"; From patchwork Wed Apr 2 20:48:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 14036473 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 6A007C36018 for ; Wed, 2 Apr 2025 20:58:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=SRirtoVTMfeN0wRj4jAqh+TanwneimSbjL8xhCx/W9k=; b=ghee/OE32uZlk4qTbGARMeY8uc KO7oI2y9MPgOTN0RdW+zIGCF1IyZKjhd95lz9CRJAZtda2JkyBfC/e9PGUNFdWVXELGHS4H4nJsuV pZb+SKkw3VEpicB1f3uDhFeBdh1PEFOx6DYVKTuSOzfVE9ddOZ15OYIyVXQu4Vlcoa16kK8riw8+v 94CRmpLdENx9RZ+GK9PYVV+gn0Snj1EU3X7YjjhjzybgkJRUtYKTY6B+zjAy89djKA6YCKRkGLIKA QbeIqHGFnCqEKKy3HrChzpAZlePGfY2DyaLgZ69RF1Uj/NIH5/e7OudhGLzScEGP3tJkOqZ/bwIZH S6glprBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u059w-00000007Bkj-32TX; Wed, 02 Apr 2025 20:58:04 +0000 Received: from zeus03.de ([194.117.254.33] helo=mail.zeus03.de) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u051K-00000007ArE-0ckK for linux-arm-kernel@lists.infradead.org; Wed, 02 Apr 2025 20:49:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=SRirtoVTMfeN0wRj4jAqh+TanwneimSbjL8xhCx/W9k=; b=hCXW25 Vk44beEORpdGugC+9CFWPwy7kLibtxamDrsndsWHNWDhyubDLZNZE91wDEYAxIsF tyhseuLfvHsseL8Ncd7j6ngsHymPA6wiQJBFNPUDUZ7G/CNwuDkTyRUvipEB+lg7 K+3OCj3N4epfObCWVF2WHYN7ioLRg+UCz53RdwRYjHzYWNTvkjCVmF9+4ur0WEyn RpLkm43HalZ0V+AS1qYA4ss5m9imEY3EOKWJ97cFEI6JJNpBkBUTo+dH+S/Lzfd1 lLVh+idcIq4b7Dty1se4JoGsF/DGicgNraH3FJe16DsNNtl9z8cnubmsKNZo1wf2 NOVGUkjZjbidRajA== Received: (qmail 2132961 invoked from network); 2 Apr 2025 22:49:03 +0200 Received: by mail.zeus03.de with UTF8SMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 2 Apr 2025 22:49:03 +0200 X-UD-Smtp-Session: l3s3148p1@54GYyNExurwujnsv From: Wolfram Sang To: linux-arm-kernel@lists.infradead.org Cc: Wolfram Sang , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org Subject: [PATCH 4/4] ARM: dts: at91: usb_a9g20: move wrong RTC node Date: Wed, 2 Apr 2025 22:48:54 +0200 Message-ID: <20250402204856.5197-5-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250402204856.5197-1-wsa+renesas@sang-engineering.com> References: <20250402204856.5197-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250402_134910_460469_395D9530 X-CRM114-Status: GOOD ( 12.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 Only the LPW variant has the external RTC. Move it to that board specific DT. As a result, the common include for A9G20 boards can go now. Signed-off-by: Wolfram Sang --- arch/arm/boot/dts/microchip/usb_a9g20.dts | 3 ++- .../boot/dts/microchip/usb_a9g20_common.dtsi | 18 ------------------ arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts | 10 +++++++++- 3 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi diff --git a/arch/arm/boot/dts/microchip/usb_a9g20.dts b/arch/arm/boot/dts/microchip/usb_a9g20.dts index a2f748141d4b..bdaf35c6526e 100644 --- a/arch/arm/boot/dts/microchip/usb_a9g20.dts +++ b/arch/arm/boot/dts/microchip/usb_a9g20.dts @@ -5,7 +5,8 @@ * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD */ /dts-v1/; -#include "usb_a9g20_common.dtsi" +#include "at91sam9g20.dtsi" +#include "usb_a9260_common.dtsi" / { model = "Calao USB A9G20"; diff --git a/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi b/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi deleted file mode 100644 index 6bc307c91d65..000000000000 --- a/arch/arm/boot/dts/microchip/usb_a9g20_common.dtsi +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * usb_a9g20.dts - Device Tree file for Calao USB A9G20 board - * - * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD - */ - -#include "at91sam9g20.dtsi" -#include "usb_a9260_common.dtsi" - -/ { - i2c-gpio-0 { - rtc@56 { - compatible = "microcrystal,rv3029"; - reg = <0x56>; - }; - }; -}; diff --git a/arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts b/arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts index 4d104797176c..2eda00477bc5 100644 --- a/arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts +++ b/arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts @@ -5,7 +5,8 @@ * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD */ /dts-v1/; -#include "usb_a9g20_common.dtsi" +#include "at91sam9g20.dtsi" +#include "usb_a9260_common.dtsi" / { model = "Calao USB A9G20 Low Power"; @@ -27,4 +28,11 @@ mmc@0 { }; }; }; + + i2c-gpio-0 { + rtc@56 { + compatible = "microcrystal,rv3029"; + reg = <0x56>; + }; + }; };