Re: [PATCH v5 1/3] ARM: dts: tegra: Remove skeleton.dtsi and fix DTC warnings for /memory
On 23.05.2018 10:34, Krzysztof Kozlowski wrote:
> On Wed, May 23, 2018 at 10:22 AM, Stefan Agner wrote:
>> On 23.05.2018 09:05, Krzysztof Kozlowski wrote:
>>> On Thu, May 17, 2018 at 1:39 PM, Stefan Agner wrote:
On 17.05.2018 09:45, Krzysztof Kozlowski wrote:
Could we not add
memory { device_type = "memory"; };
in the SoC level device trees?
This would save device_type in all other instances.
That is also how it is done in other places, e.g.
arch/arm/boot/dts/imx6qdl.dtsi
>>>
>>> Not really because the unit address will not match between different
>>> boards. The imx6qdl, as I see, has the same issue:
>>> - imx6qdl.dtsi defines "memory" node
>>> - imx6dl-apf6dev.dts includes the previous and defines "memory@1000"
>>>
>>> This is wrong - two memory nodes.
>>>
>>
>> Hm I see. We could add
>>
>> memory@0 { device_type = "memory"; };
>>
>> Since the reg property is specified in the board level device tree it
>> would be still fine?
>>
>> Or probably better to provide a complete spec with length zero:
>>
>> memory@0 {
>> device_type = "memory";
>> reg = <0x0 0x0>;
>> };
>>
>> Even some boards do that and assume that boot loader will fill it
>> correctly, so that should be fine.
>
> That could be the solution although tegra30-apalis.dtsi is a problem
> here. For Tegra 114, 124 and 20 it would work fine - all boards from
> given SoC have the same address of memory (0x0 or 0x8000). However
> for Tegra30 the Apalis did not have any memory reg before so I am not
> sure what should be used. I added 0x0. The other Tegra30 boards have
> memory@8000.
The start address of memory is not something a board can decide on: That
is hard wired in the SoC...
In the Tegra 3 case the start address of main memory is 0x8000.
So
memory@8000 {
reg = <0x8000 0x0>;
};
Should be fine.
Or you can use 0x4000 (1GiB) since that is the smallest
configuration Toradex sells currently.
memory@8000 {
reg = <0x8000 0x4000>;
};
Sorry for the hassle and thanks for fixing this!
--
Stefan
Re: [PATCH v5 1/3] ARM: dts: tegra: Remove skeleton.dtsi and fix DTC warnings for /memory
On Wed, May 23, 2018 at 10:22 AM, Stefan Agner wrote:
> On 23.05.2018 09:05, Krzysztof Kozlowski wrote:
>> On Thu, May 17, 2018 at 1:39 PM, Stefan Agner wrote:
>>> On 17.05.2018 09:45, Krzysztof Kozlowski wrote:
>>> Could we not add
>>>
>>> memory { device_type = "memory"; };
>>>
>>> in the SoC level device trees?
>>>
>>> This would save device_type in all other instances.
>>>
>>> That is also how it is done in other places, e.g.
>>> arch/arm/boot/dts/imx6qdl.dtsi
>>
>> Not really because the unit address will not match between different
>> boards. The imx6qdl, as I see, has the same issue:
>> - imx6qdl.dtsi defines "memory" node
>> - imx6dl-apf6dev.dts includes the previous and defines "memory@1000"
>>
>> This is wrong - two memory nodes.
>>
>
> Hm I see. We could add
>
> memory@0 { device_type = "memory"; };
>
> Since the reg property is specified in the board level device tree it
> would be still fine?
>
> Or probably better to provide a complete spec with length zero:
>
> memory@0 {
> device_type = "memory";
> reg = <0x0 0x0>;
> };
>
> Even some boards do that and assume that boot loader will fill it
> correctly, so that should be fine.
That could be the solution although tegra30-apalis.dtsi is a problem
here. For Tegra 114, 124 and 20 it would work fine - all boards from
given SoC have the same address of memory (0x0 or 0x8000). However
for Tegra30 the Apalis did not have any memory reg before so I am not
sure what should be used. I added 0x0. The other Tegra30 boards have
memory@8000.
Best regards,
Krzysztof
Re: [PATCH v5 1/3] ARM: dts: tegra: Remove skeleton.dtsi and fix DTC warnings for /memory
On 23.05.2018 09:05, Krzysztof Kozlowski wrote:
> On Thu, May 17, 2018 at 1:39 PM, Stefan Agner wrote:
>> On 17.05.2018 09:45, Krzysztof Kozlowski wrote:
>>> Remove the usage of skeleton.dtsi and add necessary properties to /memory
>>> node to fix the DTC warnings:
>>>
>>> arch/arm/boot/dts/tegra20-harmony.dtb: Warning (unit_address_vs_reg):
>>> /memory: node has a reg or ranges property, but no unit name
>>>
>>> The DTB after the change is the same as before except adding
>>> unit-address to /memory node.
>>>
>>> Signed-off-by: Krzysztof Kozlowski
>>>
>>> ---
>>>
>>> Changes since v4:
>>> 1. None
>>> ---
>>> arch/arm/boot/dts/tegra114-dalmore.dts | 3 ++-
>>> arch/arm/boot/dts/tegra114-roth.dts | 3 ++-
>>> arch/arm/boot/dts/tegra114-tn7.dts | 3 ++-
>>> arch/arm/boot/dts/tegra114.dtsi | 4 ++--
>>> arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 3 ++-
>>> arch/arm/boot/dts/tegra124-apalis.dtsi | 3 ++-
>>> arch/arm/boot/dts/tegra124-jetson-tk1.dts | 3 ++-
>>> arch/arm/boot/dts/tegra124-nyan.dtsi| 3 ++-
>>> arch/arm/boot/dts/tegra124-venice2.dts | 3 ++-
>>> arch/arm/boot/dts/tegra124.dtsi | 2 --
>>> arch/arm/boot/dts/tegra20-colibri-512.dtsi | 3 ++-
>>> arch/arm/boot/dts/tegra20-harmony.dts | 3 ++-
>>> arch/arm/boot/dts/tegra20-paz00.dts | 3 ++-
>>> arch/arm/boot/dts/tegra20-seaboard.dts | 3 ++-
>>> arch/arm/boot/dts/tegra20-tamonten.dtsi | 3 ++-
>>> arch/arm/boot/dts/tegra20-trimslice.dts | 3 ++-
>>> arch/arm/boot/dts/tegra20-ventana.dts | 3 ++-
>>> arch/arm/boot/dts/tegra20.dtsi | 7 +--
>>> arch/arm/boot/dts/tegra30-apalis.dtsi | 5 +
>>> arch/arm/boot/dts/tegra30-beaver.dts| 3 ++-
>>> arch/arm/boot/dts/tegra30-cardhu.dtsi | 3 ++-
>>> arch/arm/boot/dts/tegra30-colibri.dtsi | 3 ++-
>>> arch/arm/boot/dts/tegra30.dtsi | 7 +--
>>> 23 files changed, 53 insertions(+), 26 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts
>>> b/arch/arm/boot/dts/tegra114-dalmore.dts
>>> index eafff16765b4..5cdcedfc19cb 100644
>>> --- a/arch/arm/boot/dts/tegra114-dalmore.dts
>>> +++ b/arch/arm/boot/dts/tegra114-dalmore.dts
>>> @@ -23,7 +23,8 @@
>>> stdout-path = "serial0:115200n8";
>>> };
>>>
>>> - memory {
>>> + memory@8000 {
>>> + device_type = "memory";
>>> reg = <0x8000 0x4000>;
>>> };
>>>
>>> diff --git a/arch/arm/boot/dts/tegra114-roth.dts
>>> b/arch/arm/boot/dts/tegra114-roth.dts
>>> index 7ed7370ee67a..b4f329a07c60 100644
>>> --- a/arch/arm/boot/dts/tegra114-roth.dts
>>> +++ b/arch/arm/boot/dts/tegra114-roth.dts
>>> @@ -28,7 +28,8 @@
>>> };
>>> };
>>>
>>> - memory {
>>> + memory@8000 {
>>> + device_type = "memory";
>>> /* memory >= 0x7960 is reserved for firmware usage */
>>> reg = <0x8000 0x7960>;
>>> };
>>> diff --git a/arch/arm/boot/dts/tegra114-tn7.dts
>>> b/arch/arm/boot/dts/tegra114-tn7.dts
>>> index 7fc4a8b31e45..12092d344ce8 100644
>>> --- a/arch/arm/boot/dts/tegra114-tn7.dts
>>> +++ b/arch/arm/boot/dts/tegra114-tn7.dts
>>> @@ -28,7 +28,8 @@
>>> };
>>> };
>>>
>>> - memory {
>>> + memory@8000 {
>>> + device_type = "memory";
>>> /* memory >= 0x37e0 is reserved for firmware usage */
>>> reg = <0x8000 0x37e0>;
>>> };
>>> diff --git a/arch/arm/boot/dts/tegra114.dtsi
>>> b/arch/arm/boot/dts/tegra114.dtsi
>>> index 0e4a13295d8a..b917784d3f97 100644
>>> --- a/arch/arm/boot/dts/tegra114.dtsi
>>> +++ b/arch/arm/boot/dts/tegra114.dtsi
>>> @@ -5,11 +5,11 @@
>>> #include
>>> #include
>>>
>>> -#include "skeleton.dtsi"
>>> -
>>> / {
>>> compatible = "nvidia,tegra114";
>>> interrupt-parent = <&lic>;
>>> + #address-cells = <1>;
>>> + #size-cells = <1>;
>>>
>>> host1x@5000 {
>>> compatible = "nvidia,tegra114-host1x", "simple-bus";
>>> diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
>>> b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
>>> index bb67edb016c5..80b52c612891 100644
>>> --- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
>>> +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
>>> @@ -15,7 +15,8 @@
>>> compatible = "toradex,apalis-tk1-v1.2", "toradex,apalis-tk1",
>>>"nvidia,tegra124";
>>>
>>> - memory {
>>> + memory@0 {
>>> + device_type = "memory";
>>> reg = <0x0 0x8000 0x0 0x8000>;
>>> };
>>>
>>> diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi
>>> b/arch/arm/boot/dts/tegra124-apalis.dtsi
>>> index 65a2161b9b8e..3ca7601cafe9 100644
>>> --- a/arch/arm/boot/dts/tegra124-apalis.dtsi
>>> +++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
>>> @@ -50,7 +50,8 @@
>>> model = "Toradex Apalis TK1";
>>> compatible = "toradex,apalis-tk1",
Re: [PATCH v5 1/3] ARM: dts: tegra: Remove skeleton.dtsi and fix DTC warnings for /memory
On Thu, May 17, 2018 at 1:39 PM, Stefan Agner wrote:
> On 17.05.2018 09:45, Krzysztof Kozlowski wrote:
>> Remove the usage of skeleton.dtsi and add necessary properties to /memory
>> node to fix the DTC warnings:
>>
>> arch/arm/boot/dts/tegra20-harmony.dtb: Warning (unit_address_vs_reg):
>> /memory: node has a reg or ranges property, but no unit name
>>
>> The DTB after the change is the same as before except adding
>> unit-address to /memory node.
>>
>> Signed-off-by: Krzysztof Kozlowski
>>
>> ---
>>
>> Changes since v4:
>> 1. None
>> ---
>> arch/arm/boot/dts/tegra114-dalmore.dts | 3 ++-
>> arch/arm/boot/dts/tegra114-roth.dts | 3 ++-
>> arch/arm/boot/dts/tegra114-tn7.dts | 3 ++-
>> arch/arm/boot/dts/tegra114.dtsi | 4 ++--
>> arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 3 ++-
>> arch/arm/boot/dts/tegra124-apalis.dtsi | 3 ++-
>> arch/arm/boot/dts/tegra124-jetson-tk1.dts | 3 ++-
>> arch/arm/boot/dts/tegra124-nyan.dtsi| 3 ++-
>> arch/arm/boot/dts/tegra124-venice2.dts | 3 ++-
>> arch/arm/boot/dts/tegra124.dtsi | 2 --
>> arch/arm/boot/dts/tegra20-colibri-512.dtsi | 3 ++-
>> arch/arm/boot/dts/tegra20-harmony.dts | 3 ++-
>> arch/arm/boot/dts/tegra20-paz00.dts | 3 ++-
>> arch/arm/boot/dts/tegra20-seaboard.dts | 3 ++-
>> arch/arm/boot/dts/tegra20-tamonten.dtsi | 3 ++-
>> arch/arm/boot/dts/tegra20-trimslice.dts | 3 ++-
>> arch/arm/boot/dts/tegra20-ventana.dts | 3 ++-
>> arch/arm/boot/dts/tegra20.dtsi | 7 +--
>> arch/arm/boot/dts/tegra30-apalis.dtsi | 5 +
>> arch/arm/boot/dts/tegra30-beaver.dts| 3 ++-
>> arch/arm/boot/dts/tegra30-cardhu.dtsi | 3 ++-
>> arch/arm/boot/dts/tegra30-colibri.dtsi | 3 ++-
>> arch/arm/boot/dts/tegra30.dtsi | 7 +--
>> 23 files changed, 53 insertions(+), 26 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts
>> b/arch/arm/boot/dts/tegra114-dalmore.dts
>> index eafff16765b4..5cdcedfc19cb 100644
>> --- a/arch/arm/boot/dts/tegra114-dalmore.dts
>> +++ b/arch/arm/boot/dts/tegra114-dalmore.dts
>> @@ -23,7 +23,8 @@
>> stdout-path = "serial0:115200n8";
>> };
>>
>> - memory {
>> + memory@8000 {
>> + device_type = "memory";
>> reg = <0x8000 0x4000>;
>> };
>>
>> diff --git a/arch/arm/boot/dts/tegra114-roth.dts
>> b/arch/arm/boot/dts/tegra114-roth.dts
>> index 7ed7370ee67a..b4f329a07c60 100644
>> --- a/arch/arm/boot/dts/tegra114-roth.dts
>> +++ b/arch/arm/boot/dts/tegra114-roth.dts
>> @@ -28,7 +28,8 @@
>> };
>> };
>>
>> - memory {
>> + memory@8000 {
>> + device_type = "memory";
>> /* memory >= 0x7960 is reserved for firmware usage */
>> reg = <0x8000 0x7960>;
>> };
>> diff --git a/arch/arm/boot/dts/tegra114-tn7.dts
>> b/arch/arm/boot/dts/tegra114-tn7.dts
>> index 7fc4a8b31e45..12092d344ce8 100644
>> --- a/arch/arm/boot/dts/tegra114-tn7.dts
>> +++ b/arch/arm/boot/dts/tegra114-tn7.dts
>> @@ -28,7 +28,8 @@
>> };
>> };
>>
>> - memory {
>> + memory@8000 {
>> + device_type = "memory";
>> /* memory >= 0x37e0 is reserved for firmware usage */
>> reg = <0x8000 0x37e0>;
>> };
>> diff --git a/arch/arm/boot/dts/tegra114.dtsi
>> b/arch/arm/boot/dts/tegra114.dtsi
>> index 0e4a13295d8a..b917784d3f97 100644
>> --- a/arch/arm/boot/dts/tegra114.dtsi
>> +++ b/arch/arm/boot/dts/tegra114.dtsi
>> @@ -5,11 +5,11 @@
>> #include
>> #include
>>
>> -#include "skeleton.dtsi"
>> -
>> / {
>> compatible = "nvidia,tegra114";
>> interrupt-parent = <&lic>;
>> + #address-cells = <1>;
>> + #size-cells = <1>;
>>
>> host1x@5000 {
>> compatible = "nvidia,tegra114-host1x", "simple-bus";
>> diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
>> b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
>> index bb67edb016c5..80b52c612891 100644
>> --- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
>> +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
>> @@ -15,7 +15,8 @@
>> compatible = "toradex,apalis-tk1-v1.2", "toradex,apalis-tk1",
>>"nvidia,tegra124";
>>
>> - memory {
>> + memory@0 {
>> + device_type = "memory";
>> reg = <0x0 0x8000 0x0 0x8000>;
>> };
>>
>> diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi
>> b/arch/arm/boot/dts/tegra124-apalis.dtsi
>> index 65a2161b9b8e..3ca7601cafe9 100644
>> --- a/arch/arm/boot/dts/tegra124-apalis.dtsi
>> +++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
>> @@ -50,7 +50,8 @@
>> model = "Toradex Apalis TK1";
>> compatible = "toradex,apalis-tk1", "nvidia,tegra124";
>>
>> - memory {
>> + memory@0 {
>> + device_type = "memory";
>> reg = <0x0 0x8000 0x0 0x8000>;
>> };
>>
>> diff
Re: [PATCH v5 1/3] ARM: dts: tegra: Remove skeleton.dtsi and fix DTC warnings for /memory
On 17.05.2018 09:45, Krzysztof Kozlowski wrote:
> Remove the usage of skeleton.dtsi and add necessary properties to /memory
> node to fix the DTC warnings:
>
> arch/arm/boot/dts/tegra20-harmony.dtb: Warning (unit_address_vs_reg):
> /memory: node has a reg or ranges property, but no unit name
>
> The DTB after the change is the same as before except adding
> unit-address to /memory node.
>
> Signed-off-by: Krzysztof Kozlowski
>
> ---
>
> Changes since v4:
> 1. None
> ---
> arch/arm/boot/dts/tegra114-dalmore.dts | 3 ++-
> arch/arm/boot/dts/tegra114-roth.dts | 3 ++-
> arch/arm/boot/dts/tegra114-tn7.dts | 3 ++-
> arch/arm/boot/dts/tegra114.dtsi | 4 ++--
> arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 3 ++-
> arch/arm/boot/dts/tegra124-apalis.dtsi | 3 ++-
> arch/arm/boot/dts/tegra124-jetson-tk1.dts | 3 ++-
> arch/arm/boot/dts/tegra124-nyan.dtsi| 3 ++-
> arch/arm/boot/dts/tegra124-venice2.dts | 3 ++-
> arch/arm/boot/dts/tegra124.dtsi | 2 --
> arch/arm/boot/dts/tegra20-colibri-512.dtsi | 3 ++-
> arch/arm/boot/dts/tegra20-harmony.dts | 3 ++-
> arch/arm/boot/dts/tegra20-paz00.dts | 3 ++-
> arch/arm/boot/dts/tegra20-seaboard.dts | 3 ++-
> arch/arm/boot/dts/tegra20-tamonten.dtsi | 3 ++-
> arch/arm/boot/dts/tegra20-trimslice.dts | 3 ++-
> arch/arm/boot/dts/tegra20-ventana.dts | 3 ++-
> arch/arm/boot/dts/tegra20.dtsi | 7 +--
> arch/arm/boot/dts/tegra30-apalis.dtsi | 5 +
> arch/arm/boot/dts/tegra30-beaver.dts| 3 ++-
> arch/arm/boot/dts/tegra30-cardhu.dtsi | 3 ++-
> arch/arm/boot/dts/tegra30-colibri.dtsi | 3 ++-
> arch/arm/boot/dts/tegra30.dtsi | 7 +--
> 23 files changed, 53 insertions(+), 26 deletions(-)
>
> diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts
> b/arch/arm/boot/dts/tegra114-dalmore.dts
> index eafff16765b4..5cdcedfc19cb 100644
> --- a/arch/arm/boot/dts/tegra114-dalmore.dts
> +++ b/arch/arm/boot/dts/tegra114-dalmore.dts
> @@ -23,7 +23,8 @@
> stdout-path = "serial0:115200n8";
> };
>
> - memory {
> + memory@8000 {
> + device_type = "memory";
> reg = <0x8000 0x4000>;
> };
>
> diff --git a/arch/arm/boot/dts/tegra114-roth.dts
> b/arch/arm/boot/dts/tegra114-roth.dts
> index 7ed7370ee67a..b4f329a07c60 100644
> --- a/arch/arm/boot/dts/tegra114-roth.dts
> +++ b/arch/arm/boot/dts/tegra114-roth.dts
> @@ -28,7 +28,8 @@
> };
> };
>
> - memory {
> + memory@8000 {
> + device_type = "memory";
> /* memory >= 0x7960 is reserved for firmware usage */
> reg = <0x8000 0x7960>;
> };
> diff --git a/arch/arm/boot/dts/tegra114-tn7.dts
> b/arch/arm/boot/dts/tegra114-tn7.dts
> index 7fc4a8b31e45..12092d344ce8 100644
> --- a/arch/arm/boot/dts/tegra114-tn7.dts
> +++ b/arch/arm/boot/dts/tegra114-tn7.dts
> @@ -28,7 +28,8 @@
> };
> };
>
> - memory {
> + memory@8000 {
> + device_type = "memory";
> /* memory >= 0x37e0 is reserved for firmware usage */
> reg = <0x8000 0x37e0>;
> };
> diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
> index 0e4a13295d8a..b917784d3f97 100644
> --- a/arch/arm/boot/dts/tegra114.dtsi
> +++ b/arch/arm/boot/dts/tegra114.dtsi
> @@ -5,11 +5,11 @@
> #include
> #include
>
> -#include "skeleton.dtsi"
> -
> / {
> compatible = "nvidia,tegra114";
> interrupt-parent = <&lic>;
> + #address-cells = <1>;
> + #size-cells = <1>;
>
> host1x@5000 {
> compatible = "nvidia,tegra114-host1x", "simple-bus";
> diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> index bb67edb016c5..80b52c612891 100644
> --- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> @@ -15,7 +15,8 @@
> compatible = "toradex,apalis-tk1-v1.2", "toradex,apalis-tk1",
>"nvidia,tegra124";
>
> - memory {
> + memory@0 {
> + device_type = "memory";
> reg = <0x0 0x8000 0x0 0x8000>;
> };
>
> diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi
> b/arch/arm/boot/dts/tegra124-apalis.dtsi
> index 65a2161b9b8e..3ca7601cafe9 100644
> --- a/arch/arm/boot/dts/tegra124-apalis.dtsi
> +++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
> @@ -50,7 +50,8 @@
> model = "Toradex Apalis TK1";
> compatible = "toradex,apalis-tk1", "nvidia,tegra124";
>
> - memory {
> + memory@0 {
> + device_type = "memory";
> reg = <0x0 0x8000 0x0 0x8000>;
> };
>
> diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
> b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
> index 6dbcf84dafbc..8d9e6ee6c6a7 100644
> --- a/arch/arm/boot/dts/tegr
