Message ID | 1472645679-5696-2-git-send-email-javier@osg.samsung.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Hi, On Wednesday, August 31, 2016 02:14:33 PM Javier Martinez Canillas wrote: > The skeleton.dtsi file was removed in ARM64 for different reasons as > explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi"). > > These also applies to ARM and it will also allow to get rid of the > following DTC warnings in the future: > > "Node /memory has a reg or ranges property, but no unit name" > > But these boards don't have a memory node defined, so removing the > skeleton.dtsi inclusion in exynos4.dtsi will cause a change in the > compiled DTB. Add a dummy memory node so the compiled DTB doesn't > change if the skeleton.dtsi is removed from exynos4.dtsi. > > Eventually the correct starting addresses and sizes should be used > but I didn't find that information. > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > --- > > arch/arm/boot/dts/exynos5440-sd5v1.dts | 5 +++++ > arch/arm/boot/dts/exynos5440-ssdk5440.dts | 5 +++++ > 2 files changed, 10 insertions(+) > > diff --git a/arch/arm/boot/dts/exynos5440-sd5v1.dts b/arch/arm/boot/dts/exynos5440-sd5v1.dts > index a98501bab6fc..333db4ff373a 100644 > --- a/arch/arm/boot/dts/exynos5440-sd5v1.dts > +++ b/arch/arm/boot/dts/exynos5440-sd5v1.dts > @@ -20,6 +20,11 @@ > bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; > }; > > + memory { > + device_type = "memory"; > + reg = <0 0>; > + }; I think that this node deserves a FIXME comment. > + > fixed-rate-clocks { > xtal { > compatible = "samsung,clock-xtal"; > diff --git a/arch/arm/boot/dts/exynos5440-ssdk5440.dts b/arch/arm/boot/dts/exynos5440-ssdk5440.dts > index 6a0d802e87c8..82fea6f94704 100644 > --- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts > +++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts > @@ -21,6 +21,11 @@ > bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; > }; > > + memory { > + device_type = "memory"; > + reg = <0 0>; > + }; ditto > fixed-rate-clocks { > xtal { > compatible = "samsung,clock-xtal"; > Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Aug 31, 2016 at 02:14:33PM +0200, Javier Martinez Canillas wrote: > The skeleton.dtsi file was removed in ARM64 for different reasons as > explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi"). > > These also applies to ARM and it will also allow to get rid of the > following DTC warnings in the future: > > "Node /memory has a reg or ranges property, but no unit name" > > But these boards don't have a memory node defined, so removing the > skeleton.dtsi inclusion in exynos4.dtsi will cause a change in the > compiled DTB. Add a dummy memory node so the compiled DTB doesn't > change if the skeleton.dtsi is removed from exynos4.dtsi. You mean extnos5440.dtsi? > > Eventually the correct starting addresses and sizes should be used > but I didn't find that information. > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > --- > > arch/arm/boot/dts/exynos5440-sd5v1.dts | 5 +++++ > arch/arm/boot/dts/exynos5440-ssdk5440.dts | 5 +++++ > 2 files changed, 10 insertions(+) > > diff --git a/arch/arm/boot/dts/exynos5440-sd5v1.dts b/arch/arm/boot/dts/exynos5440-sd5v1.dts > index a98501bab6fc..333db4ff373a 100644 > --- a/arch/arm/boot/dts/exynos5440-sd5v1.dts > +++ b/arch/arm/boot/dts/exynos5440-sd5v1.dts > @@ -20,6 +20,11 @@ > bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; > }; > > + memory { > + device_type = "memory"; > + reg = <0 0>; > + }; > + > fixed-rate-clocks { > xtal { > compatible = "samsung,clock-xtal"; > diff --git a/arch/arm/boot/dts/exynos5440-ssdk5440.dts b/arch/arm/boot/dts/exynos5440-ssdk5440.dts > index 6a0d802e87c8..82fea6f94704 100644 > --- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts > +++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts > @@ -21,6 +21,11 @@ > bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; > }; > > + memory { > + device_type = "memory"; > + reg = <0 0>; > + }; This looks okay, but the default size and address cells won't be present. Won't that be a problem? Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello Bartlomiej, On 08/31/2016 07:22 PM, Bartlomiej Zolnierkiewicz wrote: > > Hi, > > On Wednesday, August 31, 2016 02:14:33 PM Javier Martinez Canillas wrote: >> The skeleton.dtsi file was removed in ARM64 for different reasons as >> explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi"). >> >> These also applies to ARM and it will also allow to get rid of the >> following DTC warnings in the future: >> >> "Node /memory has a reg or ranges property, but no unit name" >> >> But these boards don't have a memory node defined, so removing the >> skeleton.dtsi inclusion in exynos4.dtsi will cause a change in the >> compiled DTB. Add a dummy memory node so the compiled DTB doesn't >> change if the skeleton.dtsi is removed from exynos4.dtsi. >> >> Eventually the correct starting addresses and sizes should be used >> but I didn't find that information. >> >> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> >> --- >> >> arch/arm/boot/dts/exynos5440-sd5v1.dts | 5 +++++ >> arch/arm/boot/dts/exynos5440-ssdk5440.dts | 5 +++++ >> 2 files changed, 10 insertions(+) >> >> diff --git a/arch/arm/boot/dts/exynos5440-sd5v1.dts b/arch/arm/boot/dts/exynos5440-sd5v1.dts >> index a98501bab6fc..333db4ff373a 100644 >> --- a/arch/arm/boot/dts/exynos5440-sd5v1.dts >> +++ b/arch/arm/boot/dts/exynos5440-sd5v1.dts >> @@ -20,6 +20,11 @@ >> bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; >> }; >> >> + memory { >> + device_type = "memory"; >> + reg = <0 0>; >> + }; > > I think that this node deserves a FIXME comment. > Agreed. I'll add one in v2 for both nodes. Best regards,
Hello Krzysztof, On 08/31/2016 07:46 PM, Krzysztof Kozlowski wrote: > On Wed, Aug 31, 2016 at 02:14:33PM +0200, Javier Martinez Canillas wrote: >> The skeleton.dtsi file was removed in ARM64 for different reasons as >> explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi"). >> >> These also applies to ARM and it will also allow to get rid of the >> following DTC warnings in the future: >> >> "Node /memory has a reg or ranges property, but no unit name" >> >> But these boards don't have a memory node defined, so removing the >> skeleton.dtsi inclusion in exynos4.dtsi will cause a change in the >> compiled DTB. Add a dummy memory node so the compiled DTB doesn't >> change if the skeleton.dtsi is removed from exynos4.dtsi. > > You mean extnos5440.dtsi? > Yes, I meant exynos5440.dtsi, it's a commit message copy and paste error. Thanks for pointing out, I'll fix it in v2. >> >> Eventually the correct starting addresses and sizes should be used >> but I didn't find that information. >> >> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> >> --- >> >> arch/arm/boot/dts/exynos5440-sd5v1.dts | 5 +++++ >> arch/arm/boot/dts/exynos5440-ssdk5440.dts | 5 +++++ >> 2 files changed, 10 insertions(+) >> >> diff --git a/arch/arm/boot/dts/exynos5440-sd5v1.dts b/arch/arm/boot/dts/exynos5440-sd5v1.dts >> index a98501bab6fc..333db4ff373a 100644 >> --- a/arch/arm/boot/dts/exynos5440-sd5v1.dts >> +++ b/arch/arm/boot/dts/exynos5440-sd5v1.dts >> @@ -20,6 +20,11 @@ >> bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; >> }; >> >> + memory { >> + device_type = "memory"; >> + reg = <0 0>; >> + }; >> + >> fixed-rate-clocks { >> xtal { >> compatible = "samsung,clock-xtal"; >> diff --git a/arch/arm/boot/dts/exynos5440-ssdk5440.dts b/arch/arm/boot/dts/exynos5440-ssdk5440.dts >> index 6a0d802e87c8..82fea6f94704 100644 >> --- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts >> +++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts >> @@ -21,6 +21,11 @@ >> bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; >> }; >> >> + memory { >> + device_type = "memory"; >> + reg = <0 0>; >> + }; > > This looks okay, but the default size and address cells won't be > present. Won't that be a problem? > They will be present since at this point exynos5440.dtsi is still including exynos5440.dtsi, we are just overriding the memory node with the same values than skeleton.dtsi so this can be removed later in patch 7/7. > Best regards, > Krzysztof > Best regards,
On 09/01/2016 10:43 AM, Javier Martinez Canillas wrote: >>> --- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts >>> +++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts >>> @@ -21,6 +21,11 @@ >>> bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; >>> }; >>> >>> + memory { >>> + device_type = "memory"; >>> + reg = <0 0>; >>> + }; >> >> This looks okay, but the default size and address cells won't be >> present. Won't that be a problem? >> > > They will be present since at this point exynos5440.dtsi is still including > exynos5440.dtsi, we are just overriding the memory node with the same values > than skeleton.dtsi so this can be removed later in patch 7/7. I don't get it. exynos5440.dtsi does not set size/address cells in top node. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello Krzysztof, On 09/01/2016 11:05 AM, Krzysztof Kozlowski wrote: > On 09/01/2016 10:43 AM, Javier Martinez Canillas wrote: >>>> --- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts >>>> +++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts >>>> @@ -21,6 +21,11 @@ >>>> bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; >>>> }; >>>> >>>> + memory { >>>> + device_type = "memory"; >>>> + reg = <0 0>; >>>> + }; >>> >>> This looks okay, but the default size and address cells won't be >>> present. Won't that be a problem? >>> >> >> They will be present since at this point exynos5440.dtsi is still including >> exynos5440.dtsi, we are just overriding the memory node with the same values >> than skeleton.dtsi so this can be removed later in patch 7/7. > > I don't get it. exynos5440.dtsi does not set size/address cells in top node. > Sorry, maybe I'm misunderstanding your question. The size/address cells are set in the top node by exynos5440.dtsi including the skeleton.dtsi (since these are set in that included dtsi). IOW, scripts/dtc/dtx_diff doesn't show differences for these exynos5440 DTB before and after $SUBJECT. > Best regards, > Krzysztof > Best regards,
On 09/01/2016 11:19 AM, Javier Martinez Canillas wrote: > Hello Krzysztof, > > On 09/01/2016 11:05 AM, Krzysztof Kozlowski wrote: >> On 09/01/2016 10:43 AM, Javier Martinez Canillas wrote: >>>>> --- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts >>>>> +++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts >>>>> @@ -21,6 +21,11 @@ >>>>> bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; >>>>> }; >>>>> >>>>> + memory { >>>>> + device_type = "memory"; >>>>> + reg = <0 0>; >>>>> + }; >>>> >>>> This looks okay, but the default size and address cells won't be >>>> present. Won't that be a problem? >>>> >>> >>> They will be present since at this point exynos5440.dtsi is still including >>> exynos5440.dtsi, we are just overriding the memory node with the same values >>> than skeleton.dtsi so this can be removed later in patch 7/7. >> >> I don't get it. exynos5440.dtsi does not set size/address cells in top node. >> > > Sorry, maybe I'm misunderstanding your question. The size/address cells are set > in the top node by exynos5440.dtsi including the skeleton.dtsi (since these are > set in that included dtsi). Where? Nothing in my sources... 15 / { 16 compatible = "samsung,exynos5440", "samsung,exynos5"; 17 18 interrupt-parent = <&gic>; > > IOW, scripts/dtc/dtx_diff doesn't show differences for these exynos5440 DTB > before and after $SUBJECT. Maybe these are also the default values so no differences... stating them explicitly would be useful. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello Krzysztof, On 09/01/2016 11:28 AM, Krzysztof Kozlowski wrote: > On 09/01/2016 11:19 AM, Javier Martinez Canillas wrote: >> Hello Krzysztof, >> >> On 09/01/2016 11:05 AM, Krzysztof Kozlowski wrote: >>> On 09/01/2016 10:43 AM, Javier Martinez Canillas wrote: >>>>>> --- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts >>>>>> +++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts >>>>>> @@ -21,6 +21,11 @@ >>>>>> bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; >>>>>> }; >>>>>> >>>>>> + memory { >>>>>> + device_type = "memory"; >>>>>> + reg = <0 0>; >>>>>> + }; >>>>> >>>>> This looks okay, but the default size and address cells won't be >>>>> present. Won't that be a problem? >>>>> >>>> >>>> They will be present since at this point exynos5440.dtsi is still including >>>> exynos5440.dtsi, we are just overriding the memory node with the same values >>>> than skeleton.dtsi so this can be removed later in patch 7/7. >>> >>> I don't get it. exynos5440.dtsi does not set size/address cells in top node. >>> >> >> Sorry, maybe I'm misunderstanding your question. The size/address cells are set >> in the top node by exynos5440.dtsi including the skeleton.dtsi (since these are >> set in that included dtsi). > > Where? Nothing in my sources... > > 15 / { > 16 compatible = "samsung,exynos5440", "samsung,exynos5"; > 17 > 18 interrupt-parent = <&gic>; > No, I meant that these are set by the fact that exynos5440.dtsi is including the skeleton.dtsi, since the dtsi set these properties in the top node. >> >> IOW, scripts/dtc/dtx_diff doesn't show differences for these exynos5440 DTB >> before and after $SUBJECT. > > Maybe these are also the default values so no differences... stating > them explicitly would be useful. > I could do it in this patch... but I don't see why that should be needed since: a) All the others Exynos SoC dtsi file don't explicitly set these properties since are set by skeleton.dtsi when including it. So not adding them keeps exynos5440.dtsi consistent with the other SoC dtsi. b) Adding those to the Exynos SoC dtsi when removing the skeleton.dtsi is done in a later patch of this series. Again, making it consistent with all the Exynos SoC dtsi since none will include skeleton.dtsi anymore. > Best regards, > Krzysztof > > Best regards,
On 09/01/2016 11:36 AM, Javier Martinez Canillas wrote: > Hello Krzysztof, > > On 09/01/2016 11:28 AM, Krzysztof Kozlowski wrote: >> On 09/01/2016 11:19 AM, Javier Martinez Canillas wrote: >>> Hello Krzysztof, >>> >>> On 09/01/2016 11:05 AM, Krzysztof Kozlowski wrote: >>>> On 09/01/2016 10:43 AM, Javier Martinez Canillas wrote: >>>>>>> --- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts >>>>>>> +++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts >>>>>>> @@ -21,6 +21,11 @@ >>>>>>> bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; >>>>>>> }; >>>>>>> >>>>>>> + memory { >>>>>>> + device_type = "memory"; >>>>>>> + reg = <0 0>; >>>>>>> + }; >>>>>> >>>>>> This looks okay, but the default size and address cells won't be >>>>>> present. Won't that be a problem? >>>>>> >>>>> >>>>> They will be present since at this point exynos5440.dtsi is still including >>>>> exynos5440.dtsi, we are just overriding the memory node with the same values >>>>> than skeleton.dtsi so this can be removed later in patch 7/7. >>>> >>>> I don't get it. exynos5440.dtsi does not set size/address cells in top node. >>>> >>> >>> Sorry, maybe I'm misunderstanding your question. The size/address cells are set >>> in the top node by exynos5440.dtsi including the skeleton.dtsi (since these are >>> set in that included dtsi). >> >> Where? Nothing in my sources... >> >> 15 / { >> 16 compatible = "samsung,exynos5440", "samsung,exynos5"; >> 17 >> 18 interrupt-parent = <&gic>; >> > > No, I meant that these are set by the fact that exynos5440.dtsi is including > the skeleton.dtsi, since the dtsi set these properties in the top node. > >>> >>> IOW, scripts/dtc/dtx_diff doesn't show differences for these exynos5440 DTB >>> before and after $SUBJECT. >> >> Maybe these are also the default values so no differences... stating >> them explicitly would be useful. >> > > I could do it in this patch... but I don't see why that should be needed since: > > a) All the others Exynos SoC dtsi file don't explicitly set these properties > since are set by skeleton.dtsi when including it. So not adding them keeps > exynos5440.dtsi consistent with the other SoC dtsi. > > b) Adding those to the Exynos SoC dtsi when removing the skeleton.dtsi is done > in a later patch of this series. Again, making it consistent with all the > Exynos SoC dtsi since none will include skeleton.dtsi anymore. Ah, I missed it. The 'b' is the solution I wanted so everything is fine. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/exynos5440-sd5v1.dts b/arch/arm/boot/dts/exynos5440-sd5v1.dts index a98501bab6fc..333db4ff373a 100644 --- a/arch/arm/boot/dts/exynos5440-sd5v1.dts +++ b/arch/arm/boot/dts/exynos5440-sd5v1.dts @@ -20,6 +20,11 @@ bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; }; + memory { + device_type = "memory"; + reg = <0 0>; + }; + fixed-rate-clocks { xtal { compatible = "samsung,clock-xtal"; diff --git a/arch/arm/boot/dts/exynos5440-ssdk5440.dts b/arch/arm/boot/dts/exynos5440-ssdk5440.dts index 6a0d802e87c8..82fea6f94704 100644 --- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts +++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts @@ -21,6 +21,11 @@ bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200"; }; + memory { + device_type = "memory"; + reg = <0 0>; + }; + fixed-rate-clocks { xtal { compatible = "samsung,clock-xtal";
The skeleton.dtsi file was removed in ARM64 for different reasons as explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi"). These also applies to ARM and it will also allow to get rid of the following DTC warnings in the future: "Node /memory has a reg or ranges property, but no unit name" But these boards don't have a memory node defined, so removing the skeleton.dtsi inclusion in exynos4.dtsi will cause a change in the compiled DTB. Add a dummy memory node so the compiled DTB doesn't change if the skeleton.dtsi is removed from exynos4.dtsi. Eventually the correct starting addresses and sizes should be used but I didn't find that information. Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> --- arch/arm/boot/dts/exynos5440-sd5v1.dts | 5 +++++ arch/arm/boot/dts/exynos5440-ssdk5440.dts | 5 +++++ 2 files changed, 10 insertions(+)