projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/usb-validation' into for-next
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
bcm23550.dtsi
diff --git
a/arch/arm/boot/dts/bcm23550.dtsi
b/arch/arm/boot/dts/bcm23550.dtsi
index
701198f
..
a36c9b1
100644
(file)
--- a/
arch/arm/boot/dts/bcm23550.dtsi
+++ b/
arch/arm/boot/dts/bcm23550.dtsi
@@
-371,21
+371,21
@@
clock-frequency = <156000000>;
};
clock-frequency = <156000000>;
};
- root_ccu: root_ccu {
+ root_ccu: root_ccu
@35001000
{
compatible = BCM21664_DT_ROOT_CCU_COMPAT;
reg = <0x35001000 0x0f00>;
#clock-cells = <1>;
clock-output-names = "frac_1m";
};
compatible = BCM21664_DT_ROOT_CCU_COMPAT;
reg = <0x35001000 0x0f00>;
#clock-cells = <1>;
clock-output-names = "frac_1m";
};
- aon_ccu: aon_ccu {
+ aon_ccu: aon_ccu
@35002000
{
compatible = BCM21664_DT_AON_CCU_COMPAT;
reg = <0x35002000 0x0f00>;
#clock-cells = <1>;
clock-output-names = "hub_timer";
};
compatible = BCM21664_DT_AON_CCU_COMPAT;
reg = <0x35002000 0x0f00>;
#clock-cells = <1>;
clock-output-names = "hub_timer";
};
- slave_ccu: slave_ccu {
+ slave_ccu: slave_ccu
@3e011000
{
compatible = BCM21664_DT_SLAVE_CCU_COMPAT;
reg = <0x3e011000 0x0f00>;
#clock-cells = <1>;
compatible = BCM21664_DT_SLAVE_CCU_COMPAT;
reg = <0x3e011000 0x0f00>;
#clock-cells = <1>;
@@
-398,7
+398,7
@@
"bsc4";
};
"bsc4";
};
- master_ccu: master_ccu {
+ master_ccu: master_ccu
@3f001000
{
compatible = BCM21664_DT_MASTER_CCU_COMPAT;
reg = <0x3f001000 0x0f00>;
#clock-cells = <1>;
compatible = BCM21664_DT_MASTER_CCU_COMPAT;
reg = <0x3f001000 0x0f00>;
#clock-cells = <1>;