powerpc/fsl: Add #clock-cells and clockgen label to clockgen nodes

This allows new-style clock references to be used, which is needed for
fman.  The old clock nodes will be removed and all clock references
converted to new-style once the qoriq-cpufreq driver is updated to stop
depending on the old-style references in cpu nodes.

Signed-off-by: Scott Wood <scottwood@freescale.com>

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi
index 4ece1edbff6362a169b51ed99bf22ca8e18e6e42..88cd70de4f86ad4a16f2aa4843fcddc629dae9e3 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi
@@ -32,13 +32,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-global-utilities@e1000 {
+clockgen: global-utilities@e1000 {
        compatible = "fsl,qoriq-clockgen-1.0";
        ranges = <0x0 0xe1000 0x1000>;
        reg = <0xe1000 0x1000>;
        clock-frequency = <0>;
        #address-cells = <1>;
        #size-cells = <1>;
+       #clock-cells = <2>;
 
        sysclk: sysclk {
                #clock-cells = <0>;

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi
index 48e0b6e4ce33c06946f543f59b150b7eaabd353c..6dfd7c5357abbdb79a28cf8f3e8bc043353f01e2 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi
@@ -32,12 +32,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-global-utilities@e1000 {
+clockgen: global-utilities@e1000 {
        compatible = "fsl,qoriq-clockgen-2.0";
        ranges = <0x0 0xe1000 0x1000>;
        reg = <0xe1000 0x1000>;
        #address-cells = <1>;
        #size-cells = <1>;
+       #clock-cells = <2>;
 
        sysclk: sysclk {
                #clock-cells = <0>;