Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / arch / arm / boot / dts / wm8850.dtsi

diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi
index fc790d0aee66e6399865802adc49bfe58fd9af71..d98386dd2882500bd71ecf726d8ac9bb26b777a7 100644 (file)
--- a/arch/arm/boot/dts/wm8850.dtsi
+++ b/arch/arm/boot/dts/wm8850.dtsi
@@ -11,6 +11,17 @@
 / {
        compatible = "wm,wm8850";
 
+       cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               cpu@0 {
+                       device_type = "cpu";
+                       compatible = "arm,cortex-a9";
+                       reg = <0x0>;
+               };
+       };
+
        aliases {
                serial0 = &uart0;
                serial1 = &uart1;
@@ -72,18 +83,81 @@
 
                                plla: plla {
                                        #clock-cells = <0>;
-                                       compatible = "wm,wm8750-pll-clock";
-                                       clocks = <&ref25>;
+                                       compatible = "wm,wm8850-pll-clock";
+                                       clocks = <&ref24>;
                                        reg = <0x200>;
                                };
 
                                pllb: pllb {
                                        #clock-cells = <0>;
-                                       compatible = "wm,wm8750-pll-clock";
-                                       clocks = <&ref25>;
+                                       compatible = "wm,wm8850-pll-clock";
+                                       clocks = <&ref24>;
                                        reg = <0x204>;
                                };
 
+                               pllc: pllc {
+                                       #clock-cells = <0>;
+                                       compatible = "wm,wm8850-pll-clock";
+                                       clocks = <&ref24>;
+                                       reg = <0x208>;
+                               };
+
+                               plld: plld {
+                                       #clock-cells = <0>;
+                                       compatible = "wm,wm8850-pll-clock";
+                                       clocks = <&ref24>;
+                                       reg = <0x20c>;
+                               };
+
+                               plle: plle {
+                                       #clock-cells = <0>;
+                                       compatible = "wm,wm8850-pll-clock";
+                                       clocks = <&ref24>;
+                                       reg = <0x210>;
+                               };
+
+                               pllf: pllf {
+                                       #clock-cells = <0>;
+                                       compatible = "wm,wm8850-pll-clock";
+                                       clocks = <&ref24>;
+                                       reg = <0x214>;
+                               };
+
+                               pllg: pllg {
+                                       #clock-cells = <0>;
+                                       compatible = "wm,wm8850-pll-clock";
+                                       clocks = <&ref24>;
+                                       reg = <0x218>;
+                               };
+
+                               clkarm: arm {
+                                       #clock-cells = <0>;
+                                       compatible = "via,vt8500-device-clock";
+                                       clocks = <&plla>;
+                                       divisor-reg = <0x300>;
+                               };
+
+                               clkahb: ahb {
+                                       #clock-cells = <0>;
+                                       compatible = "via,vt8500-device-clock";
+                                       clocks = <&pllb>;
+                                       divisor-reg = <0x304>;
+                               };
+
+                               clkapb: apb {
+                                       #clock-cells = <0>;
+                                       compatible = "via,vt8500-device-clock";
+                                       clocks = <&pllb>;
+                                       divisor-reg = <0x320>;
+                               };
+
+                               clkddr: ddr {
+                                       #clock-cells = <0>;
+                                       compatible = "via,vt8500-device-clock";
+                                       clocks = <&plld>;
+                                       divisor-reg = <0x310>;
+                               };
+
                                clkuart0: uart0 {
                                        #clock-cells = <0>;
                                        compatible = "via,vt8500-device-clock";
@@ -178,32 +252,36 @@
                        interrupts = <26>;
                };
 
-               uart0: uart@d8200000 {
+               uart0: serial@d8200000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd8200000 0x1040>;
                        interrupts = <32>;
                        clocks = <&clkuart0>;
+                       status = "disabled";
                };
 
-               uart1: uart@d82b0000 {
+               uart1: serial@d82b0000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd82b0000 0x1040>;
                        interrupts = <33>;
                        clocks = <&clkuart1>;
+                       status = "disabled";
                };
 
-                uart2: uart@d8210000 {
+                uart2: serial@d8210000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd8210000 0x1040>;
                         interrupts = <47>;
                         clocks = <&clkuart2>;
+                       status = "disabled";
                 };
 
-                uart3: uart@d82c0000 {
+                uart3: serial@d82c0000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd82c0000 0x1040>;
                         interrupts = <50>;
                         clocks = <&clkuart3>;
+                       status = "disabled";
                 };
 
                rtc@d8100000 {