From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v1 05/20] MIPS: dts: ath79: ar9331: use path references when extending nodes
Date: Fri, 17 Feb 2023 18:30:42 +0100 [thread overview]
Message-ID: <20230217173057.1839835-6-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20230217173057.1839835-1-a.fatoum@pengutronix.de>
LED heartbeat already broke, because upstream renamed the node name.
Fix that and let's use references, so we get errors if an upstream DT
update breaks our usage.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/mips/dts/ar9331-dptechnics-dpt-module.dts | 16 ++++++----------
arch/mips/dts/ar9331.dtsi | 12 +++++-------
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/arch/mips/dts/ar9331-dptechnics-dpt-module.dts b/arch/mips/dts/ar9331-dptechnics-dpt-module.dts
index 8a0ae9caf791..da19d7b88ee1 100644
--- a/arch/mips/dts/ar9331-dptechnics-dpt-module.dts
+++ b/arch/mips/dts/ar9331-dptechnics-dpt-module.dts
@@ -20,18 +20,14 @@
barebox,provide-mac-address = <ð0>;
};
};
+};
- leds {
- system {
- barebox,default-trigger = "heartbeat";
- };
- };
+&{/leds/led-0} {
+ barebox,default-trigger = "heartbeat";
+};
- gpio-keys {
- button@0 {
- gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
- };
- };
+&{/gpio-keys/button@0} {
+ gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
};
&spiflash {
diff --git a/arch/mips/dts/ar9331.dtsi b/arch/mips/dts/ar9331.dtsi
index 72f029754eab..20e4d64c040f 100644
--- a/arch/mips/dts/ar9331.dtsi
+++ b/arch/mips/dts/ar9331.dtsi
@@ -1,10 +1,8 @@
-/ {
- ahb {
- wdt0: wdt@18060008 {
- compatible = "qca,ar9331-wdt", "qca,ar9344-wdt";
- reg = <0x18060008 0x8>;
- clocks = <&pll ATH79_CLK_CPU>;
- };
+&{/ahb} {
+ wdt0: wdt@18060008 {
+ compatible = "qca,ar9331-wdt", "qca,ar9344-wdt";
+ reg = <0x18060008 0x8>;
+ clocks = <&pll ATH79_CLK_CPU>;
};
};
--
2.30.2
next prev parent reply other threads:[~2023-02-17 17:34 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-17 17:30 [PATCH v1 00/20] dts: avoid DT breakage new fancy DTC v1.7.0 syntax Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 01/20] scripts/dtc: Update to upstream version v1.7.0 Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 02/20] scripts/dtc: update-dts-source.sh: don't fail if libfdt/ exists Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 03/20] Documentation: devicetree: describe new label-relative-path syntax Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 04/20] ARM: dts: use DT labels instead of paths where possible Ahmad Fatoum
2023-02-17 17:30 ` Ahmad Fatoum [this message]
2023-02-22 10:25 ` [PATCH v1 05/20] MIPS: dts: ath79: ar9331: use path references when extending nodes Sascha Hauer
2023-02-17 17:30 ` [PATCH v1 06/20] ARM: dts: tegra: switch to path and label references Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 07/20] ARM: i.MX51: ccmx51: support newer device trees Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 08/20] ARM: i.MX6: gw54xx: rename watchdog nodes Ahmad Fatoum
2023-02-17 18:08 ` Jules Maselbas
2023-02-17 17:30 ` [PATCH v1 09/20] ARM: i.MX6: karo-tx6x: fix now renamed DT nodes Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 10/20] ARM: dts: zii: use phandle-relative paths for extending nodes Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 11/20] ARM: dts: AT91: use label-relative " Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 12/20] ARM: dts: Layerscape: drop unneeded EEPROM node overriding Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 13/20] ARM: dts: Layerscape: use label-relative paths references Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 14/20] ARM: dts: vf610-zii-cfu1: remove duplicate LED Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 15/20] ARM: dts: i.MX53: ccxmx53: remove unused /memory Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 16/20] ARM: dts: i.MX: use label-relative references Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 17/20] ARM: dts: i.MX: delete now renamed memory nodes as well Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 18/20] ARM: dts: socfpga: cut down on NAND node duplication Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 19/20] ARM: dts: i.MX8MN: evk: use upstream flash node definition Ahmad Fatoum
2023-02-17 17:30 ` [PATCH v1 20/20] ARM: dts: i.MX8MN: evk: reduce duplication in barebox-added nodes Ahmad Fatoum
2023-02-20 8:48 ` [PATCH v1 00/20] dts: avoid DT breakage new fancy DTC v1.7.0 syntax Marco Felsch
2023-02-20 8:51 ` Ahmad Fatoum
2023-02-21 10:25 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230217173057.1839835-6-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox