summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/bcm2835.dtsi
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2013-01-15 05:07:20 +0100
committerStephen Warren <swarren@wwwdotorg.org>2013-01-15 05:47:09 +0100
commit9692c191ffffbd5255bec222b8f0f2854932a408 (patch)
tree5f4b148adcfb5e16fd263a9698a5e5e19213fb0d /arch/arm/boot/dts/bcm2835.dtsi
parentARM: bcm2835: add I2C controllers to DT (diff)
downloadlinux-9692c191ffffbd5255bec222b8f0f2854932a408.tar.xz
linux-9692c191ffffbd5255bec222b8f0f2854932a408.zip
ARM: bcm2835: fix clock node aliasing in device tree
Both clock nodes in the current device tree are named "clock" and hence end up being the same node. Rename the nodes to different names to avoid this. In fact, fixed-clock uses the node name as the clock name, so name the nodes after the clock they represent. Move the clocks into a "clocks" sub-node to group them and avoid any possible naming conflicts with other nodes also named after the device type. Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'arch/arm/boot/dts/bcm2835.dtsi')
-rw-r--r--arch/arm/boot/dts/bcm2835.dtsi26
1 files changed, 17 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index c69a591631b8..4bf2a8774aa7 100644
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -89,15 +89,23 @@
};
};
- clk_i2c: clock {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <150000000>;
- };
+ clocks {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <0>;
- clk_mmc: clock {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <100000000>;
+ clk_mmc: mmc {
+ compatible = "fixed-clock";
+ reg = <0>;
+ #clock-cells = <0>;
+ clock-frequency = <100000000>;
+ };
+
+ clk_i2c: i2c {
+ compatible = "fixed-clock";
+ reg = <1>;
+ #clock-cells = <0>;
+ clock-frequency = <150000000>;
+ };
};
};