On 20/07/15 15:04, Tero Kristo wrote:
> On 07/17/2015 04:47 PM, Roger Quadros wrote:
>> scm_conf1 maps the control register address space after the
>> padconf till the end.
>>
>> Fix the scm_conf and pmx_core resource lengths. We need to add
>> 4 bytes to include the last 32-bit register space.
>>
>> Remove the redundant dra7_ctrl_core and dra7_ctrl_general nodes.
>> They are not used by anyone and no longer needed as they are
>> covered by scm_conf and scm_conf1.
>
> Looks like you are doing three things in this patch, maybe split it up as
> such?
OK.
>
>>
>> Signed-off-by: Roger Quadros <rog...@ti.com>
>> ---
>> arch/arm/boot/dts/dra7.dtsi | 19 ++++++++-----------
>> 1 file changed, 8 insertions(+), 11 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
>> index 4a0718c..d07c34c 100644
>> --- a/arch/arm/boot/dts/dra7.dtsi
>> +++ b/arch/arm/boot/dts/dra7.dtsi
>> @@ -141,7 +141,7 @@
>> dra7_pmx_core: pinmux@1400 {
>> compatible = "ti,dra7-padconf",
>> "pinctrl-single";
>> - reg = <0x1400 0x0464>;
>> + reg = <0x1400 0x0468>;
>> #address-cells = <1>;
>> #size-cells = <0>;
>> #interrupt-cells = <1>;
>> @@ -149,6 +149,13 @@
>> pinctrl-single,register-width = <32>;
>> pinctrl-single,function-mask = <0x3fffffff>;
>> };
>> +
>> + scm_conf1: scm_conf@1 {
>
> Should be ... scm_conf@1868?
OK.
>
> Are there any users for this area anyway? I don't think we should map this
> area just for fun of it. Mostly it looks like this contains efuse values for
> OPPs, which should be mapped from the OPP layer, not as a generic syscon.
OK then, I'll only include the CTRL_CORE_SMA_SW_2..9 registers in this region.
cheers,
-roger
>
>> + compatible = "syscon";
>> + reg = <0x1868 0x03e0>;
>> + #address-cells = <1>;
>> + #size-cells = <1>;
>> + };
>> };
>>
>> cm_core_aon: cm_core_aon@5000 {
>> @@ -286,16 +293,6 @@
>> #thermal-sensor-cells = <1>;
>> };
>>
>> - dra7_ctrl_core: ctrl_core@4a002000 {
>> - compatible = "syscon";
>> - reg = <0x4a002000 0x6d0>;
>> - };
>> -
>> - dra7_ctrl_general: tisyscon@4a002e00 {
>> - compatible = "syscon";
>> - reg = <0x4a002e00 0x7c>;
>> - };
>
> I thought I had removed these already and yes... this was done in commit
> d919501feffa8715147582c3ffce96fad0c7016f already, but seems they were added
> back in a resolution for a merge conflict later.
>
> -Tero
>
>> -
>> sdma: dma-controller@4a056000 {
>> compatible = "ti,omap4430-sdma";
>> reg = <0x4a056000 0x1000>;
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
