Messages in this thread | | | Date | Tue, 10 Jan 2023 15:17:34 +0100 | From | Neil Armstrong <> | Subject | Re: [PATCH v2 09/11] dt-bindings: mmc: convert amlogic,meson-gx.txt to dt-schema |
| |
On 10/01/2023 11:17, Krzysztof Kozlowski wrote: > On 09/01/2023 13:53, Neil Armstrong wrote: >> Convert the Amlogic SD / eMMC controller for S905/GXBB family SoCs >> to dt-schema. >> >> Take in account the used variant with amlogic,meson-gx-mmc. >> >> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> >> --- >> .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 75 ++++++++++++++++++++++ >> .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 39 ----------- >> 2 files changed, 75 insertions(+), 39 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml >> new file mode 100644 >> index 000000000000..30228964fd9c >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml >> @@ -0,0 +1,75 @@ >> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/mmc/amlogic,meson-gx-mmc.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: Amlogic SD / eMMC controller for S905/GXBB family SoCs >> + >> +description: >> + The MMC 5.1 compliant host controller on Amlogic provides the >> + interface for SD, eMMC and SDIO devices >> + >> +maintainers: >> + - Neil Armstrong <neil.armstrong@linaro.org> >> + >> +allOf: >> + - $ref: mmc-controller.yaml# >> + >> +properties: >> + compatible: >> + oneOf: >> + - enum: >> + - amlogic,meson-gx-mmc >> + - amlogic,meson-axg-mmc >> + - items: >> + - const: amlogic,meson-gx-mmc > > This does not look correct. Either gx is alone (not compatible with > gxbb) or it is compatible with gxbb. Cannot be both.
This ishow it's used in DT:
arch/arm64/boot/dts/amlogic/meson-gx.dtsi: compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; arch/arm64/boot/dts/amlogic/meson-axg.dtsi: compatible = "amlogic,meson-axg-mmc"; arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi: compatible = "amlogic,meson-axg-mmc";
So I'll drop the amlogic,meson-gx-mmc in the first enum to have : +properties: + compatible: + oneOf: + - const: amlogic,meson-axg-mmc + - items: + - const: amlogic,meson-gx-mmc + - const: amlogic,meson-gxbb-mmc
It's right ?
Neil
> > > > Best regards, > Krzysztof >
| |