Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[cascardo/linux.git] / arch / arm / boot / dts / omap24xx-clocks.dtsi
index 63965b8..ca73722 100644 (file)
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation.
  */
 &scm_clocks {
-       mcbsp1_mux_fck: mcbsp1_mux_fck {
+       mcbsp1_mux_fck: mcbsp1_mux_fck@4 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_96m_ck>, <&mcbsp_clks>;
@@ -22,7 +22,7 @@
                clocks = <&mcbsp1_gate_fck>, <&mcbsp1_mux_fck>;
        };
 
-       mcbsp2_mux_fck: mcbsp2_mux_fck {
+       mcbsp2_mux_fck: mcbsp2_mux_fck@4 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_96m_ck>, <&mcbsp_clks>;
@@ -74,7 +74,7 @@
                clock-frequency = <26000000>;
        };
 
-       aplls_clkin_ck: aplls_clkin_ck {
+       aplls_clkin_ck: aplls_clkin_ck@540 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&virt_19200000_ck>, <&virt_26m_ck>, <&virt_13m_ck>, <&virt_12m_ck>;
@@ -90,7 +90,7 @@
                clock-div = <1>;
        };
 
-       osc_ck: osc_ck {
+       osc_ck: osc_ck@60 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&aplls_clkin_ck>, <&aplls_clkin_x2_ck>;
@@ -99,7 +99,7 @@
                ti,index-starts-at-one;
        };
 
-       sys_ck: sys_ck {
+       sys_ck: sys_ck@60 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&osc_ck>;
                clock-frequency = <0x0>;
        };
 
-       dpll_ck: dpll_ck {
+       dpll_ck: dpll_ck@500 {
                #clock-cells = <0>;
                compatible = "ti,omap2-dpll-core-clock";
                clocks = <&sys_ck>, <&sys_ck>;
                reg = <0x0500>, <0x0540>;
        };
 
-       apll96_ck: apll96_ck {
+       apll96_ck: apll96_ck@500 {
                #clock-cells = <0>;
                compatible = "ti,omap2-apll-clock";
                clocks = <&sys_ck>;
                reg = <0x0500>, <0x0530>, <0x0520>;
        };
 
-       apll54_ck: apll54_ck {
+       apll54_ck: apll54_ck@500 {
                #clock-cells = <0>;
                compatible = "ti,omap2-apll-clock";
                clocks = <&sys_ck>;
                reg = <0x0500>, <0x0530>, <0x0520>;
        };
 
-       func_54m_ck: func_54m_ck {
+       func_54m_ck: func_54m_ck@540 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&apll54_ck>, <&alt_ck>;
                clock-div = <2>;
        };
 
-       func_48m_ck: func_48m_ck {
+       func_48m_ck: func_48m_ck@540 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&apll96_d2_ck>, <&alt_ck>;
                clock-div = <4>;
        };
 
-       sys_clkout_src_gate: sys_clkout_src_gate {
+       sys_clkout_src_gate: sys_clkout_src_gate@70 {
                #clock-cells = <0>;
                compatible = "ti,composite-no-wait-gate-clock";
                clocks = <&core_ck>;
                reg = <0x0070>;
        };
 
-       sys_clkout_src_mux: sys_clkout_src_mux {
+       sys_clkout_src_mux: sys_clkout_src_mux@70 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&core_ck>, <&sys_ck>, <&func_96m_ck>, <&func_54m_ck>;
                clocks = <&sys_clkout_src_gate>, <&sys_clkout_src_mux>;
        };
 
-       sys_clkout: sys_clkout {
+       sys_clkout: sys_clkout@70 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&sys_clkout_src>;
                ti,index-power-of-two;
        };
 
-       emul_ck: emul_ck {
+       emul_ck: emul_ck@78 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&func_54m_ck>;
                reg = <0x0078>;
        };
 
-       mpu_ck: mpu_ck {
+       mpu_ck: mpu_ck@140 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&core_ck>;
                ti,index-starts-at-one;
        };
 
-       dsp_gate_fck: dsp_gate_fck {
+       dsp_gate_fck: dsp_gate_fck@800 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&core_ck>;
                reg = <0x0800>;
        };
 
-       dsp_div_fck: dsp_div_fck {
+       dsp_div_fck: dsp_div_fck@840 {
                #clock-cells = <0>;
                compatible = "ti,composite-divider-clock";
                clocks = <&core_ck>;
                clocks = <&dsp_gate_fck>, <&dsp_div_fck>;
        };
 
-       core_l3_ck: core_l3_ck {
+       core_l3_ck: core_l3_ck@240 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&core_ck>;
                ti,index-starts-at-one;
        };
 
-       gfx_3d_gate_fck: gfx_3d_gate_fck {
+       gfx_3d_gate_fck: gfx_3d_gate_fck@300 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&core_l3_ck>;
                reg = <0x0300>;
        };
 
-       gfx_3d_div_fck: gfx_3d_div_fck {
+       gfx_3d_div_fck: gfx_3d_div_fck@340 {
                #clock-cells = <0>;
                compatible = "ti,composite-divider-clock";
                clocks = <&core_l3_ck>;
                clocks = <&gfx_3d_gate_fck>, <&gfx_3d_div_fck>;
        };
 
-       gfx_2d_gate_fck: gfx_2d_gate_fck {
+       gfx_2d_gate_fck: gfx_2d_gate_fck@300 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&core_l3_ck>;
                reg = <0x0300>;
        };
 
-       gfx_2d_div_fck: gfx_2d_div_fck {
+       gfx_2d_div_fck: gfx_2d_div_fck@340 {
                #clock-cells = <0>;
                compatible = "ti,composite-divider-clock";
                clocks = <&core_l3_ck>;
                clocks = <&gfx_2d_gate_fck>, <&gfx_2d_div_fck>;
        };
 
-       gfx_ick: gfx_ick {
+       gfx_ick: gfx_ick@310 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&core_l3_ck>;
                reg = <0x0310>;
        };
 
-       l4_ck: l4_ck {
+       l4_ck: l4_ck@240 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&core_l3_ck>;
                ti,index-starts-at-one;
        };
 
-       dss_ick: dss_ick {
+       dss_ick: dss_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-no-wait-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       dss1_gate_fck: dss1_gate_fck {
+       dss1_gate_fck: dss1_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-no-wait-gate-clock";
                clocks = <&core_ck>;
                clock-div = <16>;
        };
 
-       dss1_mux_fck: dss1_mux_fck {
+       dss1_mux_fck: dss1_mux_fck@240 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&sys_ck>, <&core_ck>, <&core_d2_ck>, <&core_d3_ck>, <&core_d4_ck>, <&core_d5_ck>, <&core_d6_ck>, <&core_d8_ck>, <&core_d9_ck>, <&core_d12_ck>, <&core_d16_ck>;
                clocks = <&dss1_gate_fck>, <&dss1_mux_fck>;
        };
 
-       dss2_gate_fck: dss2_gate_fck {
+       dss2_gate_fck: dss2_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-no-wait-gate-clock";
                clocks = <&func_48m_ck>;
                reg = <0x0200>;
        };
 
-       dss2_mux_fck: dss2_mux_fck {
+       dss2_mux_fck: dss2_mux_fck@240 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&sys_ck>, <&func_48m_ck>;
                clocks = <&dss2_gate_fck>, <&dss2_mux_fck>;
        };
 
-       dss_54m_fck: dss_54m_fck {
+       dss_54m_fck: dss_54m_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&func_54m_ck>;
                reg = <0x0200>;
        };
 
-       ssi_ssr_sst_gate_fck: ssi_ssr_sst_gate_fck {
+       ssi_ssr_sst_gate_fck: ssi_ssr_sst_gate_fck@204 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&core_ck>;
                reg = <0x0204>;
        };
 
-       ssi_ssr_sst_div_fck: ssi_ssr_sst_div_fck {
+       ssi_ssr_sst_div_fck: ssi_ssr_sst_div_fck@240 {
                #clock-cells = <0>;
                compatible = "ti,composite-divider-clock";
                clocks = <&core_ck>;
                clocks = <&ssi_ssr_sst_gate_fck>, <&ssi_ssr_sst_div_fck>;
        };
 
-       usb_l4_gate_ick: usb_l4_gate_ick {
+       usb_l4_gate_ick: usb_l4_gate_ick@214 {
                #clock-cells = <0>;
                compatible = "ti,composite-interface-clock";
                clocks = <&core_l3_ck>;
                reg = <0x0214>;
        };
 
-       usb_l4_div_ick: usb_l4_div_ick {
+       usb_l4_div_ick: usb_l4_div_ick@240 {
                #clock-cells = <0>;
                compatible = "ti,composite-divider-clock";
                clocks = <&core_l3_ck>;
                clocks = <&usb_l4_gate_ick>, <&usb_l4_div_ick>;
        };
 
-       ssi_l4_ick: ssi_l4_ick {
+       ssi_l4_ick: ssi_l4_ick@214 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0214>;
        };
 
-       gpt1_ick: gpt1_ick {
+       gpt1_ick: gpt1_ick@410 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&sys_ck>;
                reg = <0x0410>;
        };
 
-       gpt1_gate_fck: gpt1_gate_fck {
+       gpt1_gate_fck: gpt1_gate_fck@400 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0400>;
        };
 
-       gpt1_mux_fck: gpt1_mux_fck {
+       gpt1_mux_fck: gpt1_mux_fck@440 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_32k_ck>, <&sys_ck>, <&alt_ck>;
                clocks = <&gpt1_gate_fck>, <&gpt1_mux_fck>;
        };
 
-       gpt2_ick: gpt2_ick {
+       gpt2_ick: gpt2_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       gpt2_gate_fck: gpt2_gate_fck {
+       gpt2_gate_fck: gpt2_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0200>;
        };
 
-       gpt2_mux_fck: gpt2_mux_fck {
+       gpt2_mux_fck: gpt2_mux_fck@244 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_32k_ck>, <&sys_ck>, <&alt_ck>;
                clocks = <&gpt2_gate_fck>, <&gpt2_mux_fck>;
        };
 
-       gpt3_ick: gpt3_ick {
+       gpt3_ick: gpt3_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       gpt3_gate_fck: gpt3_gate_fck {
+       gpt3_gate_fck: gpt3_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0200>;
        };
 
-       gpt3_mux_fck: gpt3_mux_fck {
+       gpt3_mux_fck: gpt3_mux_fck@244 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_32k_ck>, <&sys_ck>, <&alt_ck>;
                clocks = <&gpt3_gate_fck>, <&gpt3_mux_fck>;
        };
 
-       gpt4_ick: gpt4_ick {
+       gpt4_ick: gpt4_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       gpt4_gate_fck: gpt4_gate_fck {
+       gpt4_gate_fck: gpt4_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0200>;
        };
 
-       gpt4_mux_fck: gpt4_mux_fck {
+       gpt4_mux_fck: gpt4_mux_fck@244 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_32k_ck>, <&sys_ck>, <&alt_ck>;
                clocks = <&gpt4_gate_fck>, <&gpt4_mux_fck>;
        };
 
-       gpt5_ick: gpt5_ick {
+       gpt5_ick: gpt5_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       gpt5_gate_fck: gpt5_gate_fck {
+       gpt5_gate_fck: gpt5_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0200>;
        };
 
-       gpt5_mux_fck: gpt5_mux_fck {
+       gpt5_mux_fck: gpt5_mux_fck@244 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_32k_ck>, <&sys_ck>, <&alt_ck>;
                clocks = <&gpt5_gate_fck>, <&gpt5_mux_fck>;
        };
 
-       gpt6_ick: gpt6_ick {
+       gpt6_ick: gpt6_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       gpt6_gate_fck: gpt6_gate_fck {
+       gpt6_gate_fck: gpt6_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0200>;
        };
 
-       gpt6_mux_fck: gpt6_mux_fck {
+       gpt6_mux_fck: gpt6_mux_fck@244 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_32k_ck>, <&sys_ck>, <&alt_ck>;
                clocks = <&gpt6_gate_fck>, <&gpt6_mux_fck>;
        };
 
-       gpt7_ick: gpt7_ick {
+       gpt7_ick: gpt7_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       gpt7_gate_fck: gpt7_gate_fck {
+       gpt7_gate_fck: gpt7_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0200>;
        };
 
-       gpt7_mux_fck: gpt7_mux_fck {
+       gpt7_mux_fck: gpt7_mux_fck@244 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_32k_ck>, <&sys_ck>, <&alt_ck>;
                clocks = <&gpt7_gate_fck>, <&gpt7_mux_fck>;
        };
 
-       gpt8_ick: gpt8_ick {
+       gpt8_ick: gpt8_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       gpt8_gate_fck: gpt8_gate_fck {
+       gpt8_gate_fck: gpt8_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0200>;
        };
 
-       gpt8_mux_fck: gpt8_mux_fck {
+       gpt8_mux_fck: gpt8_mux_fck@244 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_32k_ck>, <&sys_ck>, <&alt_ck>;
                clocks = <&gpt8_gate_fck>, <&gpt8_mux_fck>;
        };
 
-       gpt9_ick: gpt9_ick {
+       gpt9_ick: gpt9_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       gpt9_gate_fck: gpt9_gate_fck {
+       gpt9_gate_fck: gpt9_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0200>;
        };
 
-       gpt9_mux_fck: gpt9_mux_fck {
+       gpt9_mux_fck: gpt9_mux_fck@244 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_32k_ck>, <&sys_ck>, <&alt_ck>;
                clocks = <&gpt9_gate_fck>, <&gpt9_mux_fck>;
        };
 
-       gpt10_ick: gpt10_ick {
+       gpt10_ick: gpt10_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       gpt10_gate_fck: gpt10_gate_fck {
+       gpt10_gate_fck: gpt10_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0200>;
        };
 
-       gpt10_mux_fck: gpt10_mux_fck {
+       gpt10_mux_fck: gpt10_mux_fck@244 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_32k_ck>, <&sys_ck>, <&alt_ck>;
                clocks = <&gpt10_gate_fck>, <&gpt10_mux_fck>;
        };
 
-       gpt11_ick: gpt11_ick {
+       gpt11_ick: gpt11_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       gpt11_gate_fck: gpt11_gate_fck {
+       gpt11_gate_fck: gpt11_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0200>;
        };
 
-       gpt11_mux_fck: gpt11_mux_fck {
+       gpt11_mux_fck: gpt11_mux_fck@244 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_32k_ck>, <&sys_ck>, <&alt_ck>;
                clocks = <&gpt11_gate_fck>, <&gpt11_mux_fck>;
        };
 
-       gpt12_ick: gpt12_ick {
+       gpt12_ick: gpt12_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       gpt12_gate_fck: gpt12_gate_fck {
+       gpt12_gate_fck: gpt12_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0200>;
        };
 
-       gpt12_mux_fck: gpt12_mux_fck {
+       gpt12_mux_fck: gpt12_mux_fck@244 {
                #clock-cells = <0>;
                compatible = "ti,composite-mux-clock";
                clocks = <&func_32k_ck>, <&sys_ck>, <&alt_ck>;
                clocks = <&gpt12_gate_fck>, <&gpt12_mux_fck>;
        };
 
-       mcbsp1_ick: mcbsp1_ick {
+       mcbsp1_ick: mcbsp1_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       mcbsp1_gate_fck: mcbsp1_gate_fck {
+       mcbsp1_gate_fck: mcbsp1_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&mcbsp_clks>;
                reg = <0x0200>;
        };
 
-       mcbsp2_ick: mcbsp2_ick {
+       mcbsp2_ick: mcbsp2_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       mcbsp2_gate_fck: mcbsp2_gate_fck {
+       mcbsp2_gate_fck: mcbsp2_gate_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,composite-gate-clock";
                clocks = <&mcbsp_clks>;
                reg = <0x0200>;
        };
 
-       mcspi1_ick: mcspi1_ick {
+       mcspi1_ick: mcspi1_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       mcspi1_fck: mcspi1_fck {
+       mcspi1_fck: mcspi1_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&func_48m_ck>;
                reg = <0x0200>;
        };
 
-       mcspi2_ick: mcspi2_ick {
+       mcspi2_ick: mcspi2_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       mcspi2_fck: mcspi2_fck {
+       mcspi2_fck: mcspi2_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&func_48m_ck>;
                reg = <0x0200>;
        };
 
-       uart1_ick: uart1_ick {
+       uart1_ick: uart1_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       uart1_fck: uart1_fck {
+       uart1_fck: uart1_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&func_48m_ck>;
                reg = <0x0200>;
        };
 
-       uart2_ick: uart2_ick {
+       uart2_ick: uart2_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       uart2_fck: uart2_fck {
+       uart2_fck: uart2_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&func_48m_ck>;
                reg = <0x0200>;
        };
 
-       uart3_ick: uart3_ick {
+       uart3_ick: uart3_ick@214 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0214>;
        };
 
-       uart3_fck: uart3_fck {
+       uart3_fck: uart3_fck@204 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&func_48m_ck>;
                reg = <0x0204>;
        };
 
-       gpios_ick: gpios_ick {
+       gpios_ick: gpios_ick@410 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&sys_ck>;
                reg = <0x0410>;
        };
 
-       gpios_fck: gpios_fck {
+       gpios_fck: gpios_fck@400 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0400>;
        };
 
-       mpu_wdt_ick: mpu_wdt_ick {
+       mpu_wdt_ick: mpu_wdt_ick@410 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&sys_ck>;
                reg = <0x0410>;
        };
 
-       mpu_wdt_fck: mpu_wdt_fck {
+       mpu_wdt_fck: mpu_wdt_fck@400 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0400>;
        };
 
-       sync_32k_ick: sync_32k_ick {
+       sync_32k_ick: sync_32k_ick@410 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&sys_ck>;
                reg = <0x0410>;
        };
 
-       wdt1_ick: wdt1_ick {
+       wdt1_ick: wdt1_ick@410 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&sys_ck>;
                reg = <0x0410>;
        };
 
-       omapctrl_ick: omapctrl_ick {
+       omapctrl_ick: omapctrl_ick@410 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&sys_ck>;
                reg = <0x0410>;
        };
 
-       cam_fck: cam_fck {
+       cam_fck: cam_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&func_96m_ck>;
                reg = <0x0200>;
        };
 
-       cam_ick: cam_ick {
+       cam_ick: cam_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-no-wait-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       mailboxes_ick: mailboxes_ick {
+       mailboxes_ick: mailboxes_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       wdt4_ick: wdt4_ick {
+       wdt4_ick: wdt4_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       wdt4_fck: wdt4_fck {
+       wdt4_fck: wdt4_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&func_32k_ck>;
                reg = <0x0200>;
        };
 
-       mspro_ick: mspro_ick {
+       mspro_ick: mspro_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       mspro_fck: mspro_fck {
+       mspro_fck: mspro_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&func_96m_ck>;
                reg = <0x0200>;
        };
 
-       fac_ick: fac_ick {
+       fac_ick: fac_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       fac_fck: fac_fck {
+       fac_fck: fac_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&func_12m_ck>;
                reg = <0x0200>;
        };
 
-       hdq_ick: hdq_ick {
+       hdq_ick: hdq_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       hdq_fck: hdq_fck {
+       hdq_fck: hdq_fck@200 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&func_12m_ck>;
                reg = <0x0200>;
        };
 
-       i2c1_ick: i2c1_ick {
+       i2c1_ick: i2c1_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       i2c2_ick: i2c2_ick {
+       i2c2_ick: i2c2_ick@210 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x0210>;
        };
 
-       gpmc_fck: gpmc_fck {
+       gpmc_fck: gpmc_fck@238 {
                #clock-cells = <0>;
                compatible = "ti,fixed-factor-clock";
                clocks = <&core_l3_ck>;
                clock-div = <1>;
        };
 
-       sdma_ick: sdma_ick {
+       sdma_ick: sdma_ick@238 {
                #clock-cells = <0>;
                compatible = "ti,fixed-factor-clock";
                clocks = <&core_l3_ck>;
                ti,clock-mult = <1>;
        };
 
-       sdrc_ick: sdrc_ick {
+       sdrc_ick: sdrc_ick@238 {
                #clock-cells = <0>;
                compatible = "ti,fixed-factor-clock";
                clocks = <&core_l3_ck>;
                ti,clock-mult = <1>;
        };
 
-       des_ick: des_ick {
+       des_ick: des_ick@21c {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x021c>;
        };
 
-       sha_ick: sha_ick {
+       sha_ick: sha_ick@21c {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x021c>;
        };
 
-       rng_ick: rng_ick {
+       rng_ick: rng_ick@21c {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x021c>;
        };
 
-       aes_ick: aes_ick {
+       aes_ick: aes_ick@21c {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x021c>;
        };
 
-       pka_ick: pka_ick {
+       pka_ick: pka_ick@21c {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";
                clocks = <&l4_ck>;
                reg = <0x021c>;
        };
 
-       usb_fck: usb_fck {
+       usb_fck: usb_fck@204 {
                #clock-cells = <0>;
                compatible = "ti,wait-gate-clock";
                clocks = <&func_48m_ck>;