[PATCHv7 30/36] ARM: dts: omap3 clock data

[Nishanth Menon]

On 09/26/2013 11:06 AM, Nishanth Menon wrote:
> On 11:48-20130925, Tero Kristo wrote:
>> diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
>> index 16420ae..bc11b83 100644
>> --- a/arch/arm/boot/dts/omap3.dtsi
>> +++ b/arch/arm/boot/dts/omap3.dtsi
>> @@ -533,4 +533,11 @@
>>  			ram-bits = <12>;
>>  		};
>>  	};
>> +
>> +	clocks {
>> +		#address-cells = <1>;
>> +		#size-cells = <1>;
>> +		ranges;
>> +		/include/ "omap3xxx-clocks.dtsi"
>> +	};
>>  };
> Clocks are introduced towards the tail of the dts -> this has a problem
> associated with it -> device nodes should be able to reference phandle
> like:
> 
> devicex {
> 	clocks = <&sys_ck>;
> }
> 
> Since all the devices on ocp and cpu0 node appears above the definition
> they fail to catch the phandle. instead, moving the clocks node as high
> in the tree as possible resolves this: something like:
> diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
> index bc11b83..0b2161d 100644
> --- a/arch/arm/boot/dts/omap3.dtsi
> +++ b/arch/arm/boot/dts/omap3.dtsi
> @@ -24,6 +24,13 @@
>  		serial2 = &uart3;
>  	};
>  
> +	clocks {
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +		ranges;
> +		/include/ "omap3xxx-clocks.dtsi"
> +	};
> +
>  	cpus {
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> @@ -534,10 +541,4 @@
>  		};
>  	};
>  
> -	clocks {
> -		#address-cells = <1>;
> -		#size-cells = <1>;
> -		ranges;
> -		/include/ "omap3xxx-clocks.dtsi"
> -	};
>  };
> 
> What do you think of the change? applies for all clock nodes in other
> dtsi as well - I will mark them as I find them.

Digging further, the above is not needed. Apologies on the noise.
below changes will be nice though..

> 
> Further,
>> diff --git a/arch/arm/boot/dts/omap34xx.dtsi b/arch/arm/boot/dts/omap34xx.dtsi
>> index 5355d61..2ed7c69 100644
>> --- a/arch/arm/boot/dts/omap34xx.dtsi
>> +++ b/arch/arm/boot/dts/omap34xx.dtsi
>> @@ -25,4 +25,123 @@
>>  			clock-latency = <300000>; /* From legacy driver */
>>  		};
>>  	};
>> -};
>> +
>> +	clocks {
>> +		#address-cells = <1>;
>> +		#size-cells = <1>;
>> +		ranges;
> dont need to state the above two -> already done in omap3.dtsi.
>> +		/include/ "omap34xx-omap36xx-clocks.dtsi"
>> +		/include/ "omap36xx-omap3430es2plus-clocks.dtsi"
>> +		/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
>> +	};
>> +};
> [...]
>> \ No newline at end of file
> ^^
> [...]
>> diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
>> index f8b3765..71fb6fb 100644
>> --- a/arch/arm/boot/dts/omap36xx.dtsi
>> +++ b/arch/arm/boot/dts/omap36xx.dtsi
>> @@ -35,4 +35,124 @@
>>  			clock-frequency = <48000000>;
>>  		};
>>  	};
>> -};
>> +
>> +	clocks {
>> +		#address-cells = <1>;
>> +		#size-cells = <1>;
>> +		ranges;
> ^^ here as well.
>> +		/include/ "omap36xx-clocks.dtsi"
>> +		/include/ "omap34xx-omap36xx-clocks.dtsi"
>> +		/include/ "omap36xx-omap3430es2plus-clocks.dtsi"
>> +		/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
>> +	};
> [...]
>> +};
>> \ No newline at end of file
> ^^ this need fix as well.
> 


-- 
Regards,
Nishanth Menon