| Message ID | 1436333790-18219-2-git-send-email-javier@osg.samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08.07.2015 14:36, Javier Martinez Canillas wrote: > The dtc compiler combines all the defined nodes that have the same path > so a device node definition can be in one file and later be extended in > another one. > > That's the case of the Exynos5250 pinctrl device nodes that are defined > in the exynos5250.dtsi file and extended in exynos5250-pinctrl.dtsi. > > But since the exynos5250.dtsi file includes the exynos5250-pinctrl.dtsi > before the pinctrl device nodes are actually defined, the definition of > the pinctrl device nodes happens in exynos5250-pinctrl.dtsi and are > extended in exynos5250.dtsi. > > That is the opposite of the original intention so even when there is no > difference in practice, the exynos5250-pinctrl.dtsi include should be > moved at the end of the exynos5250.dtsi file after the pinctrl device > nodes have been already defined. > > This will also allow to later change the exynos5250-pinctrl.dtsi file > to use labels instead of full paths to extend the pinctrl nodes. Since > keeping the include at the top, would cause a dtc build error due the > pinctrl labels not being defined yet. > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > --- > > arch/arm/boot/dts/exynos5250.dtsi | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Yeah, I stomped on this too. I left it as is because it is more natural to have all includes at the beginning... but DTSI for Exynos3250 and 4415 already follow such convention and extending by labels is nice too, so overall I agree: Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Best regards, Krzysztof
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index bf9bee67c416..4a1f88300a28 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -19,7 +19,6 @@ #include <dt-bindings/clock/exynos5250.h> #include "exynos5.dtsi" -#include "exynos5250-pinctrl.dtsi" #include "exynos4-cpu-thermal.dtsi" #include <dt-bindings/clock/exynos-audss-clk.h> @@ -1062,3 +1061,5 @@ clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>; clock-names = "uart", "clk_uart_baud0"; }; + +#include "exynos5250-pinctrl.dtsi"
The dtc compiler combines all the defined nodes that have the same path so a device node definition can be in one file and later be extended in another one. That's the case of the Exynos5250 pinctrl device nodes that are defined in the exynos5250.dtsi file and extended in exynos5250-pinctrl.dtsi. But since the exynos5250.dtsi file includes the exynos5250-pinctrl.dtsi before the pinctrl device nodes are actually defined, the definition of the pinctrl device nodes happens in exynos5250-pinctrl.dtsi and are extended in exynos5250.dtsi. That is the opposite of the original intention so even when there is no difference in practice, the exynos5250-pinctrl.dtsi include should be moved at the end of the exynos5250.dtsi file after the pinctrl device nodes have been already defined. This will also allow to later change the exynos5250-pinctrl.dtsi file to use labels instead of full paths to extend the pinctrl nodes. Since keeping the include at the top, would cause a dtc build error due the pinctrl labels not being defined yet. Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> --- arch/arm/boot/dts/exynos5250.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)