| Message ID | 20220815041248.53268-2-samuel@sholland.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | soc: sunxi: sram: Fixes and D1 support | expand |
On Sun, 14 Aug 2022 23:12:38 -0500 Samuel Holland <samuel@sholland.org> wrote: > Use enumerations where appropriate to combine "const" choices and > deduplicate fallback compatible strings. > > Suggested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Signed-off-by: Samuel Holland <samuel@sholland.org> Verified to be a pure transformation. Reviewed-by: Andre Przywara <andre.przywara@arm.com> Cheers, Andre > --- > > Changes in v2: > - New patch to first clean up the binding > > .../allwinner,sun4i-a10-system-control.yaml | 81 +++++++------------ > 1 file changed, 31 insertions(+), 50 deletions(-) > > diff --git a/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml b/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml > index 1c426c211e36..5055c9081059 100644 > --- a/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml > +++ b/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml > @@ -24,32 +24,30 @@ properties: > > compatible: > oneOf: > - - const: allwinner,sun4i-a10-sram-controller > + - enum: > + - allwinner,sun4i-a10-sram-controller > + - allwinner,sun50i-a64-sram-controller > deprecated: true > - - const: allwinner,sun4i-a10-system-control > - - const: allwinner,sun5i-a13-system-control > + - enum: > + - allwinner,sun4i-a10-system-control > + - allwinner,sun5i-a13-system-control > + - allwinner,sun8i-a23-system-control > + - allwinner,sun8i-h3-system-control > + - allwinner,sun50i-a64-system-control > + - allwinner,sun50i-h5-system-control > + - allwinner,sun50i-h616-system-control > - items: > - - const: allwinner,sun7i-a20-system-control > + - enum: > + - allwinner,suniv-f1c100s-system-control > + - allwinner,sun7i-a20-system-control > + - allwinner,sun8i-r40-system-control > - const: allwinner,sun4i-a10-system-control > - - const: allwinner,sun8i-a23-system-control > - - const: allwinner,sun8i-h3-system-control > - items: > - const: allwinner,sun8i-v3s-system-control > - const: allwinner,sun8i-h3-system-control > - - items: > - - const: allwinner,sun8i-r40-system-control > - - const: allwinner,sun4i-a10-system-control > - - const: allwinner,sun50i-a64-sram-controller > - deprecated: true > - - const: allwinner,sun50i-a64-system-control > - - const: allwinner,sun50i-h5-system-control > - items: > - const: allwinner,sun50i-h6-system-control > - const: allwinner,sun50i-a64-system-control > - - items: > - - const: allwinner,suniv-f1c100s-system-control > - - const: allwinner,sun4i-a10-system-control > - - const: allwinner,sun50i-h616-system-control > > reg: > maxItems: 1 > @@ -76,43 +74,26 @@ patternProperties: > - const: allwinner,sun4i-a10-sram-d > - const: allwinner,sun50i-a64-sram-c > - items: > - - const: allwinner,sun5i-a13-sram-a3-a4 > - - const: allwinner,sun4i-a10-sram-a3-a4 > - - items: > - - const: allwinner,sun7i-a20-sram-a3-a4 > + - enum: > + - allwinner,sun5i-a13-sram-a3-a4 > + - allwinner,sun7i-a20-sram-a3-a4 > - const: allwinner,sun4i-a10-sram-a3-a4 > - items: > - - const: allwinner,sun5i-a13-sram-c1 > - - const: allwinner,sun4i-a10-sram-c1 > - - items: > - - const: allwinner,sun7i-a20-sram-c1 > - - const: allwinner,sun4i-a10-sram-c1 > - - items: > - - const: allwinner,sun8i-a23-sram-c1 > - - const: allwinner,sun4i-a10-sram-c1 > - - items: > - - const: allwinner,sun8i-h3-sram-c1 > + - enum: > + - allwinner,sun5i-a13-sram-c1 > + - allwinner,sun7i-a20-sram-c1 > + - allwinner,sun8i-a23-sram-c1 > + - allwinner,sun8i-h3-sram-c1 > + - allwinner,sun8i-r40-sram-c1 > + - allwinner,sun50i-a64-sram-c1 > + - allwinner,sun50i-h5-sram-c1 > + - allwinner,sun50i-h6-sram-c1 > - const: allwinner,sun4i-a10-sram-c1 > - items: > - - const: allwinner,sun8i-r40-sram-c1 > - - const: allwinner,sun4i-a10-sram-c1 > - - items: > - - const: allwinner,sun50i-a64-sram-c1 > - - const: allwinner,sun4i-a10-sram-c1 > - - items: > - - const: allwinner,sun50i-h5-sram-c1 > - - const: allwinner,sun4i-a10-sram-c1 > - - items: > - - const: allwinner,sun50i-h6-sram-c1 > - - const: allwinner,sun4i-a10-sram-c1 > - - items: > - - const: allwinner,sun5i-a13-sram-d > - - const: allwinner,sun4i-a10-sram-d > - - items: > - - const: allwinner,sun7i-a20-sram-d > - - const: allwinner,sun4i-a10-sram-d > - - items: > - - const: allwinner,suniv-f1c100s-sram-d > + - enum: > + - allwinner,suniv-f1c100s-sram-d > + - allwinner,sun5i-a13-sram-d > + - allwinner,sun7i-a20-sram-d > - const: allwinner,sun4i-a10-sram-d > - items: > - const: allwinner,sun50i-h6-sram-c
Am Montag, 15. August 2022, 06:12:38 CEST schrieb Samuel Holland: > Use enumerations where appropriate to combine "const" choices and > deduplicate fallback compatible strings. > > Suggested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Signed-off-by: Samuel Holland <samuel@sholland.org> Reviewed-by: Heiko Stuebner <heiko@sntech.de>
On 15/08/2022 07:12, Samuel Holland wrote: > Use enumerations where appropriate to combine "const" choices and > deduplicate fallback compatible strings. > > Suggested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Signed-off-by: Samuel Holland <samuel@sholland.org> > --- > > Changes in v2: Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml b/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml index 1c426c211e36..5055c9081059 100644 --- a/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml +++ b/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml @@ -24,32 +24,30 @@ properties: compatible: oneOf: - - const: allwinner,sun4i-a10-sram-controller + - enum: + - allwinner,sun4i-a10-sram-controller + - allwinner,sun50i-a64-sram-controller deprecated: true - - const: allwinner,sun4i-a10-system-control - - const: allwinner,sun5i-a13-system-control + - enum: + - allwinner,sun4i-a10-system-control + - allwinner,sun5i-a13-system-control + - allwinner,sun8i-a23-system-control + - allwinner,sun8i-h3-system-control + - allwinner,sun50i-a64-system-control + - allwinner,sun50i-h5-system-control + - allwinner,sun50i-h616-system-control - items: - - const: allwinner,sun7i-a20-system-control + - enum: + - allwinner,suniv-f1c100s-system-control + - allwinner,sun7i-a20-system-control + - allwinner,sun8i-r40-system-control - const: allwinner,sun4i-a10-system-control - - const: allwinner,sun8i-a23-system-control - - const: allwinner,sun8i-h3-system-control - items: - const: allwinner,sun8i-v3s-system-control - const: allwinner,sun8i-h3-system-control - - items: - - const: allwinner,sun8i-r40-system-control - - const: allwinner,sun4i-a10-system-control - - const: allwinner,sun50i-a64-sram-controller - deprecated: true - - const: allwinner,sun50i-a64-system-control - - const: allwinner,sun50i-h5-system-control - items: - const: allwinner,sun50i-h6-system-control - const: allwinner,sun50i-a64-system-control - - items: - - const: allwinner,suniv-f1c100s-system-control - - const: allwinner,sun4i-a10-system-control - - const: allwinner,sun50i-h616-system-control reg: maxItems: 1 @@ -76,43 +74,26 @@ patternProperties: - const: allwinner,sun4i-a10-sram-d - const: allwinner,sun50i-a64-sram-c - items: - - const: allwinner,sun5i-a13-sram-a3-a4 - - const: allwinner,sun4i-a10-sram-a3-a4 - - items: - - const: allwinner,sun7i-a20-sram-a3-a4 + - enum: + - allwinner,sun5i-a13-sram-a3-a4 + - allwinner,sun7i-a20-sram-a3-a4 - const: allwinner,sun4i-a10-sram-a3-a4 - items: - - const: allwinner,sun5i-a13-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun7i-a20-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun8i-a23-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun8i-h3-sram-c1 + - enum: + - allwinner,sun5i-a13-sram-c1 + - allwinner,sun7i-a20-sram-c1 + - allwinner,sun8i-a23-sram-c1 + - allwinner,sun8i-h3-sram-c1 + - allwinner,sun8i-r40-sram-c1 + - allwinner,sun50i-a64-sram-c1 + - allwinner,sun50i-h5-sram-c1 + - allwinner,sun50i-h6-sram-c1 - const: allwinner,sun4i-a10-sram-c1 - items: - - const: allwinner,sun8i-r40-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun50i-a64-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun50i-h5-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun50i-h6-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun5i-a13-sram-d - - const: allwinner,sun4i-a10-sram-d - - items: - - const: allwinner,sun7i-a20-sram-d - - const: allwinner,sun4i-a10-sram-d - - items: - - const: allwinner,suniv-f1c100s-sram-d + - enum: + - allwinner,suniv-f1c100s-sram-d + - allwinner,sun5i-a13-sram-d + - allwinner,sun7i-a20-sram-d - const: allwinner,sun4i-a10-sram-d - items: - const: allwinner,sun50i-h6-sram-c
Use enumerations where appropriate to combine "const" choices and deduplicate fallback compatible strings. Suggested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Signed-off-by: Samuel Holland <samuel@sholland.org> --- Changes in v2: - New patch to first clean up the binding .../allwinner,sun4i-a10-system-control.yaml | 81 +++++++------------ 1 file changed, 31 insertions(+), 50 deletions(-)