| Message ID | 20200829172532.29358-1-krzk@kernel.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [1/4] dt-bindings: display: samsung,amoled-mipi-dsi: Do not require enable-gpios on samsung,s6e63j0x03 | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success | |
| robh/dt-meta-schema | success |
On Sat, Aug 29, 2020 at 07:25:29PM +0200, Krzysztof Kozlowski wrote: > The samsung,s6e63j0x03 does not have enable GPIO, so do not require it. > This fixes dtbs_check warning: > > arch/arm/boot/dts/exynos3250-rinato.dt.yaml: panel@0: 'enable-gpios' is a required property > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Acked-by: Sam Ravnborg <sam@ravnborg.org> I expect this patch is picked up with the dts fixes. Sam > --- > .../display/panel/samsung,amoled-mipi-dsi.yaml | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/display/panel/samsung,amoled-mipi-dsi.yaml b/Documentation/devicetree/bindings/display/panel/samsung,amoled-mipi-dsi.yaml > index 96bdde9298e0..ccc482570d6a 100644 > --- a/Documentation/devicetree/bindings/display/panel/samsung,amoled-mipi-dsi.yaml > +++ b/Documentation/devicetree/bindings/display/panel/samsung,amoled-mipi-dsi.yaml > @@ -12,6 +12,17 @@ maintainers: > allOf: > - $ref: panel-common.yaml# > > + - if: > + properties: > + compatible: > + contains: > + enum: > + - samsung,s6e3ha2 > + - samsung,s6e3hf2 > + then: > + required: > + - enable-gpios > + > properties: > compatible: > enum: > @@ -39,7 +50,6 @@ required: > - vdd3-supply > - vci-supply > - reset-gpios > - - enable-gpios > > additionalProperties: false > > -- > 2.17.1
Hi Krzysztof, On 29.08.2020 19:25, Krzysztof Kozlowski wrote: > Commit 52005dece527 ("ARM: dts: Add assigned clock parents to CMU node > for exynos3250") added assigned clocks under Clock Management Unit to > fix hangs when accessing ISP registers. > > This is not the place for it as CMU does not have a required "clocks" > property: > > arch/arm/boot/dts/exynos3250-artik5-eval.dt.yaml: clock-controller@10030000: 'clocks' is a dependency of 'assigned-clocks' > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > --- > > Not tested and I wonder whether actually correct. For example, what will > happen if devfreq (exynos-bus) is not built in? > > Could someone verify it? Sorry, but this patch is not correct. Those clocks has noting with bus-freq. The assigned clocks property should stay where it is. Maybe one need to fix the schemas for dts verification. Those clocks has to be set (and so generic clock framework does) according to the assigned clocks properties once the clock controller is instantiated. The only alternative would be to add exynos-subcmu variant to properly link CMU with the ISP power domain, but assuming that there is no Exynos 3250 ISP driver in mainline (and probably never will be), it is safe to keep those clocks sourced from 24MHz crystal. > --- > arch/arm/boot/dts/exynos3250.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi > index c67c70e46794..6d467022d929 100644 > --- a/arch/arm/boot/dts/exynos3250.dtsi > +++ b/arch/arm/boot/dts/exynos3250.dtsi > @@ -214,10 +214,6 @@ > compatible = "samsung,exynos3250-cmu"; > reg = <0x10030000 0x20000>; > #clock-cells = <1>; > - assigned-clocks = <&cmu CLK_MOUT_ACLK_400_MCUISP_SUB>, > - <&cmu CLK_MOUT_ACLK_266_SUB>; > - assigned-clock-parents = <&cmu CLK_FIN_PLL>, > - <&cmu CLK_FIN_PLL>; > }; > > cmu_dmc: clock-controller@105c0000 { > @@ -835,6 +831,8 @@ > compatible = "samsung,exynos-bus"; > clocks = <&cmu CLK_DIV_ACLK_400_MCUISP>; > clock-names = "bus"; > + assigned-clocks = <&cmu CLK_MOUT_ACLK_400_MCUISP_SUB>; > + assigned-clock-parents = <&cmu CLK_FIN_PLL>; > operating-points-v2 = <&bus_mcuisp_opp_table>; > status = "disabled"; > }; > @@ -843,6 +841,8 @@ > compatible = "samsung,exynos-bus"; > clocks = <&cmu CLK_DIV_ACLK_266>; > clock-names = "bus"; > + assigned-clocks = <&cmu CLK_MOUT_ACLK_266_SUB>; > + assigned-clock-parents = <&cmu CLK_FIN_PLL>; > operating-points-v2 = <&bus_isp_opp_table>; > status = "disabled"; > }; Best regards
On Mon, Aug 31, 2020 at 10:11:02AM +0200, Marek Szyprowski wrote: > Hi Krzysztof, > > On 29.08.2020 19:25, Krzysztof Kozlowski wrote: > > Commit 52005dece527 ("ARM: dts: Add assigned clock parents to CMU node > > for exynos3250") added assigned clocks under Clock Management Unit to > > fix hangs when accessing ISP registers. > > > > This is not the place for it as CMU does not have a required "clocks" > > property: > > > > arch/arm/boot/dts/exynos3250-artik5-eval.dt.yaml: clock-controller@10030000: 'clocks' is a dependency of 'assigned-clocks' > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > > > --- > > > > Not tested and I wonder whether actually correct. For example, what will > > happen if devfreq (exynos-bus) is not built in? > > > > Could someone verify it? > > Sorry, but this patch is not correct. Those clocks has noting with > bus-freq. The assigned clocks property should stay where it is. Maybe > one need to fix the schemas for dts verification. Those clocks has to be > set (and so generic clock framework does) according to the assigned > clocks properties once the clock controller is instantiated. > > The only alternative would be to add exynos-subcmu variant to properly > link CMU with the ISP power domain, but assuming that there is no Exynos > 3250 ISP driver in mainline (and probably never will be), it is safe to > keep those clocks sourced from 24MHz crystal. Thanks for the clarification. Another solution to silence the warning could be to add a "clocks" property for FIN_PLL, although the driver actually does not take it. This is the only remaining dtschema check warning on Exynos3250 so it would be nice to at least silence it. My goal is to have all them schema-correct, or as close as possible (for Exynos4 the camera node is a trouble). Best regards, Krzysztof
Hi Krzysztof, On 31.08.2020 10:19, Krzysztof Kozlowski wrote: > On Mon, Aug 31, 2020 at 10:11:02AM +0200, Marek Szyprowski wrote: >> On 29.08.2020 19:25, Krzysztof Kozlowski wrote: >>> Commit 52005dece527 ("ARM: dts: Add assigned clock parents to CMU node >>> for exynos3250") added assigned clocks under Clock Management Unit to >>> fix hangs when accessing ISP registers. >>> >>> This is not the place for it as CMU does not have a required "clocks" >>> property: >>> >>> arch/arm/boot/dts/exynos3250-artik5-eval.dt.yaml: clock-controller@10030000: 'clocks' is a dependency of 'assigned-clocks' >>> >>> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> >>> >>> --- >>> >>> Not tested and I wonder whether actually correct. For example, what will >>> happen if devfreq (exynos-bus) is not built in? >>> >>> Could someone verify it? >> Sorry, but this patch is not correct. Those clocks has noting with >> bus-freq. The assigned clocks property should stay where it is. Maybe >> one need to fix the schemas for dts verification. Those clocks has to be >> set (and so generic clock framework does) according to the assigned >> clocks properties once the clock controller is instantiated. >> >> The only alternative would be to add exynos-subcmu variant to properly >> link CMU with the ISP power domain, but assuming that there is no Exynos >> 3250 ISP driver in mainline (and probably never will be), it is safe to >> keep those clocks sourced from 24MHz crystal. > Thanks for the clarification. Another solution to silence the warning > could be to add a "clocks" property for FIN_PLL, although the driver > actually does not take it. Okay, that would be fine. It would make dts match better the hardware and this would even help generic clock framework to always instantiate CMU after the oscilator fixed-clock (there have been some hacks there at some point for that...) Best regards
On Mon, Aug 31, 2020 at 10:19:06AM +0200, Krzysztof Kozlowski wrote: > On Mon, Aug 31, 2020 at 10:11:02AM +0200, Marek Szyprowski wrote: > > Hi Krzysztof, > > > > On 29.08.2020 19:25, Krzysztof Kozlowski wrote: > > > Commit 52005dece527 ("ARM: dts: Add assigned clock parents to CMU node > > > for exynos3250") added assigned clocks under Clock Management Unit to > > > fix hangs when accessing ISP registers. > > > > > > This is not the place for it as CMU does not have a required "clocks" > > > property: > > > > > > arch/arm/boot/dts/exynos3250-artik5-eval.dt.yaml: clock-controller@10030000: 'clocks' is a dependency of 'assigned-clocks' > > > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > > > > > --- > > > > > > Not tested and I wonder whether actually correct. For example, what will > > > happen if devfreq (exynos-bus) is not built in? > > > > > > Could someone verify it? > > > > Sorry, but this patch is not correct. Those clocks has noting with > > bus-freq. The assigned clocks property should stay where it is. Maybe > > one need to fix the schemas for dts verification. Those clocks has to be > > set (and so generic clock framework does) according to the assigned > > clocks properties once the clock controller is instantiated. > > > > The only alternative would be to add exynos-subcmu variant to properly > > link CMU with the ISP power domain, but assuming that there is no Exynos > > 3250 ISP driver in mainline (and probably never will be), it is safe to > > keep those clocks sourced from 24MHz crystal. > > Thanks for the clarification. Another solution to silence the warning > could be to add a "clocks" property for FIN_PLL, although the driver > actually does not take it. > > This is the only remaining dtschema check warning on Exynos3250 so it > would be nice to at least silence it. My goal is to have all them > schema-correct, or as close as possible (for Exynos4 the camera node is > a trouble). BTW, if you have some time, it would be awesome if you could test all the series (on Exynos3250 obviously with this patch reverted): https://github.com/krzk/linux/tree/for-next/dts-exynos-schema-cleanups The Exynos5 cleanup is ongoing, so there will be more patches. But Exynos3 and Exynos4 I finished. Best regards, Krzysztof
On 29.08.2020 19:25, Krzysztof Kozlowski wrote: > The fixed clocks are kept under dedicated node fixed-rate-clocks, thus a > fake "reg" was added. This is not correct with dtschema as fixed-clock > binding does not have a "reg" property: > > arch/arm/boot/dts/exynos3250-artik5-eval.dt.yaml: clock@0: 'reg' does not match any of the regexes: 'pinctrl-[0-9]+' > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > arch/arm/boot/dts/exynos3250.dtsi | 42 +++++++++++++------------------ > 1 file changed, 17 insertions(+), 25 deletions(-) > > diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi > index d3fb45a56527..c67c70e46794 100644 > --- a/arch/arm/boot/dts/exynos3250.dtsi > +++ b/arch/arm/boot/dts/exynos3250.dtsi > @@ -97,33 +97,25 @@ > }; > }; > > - fixed-rate-clocks { > - #address-cells = <1>; > - #size-cells = <0>; > - > - xusbxti: clock@0 { > - compatible = "fixed-clock"; > - reg = <0>; > - clock-frequency = <0>; > - #clock-cells = <0>; > - clock-output-names = "xusbxti"; > - }; > + xusbxti: clock-0 { > + compatible = "fixed-clock"; > + clock-frequency = <0>; > + #clock-cells = <0>; > + clock-output-names = "xusbxti"; > + }; > > - xxti: clock@1 { > - compatible = "fixed-clock"; > - reg = <1>; > - clock-frequency = <0>; > - #clock-cells = <0>; > - clock-output-names = "xxti"; > - }; > + xxti: clock-1 { > + compatible = "fixed-clock"; > + clock-frequency = <0>; > + #clock-cells = <0>; > + clock-output-names = "xxti"; > + }; > > - xtcxo: clock@2 { > - compatible = "fixed-clock"; > - reg = <2>; > - clock-frequency = <0>; > - #clock-cells = <0>; > - clock-output-names = "xtcxo"; > - }; > + xtcxo: clock-2 { > + compatible = "fixed-clock"; > + clock-frequency = <0>; > + #clock-cells = <0>; > + clock-output-names = "xtcxo"; > }; > > pmu { Best regards
On Sat, Aug 29, 2020 at 07:25:30PM +0200, Krzysztof Kozlowski wrote: > The fixed clocks are kept under dedicated node fixed-rate-clocks, thus a > fake "reg" was added. This is not correct with dtschema as fixed-clock > binding does not have a "reg" property: > > arch/arm/boot/dts/exynos3250-artik5-eval.dt.yaml: clock@0: 'reg' does not match any of the regexes: 'pinctrl-[0-9]+' > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > --- > arch/arm/boot/dts/exynos3250.dtsi | 42 +++++++++++++------------------ > 1 file changed, 17 insertions(+), 25 deletions(-) Applied. Best regards, Krzysztof
On Sat, Aug 29, 2020 at 07:25:32PM +0200, Krzysztof Kozlowski wrote: > The binding for DesignWare HS OTG USB 2.0 in Samsung SoCs take only one > compatible. This fixes dtbs_check warnings like: > > arch/arm/boot/dts/exynos3250-artik5-eval.dt.yaml: hsotg@12480000: > compatible: ['samsung,s3c6400-hsotg', 'snps,dwc2'] is not valid under any of the given schemas (Possible causes of the failure): > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > --- > arch/arm/boot/dts/exynos3250.dtsi | 2 +- Applied. Best regards, Krzysztof
On Sat, 29 Aug 2020 19:25:29 +0200, Krzysztof Kozlowski wrote: > The samsung,s6e63j0x03 does not have enable GPIO, so do not require it. > This fixes dtbs_check warning: > > arch/arm/boot/dts/exynos3250-rinato.dt.yaml: panel@0: 'enable-gpios' is a required property > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > --- > .../display/panel/samsung,amoled-mipi-dsi.yaml | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > Applied, thanks!
diff --git a/Documentation/devicetree/bindings/display/panel/samsung,amoled-mipi-dsi.yaml b/Documentation/devicetree/bindings/display/panel/samsung,amoled-mipi-dsi.yaml index 96bdde9298e0..ccc482570d6a 100644 --- a/Documentation/devicetree/bindings/display/panel/samsung,amoled-mipi-dsi.yaml +++ b/Documentation/devicetree/bindings/display/panel/samsung,amoled-mipi-dsi.yaml @@ -12,6 +12,17 @@ maintainers: allOf: - $ref: panel-common.yaml# + - if: + properties: + compatible: + contains: + enum: + - samsung,s6e3ha2 + - samsung,s6e3hf2 + then: + required: + - enable-gpios + properties: compatible: enum: @@ -39,7 +50,6 @@ required: - vdd3-supply - vci-supply - reset-gpios - - enable-gpios additionalProperties: false
The samsung,s6e63j0x03 does not have enable GPIO, so do not require it. This fixes dtbs_check warning: arch/arm/boot/dts/exynos3250-rinato.dt.yaml: panel@0: 'enable-gpios' is a required property Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- .../display/panel/samsung,amoled-mipi-dsi.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)