* [PATCH 1/2] ARM: bcm2835: fix DT node sort order
@ 2014-02-12 5:03 Stephen Warren
2014-02-12 5:03 ` [PATCH 2/2] ARM: bcm2835: add unit address to all nodes w/ reg prop Stephen Warren
2014-02-12 5:05 ` [PATCH 1/2] ARM: bcm2835: fix DT node sort order Stephen Warren
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Warren @ 2014-02-12 5:03 UTC (permalink / raw)
To: linux-arm-kernel
Re-order all the DT nodes so that they're ordered by their reg address.
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
---
arch/arm/boot/dts/bcm2835.dtsi | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index 398eac3..5ceba45 100644
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -60,14 +60,6 @@
reg = <0x7e104000 0x10>;
};
- uart at 20201000 {
- compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
- reg = <0x7e201000 0x1000>;
- interrupts = <2 25>;
- clock-frequency = <3000000>;
- arm,primecell-periphid = <0x00241011>;
- };
-
gpio: gpio {
compatible = "brcm,bcm2835-gpio";
reg = <0x7e200000 0xb4>;
@@ -91,6 +83,14 @@
#interrupt-cells = <2>;
};
+ uart at 20201000 {
+ compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
+ reg = <0x7e201000 0x1000>;
+ interrupts = <2 25>;
+ clock-frequency = <3000000>;
+ arm,primecell-periphid = <0x00241011>;
+ };
+
i2s: i2s at 7e203000 {
compatible = "brcm,bcm2835-i2s";
reg = <0x7e203000 0x20>,
@@ -121,6 +121,14 @@
status = "disabled";
};
+ sdhci: sdhci {
+ compatible = "brcm,bcm2835-sdhci";
+ reg = <0x7e300000 0x100>;
+ interrupts = <2 30>;
+ clocks = <&clk_mmc>;
+ status = "disabled";
+ };
+
i2c1: i2c at 20804000 {
compatible = "brcm,bcm2835-i2c";
reg = <0x7e804000 0x1000>;
@@ -131,14 +139,6 @@
status = "disabled";
};
- sdhci: sdhci {
- compatible = "brcm,bcm2835-sdhci";
- reg = <0x7e300000 0x100>;
- interrupts = <2 30>;
- clocks = <&clk_mmc>;
- status = "disabled";
- };
-
usb {
compatible = "brcm,bcm2835-usb";
reg = <0x7e980000 0x10000>;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] ARM: bcm2835: add unit address to all nodes w/ reg prop
2014-02-12 5:03 [PATCH 1/2] ARM: bcm2835: fix DT node sort order Stephen Warren
@ 2014-02-12 5:03 ` Stephen Warren
2014-02-14 5:49 ` Stephen Warren
2014-02-12 5:05 ` [PATCH 1/2] ARM: bcm2835: fix DT node sort order Stephen Warren
1 sibling, 1 reply; 4+ messages in thread
From: Stephen Warren @ 2014-02-12 5:03 UTC (permalink / raw)
To: linux-arm-kernel
DT nodes that contain a reg property should include a unit address in
their name. Add the missing unit addresses.
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
---
arch/arm/boot/dts/bcm2835.dtsi | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index 5ceba45..9eadfb7 100644
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -15,7 +15,7 @@
#size-cells = <1>;
ranges = <0x7e000000 0x20000000 0x02000000>;
- timer {
+ timer at 7e003000 {
compatible = "brcm,bcm2835-system-timer";
reg = <0x7e003000 0x1000>;
interrupts = <1 0>, <1 1>, <1 2>, <1 3>;
@@ -43,24 +43,24 @@
brcm,dma-channel-mask = <0x7f35>;
};
- intc: interrupt-controller {
+ intc: interrupt-controller at 7e00b200 {
compatible = "brcm,bcm2835-armctrl-ic";
reg = <0x7e00b200 0x200>;
interrupt-controller;
#interrupt-cells = <2>;
};
- watchdog {
+ watchdog at 7e100000 {
compatible = "brcm,bcm2835-pm-wdt";
reg = <0x7e100000 0x28>;
};
- rng {
+ rng at 7e104000 {
compatible = "brcm,bcm2835-rng";
reg = <0x7e104000 0x10>;
};
- gpio: gpio {
+ gpio: gpio at 7e200000 {
compatible = "brcm,bcm2835-gpio";
reg = <0x7e200000 0xb4>;
/*
@@ -121,7 +121,7 @@
status = "disabled";
};
- sdhci: sdhci {
+ sdhci: sdhci at 7e300000 {
compatible = "brcm,bcm2835-sdhci";
reg = <0x7e300000 0x100>;
interrupts = <2 30>;
@@ -139,7 +139,7 @@
status = "disabled";
};
- usb {
+ usb at 7e980000 {
compatible = "brcm,bcm2835-usb";
reg = <0x7e980000 0x10000>;
interrupts = <1 9>;
@@ -155,21 +155,21 @@
#address-cells = <1>;
#size-cells = <0>;
- clk_mmc: mmc {
+ clk_mmc: clock at 0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <100000000>;
};
- clk_i2c: i2c {
+ clk_i2c: clock at 1 {
compatible = "fixed-clock";
reg = <1>;
#clock-cells = <0>;
clock-frequency = <250000000>;
};
- clk_spi: spi {
+ clk_spi: clock at 2 {
compatible = "fixed-clock";
reg = <2>;
#clock-cells = <0>;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 1/2] ARM: bcm2835: fix DT node sort order
2014-02-12 5:03 [PATCH 1/2] ARM: bcm2835: fix DT node sort order Stephen Warren
2014-02-12 5:03 ` [PATCH 2/2] ARM: bcm2835: add unit address to all nodes w/ reg prop Stephen Warren
@ 2014-02-12 5:05 ` Stephen Warren
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Warren @ 2014-02-12 5:05 UTC (permalink / raw)
To: linux-arm-kernel
On 02/11/2014 10:03 PM, Stephen Warren wrote:
> Re-order all the DT nodes so that they're ordered by their reg address.
I've applied this series to bcm2835's for-3.15/dt branch.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-14 5:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-12 5:03 [PATCH 1/2] ARM: bcm2835: fix DT node sort order Stephen Warren
2014-02-12 5:03 ` [PATCH 2/2] ARM: bcm2835: add unit address to all nodes w/ reg prop Stephen Warren
2014-02-14 5:49 ` Stephen Warren
2014-02-12 5:05 ` [PATCH 1/2] ARM: bcm2835: fix DT node sort order Stephen Warren
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.