| Message ID | 20221117-b4-amlogic-bindings-convert-v1-10-3f025599b968@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | dt-bindings: first batch of dt-schema conversions for Amlogic Meson bindings | expand |
On 18/11/2022 15:33, Neil Armstrong wrote: > Convert the Amlogic SD / eMMC controller for S905/GXBB family SoCs > to dt-schema. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > --- > .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 78 ++++++++++++++++++++++ > .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 39 ----------- > 2 files changed, 78 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..c9545334fd99 > --- /dev/null > +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml > @@ -0,0 +1,78 @@ > +# 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: > + - enum: > + - amlogic,meson-gxbb-mmc > + - amlogic,meson-gxl-mmc > + - amlogic,meson-gxm-mmc > + - const: amlogic,meson-gx-mmc Mention changes in commit msg. Anyway this might not match existing usage in DTS. At least amlogic,meson-gxbb-mmc has different order. > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > + clocks: > + maxItems: 3 > + > + clock-names: > + items: > + - const: core > + - const: clkin0 > + - const: clkin1 > + > + resets: > + maxItems: 1 > + > + amlogic,dram-access-quirk: > + type: boolean > + description: > + set when controller's internal DMA engine cannot access the DRAM memory, > + like on the G12A dedicated SDIO controller. > + > +required: > + - compatible > + - reg > + - interrupts > + - clocks > + - clock-names > + - resets > + > +unevaluatedProperties: false > + > +examples: > + - | > + #include <dt-bindings/interrupt-controller/irq.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + mmc@70000 { > + compatible = "amlogic,meson-gx-mmc"; > + reg = <0x70000 0x2000>; > + interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>; > + clocks = <&clk_mmc>, <&xtal>, <&clk_div>; > + clock-names = "core", "clkin0", "clkin1"; > + pinctrl-0 = <&emm_pins>; > + resets = <&reset_mmc>; Use 4 spaces for example indentation. Best regards, Krzysztof
On Fri, 18 Nov 2022 15:33:36 +0100, Neil Armstrong wrote: > Convert the Amlogic SD / eMMC controller for S905/GXBB family SoCs > to dt-schema. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > --- > .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 78 ++++++++++++++++++++++ > .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 39 ----------- > 2 files changed, 78 insertions(+), 39 deletions(-) > Running 'make dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings. Note that it is not yet a requirement to have 0 warnings for dtbs_check. This will change in the future. Full log is available here: https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20221117-b4-amlogic-bindings-convert-v1-10-3f025599b968@linaro.org mmc@70000: compatible: 'oneOf' conditional failed, one must be fixed: arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb mmc@70000: Unevaluated properties are not allowed ('compatible' was unexpected) arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb mmc@72000: compatible: 'oneOf' conditional failed, one must be fixed: arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb mmc@72000: Unevaluated properties are not allowed ('compatible' was unexpected) arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb mmc@74000: compatible: 'oneOf' conditional failed, one must be fixed: arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb mmc@74000: Unevaluated properties are not allowed ('compatible' was unexpected) arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb sd@5000: $nodename:0: 'sd@5000' does not match '^mmc(@.*)?$' arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dtb arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dtb arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dtb arch/arm64/boot/dts/amlogic/meson-axg-s400.dtb sd@5000: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'broken-cd', 'bus-width', 'cap-sd-highspeed', 'disable-wp', 'max-frequency', 'mmc-pwrseq', 'vmmc-supply', 'vqmmc-supply' were unexpected) arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dtb arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dtb sd@5000: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'bus-width', 'cap-sd-highspeed', 'disable-wp', 'max-frequency', 'mmc-pwrseq', 'non-removable', 'sd-uhs-sdr104', 'vmmc-supply', 'vqmmc-supply', 'wifi@1' were unexpected) arch/arm64/boot/dts/amlogic/meson-axg-s400.dtb sd@5000: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'bus-width', 'cap-sd-highspeed', 'disable-wp', 'max-frequency', 'mmc-pwrseq', 'non-removable', 'vmmc-supply', 'vqmmc-supply', 'wifi@1' were unexpected) arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dtb sd@ffe03000: $nodename:0: 'sd@ffe03000' does not match '^mmc(@.*)?$' arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dtb arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dtb arch/arm64/boot/dts/amlogic/meson-g12a-u200.dtb arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dtb arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dtb arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dtb arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dtb arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtb arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dtb arch/arm64/boot/dts/amlogic/meson-g12b-s922x-khadas-vim3.dtb arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dtb arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dtb arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dtb arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dtb arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dtb arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dtb arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dtb arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dtb arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dtb arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dtb arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dtb sd@ffe03000: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'bus-width', 'cap-sd-highspeed', 'disable-wp', 'keep-power-in-suspend', 'max-frequency', 'mmc-pwrseq', 'non-removable', 'sd-uhs-sdr104', 'vmmc-supply', 'vqmmc-supply' were unexpected) arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dtb arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dtb arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dtb arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dtb arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dtb sd@ffe03000: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'bus-width', 'cap-sd-highspeed', 'disable-wp', 'keep-power-in-suspend', 'max-frequency', 'mmc-pwrseq', 'non-removable', 'sd-uhs-sdr50', 'vmmc-supply', 'vqmmc-supply', 'wifi@1' were unexpected) arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dtb arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dtb arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dtb arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dtb arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dtb sd@ffe03000: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'bus-width', 'cap-sd-highspeed', 'disable-wp', 'keep-power-in-suspend', 'max-frequency', 'mmc-pwrseq', 'non-removable', 'vmmc-supply', 'vqmmc-supply', 'wifi@1' were unexpected) arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dtb arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dtb arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dtb arch/arm64/boot/dts/amlogic/meson-g12b-s922x-khadas-vim3.dtb arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dtb sd@ffe05000: $nodename:0: 'sd@ffe05000' does not match '^mmc(@.*)?$' arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dtb arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dtb arch/arm64/boot/dts/amlogic/meson-g12a-u200.dtb arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dtb arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dtb arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dtb arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dtb arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtb arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dtb arch/arm64/boot/dts/amlogic/meson-g12b-s922x-khadas-vim3.dtb arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dtb arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dtb arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dtb arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dtb arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dtb arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dtb arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dtb arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dtb arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dtb arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dtb arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dtb sd@ffe05000: Unevaluated properties are not allowed ('bus-width', 'cap-sd-highspeed', 'cd-gpios', 'disable-wp', 'max-frequency', 'sd-uhs-sdr104', 'sd-uhs-sdr12', 'sd-uhs-sdr25', 'sd-uhs-sdr50', 'vmmc-supply', 'vqmmc-supply' were unexpected) arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dtb arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dtb sd@ffe05000: Unevaluated properties are not allowed ('bus-width', 'cap-sd-highspeed', 'cd-gpios', 'disable-wp', 'max-frequency', 'vmmc-supply', 'vqmmc-supply' were unexpected) arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dtb arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dtb arch/arm64/boot/dts/amlogic/meson-g12a-u200.dtb arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dtb arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dtb arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dtb arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dtb arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtb arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dtb arch/arm64/boot/dts/amlogic/meson-g12b-s922x-khadas-vim3.dtb arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dtb arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dtb arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dtb arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dtb arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dtb arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dtb arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dtb arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dtb arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dtb
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..c9545334fd99 --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml @@ -0,0 +1,78 @@ +# 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: + - enum: + - amlogic,meson-gxbb-mmc + - amlogic,meson-gxl-mmc + - amlogic,meson-gxm-mmc + - const: amlogic,meson-gx-mmc + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 3 + + clock-names: + items: + - const: core + - const: clkin0 + - const: clkin1 + + resets: + maxItems: 1 + + amlogic,dram-access-quirk: + type: boolean + description: + set when controller's internal DMA engine cannot access the DRAM memory, + like on the G12A dedicated SDIO controller. + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + mmc@70000 { + compatible = "amlogic,meson-gx-mmc"; + reg = <0x70000 0x2000>; + interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>; + clocks = <&clk_mmc>, <&xtal>, <&clk_div>; + clock-names = "core", "clkin0", "clkin1"; + pinctrl-0 = <&emm_pins>; + resets = <&reset_mmc>; + }; diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt deleted file mode 100644 index ccc5358db131..000000000000 --- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt +++ /dev/null @@ -1,39 +0,0 @@ -Amlogic SD / eMMC controller for S905/GXBB family SoCs - -The MMC 5.1 compliant host controller on Amlogic provides the -interface for SD, eMMC and SDIO devices. - -This file documents the properties in addition to those available in -the MMC core bindings, documented by mmc.txt. - -Required properties: -- compatible : contains one of: - - "amlogic,meson-gx-mmc" - - "amlogic,meson-gxbb-mmc" - - "amlogic,meson-gxl-mmc" - - "amlogic,meson-gxm-mmc" - - "amlogic,meson-axg-mmc" -- clocks : A list of phandle + clock-specifier pairs for the clocks listed in clock-names. -- clock-names: Should contain the following: - "core" - Main peripheral bus clock - "clkin0" - Parent clock of internal mux - "clkin1" - Other parent clock of internal mux - The driver has an internal mux clock which switches between clkin0 and clkin1 depending on the - clock rate requested by the MMC core. -- resets : phandle of the internal reset line - -Optional properties: -- amlogic,dram-access-quirk: set when controller's internal DMA engine cannot access the - DRAM memory, like on the G12A dedicated SDIO controller. - -Example: - - sd_emmc_a: mmc@70000 { - compatible = "amlogic,meson-gxbb-mmc"; - reg = <0x0 0x70000 0x0 0x2000>; - interrupts = < GIC_SPI 216 IRQ_TYPE_EDGE_RISING>; - clocks = <&clkc CLKID_SD_EMMC_A>, <&xtal>, <&clkc CLKID_FCLK_DIV2>; - clock-names = "core", "clkin0", "clkin1"; - pinctrl-0 = <&emmc_pins>; - resets = <&reset RESET_SD_EMMC_A>; - };
Convert the Amlogic SD / eMMC controller for S905/GXBB family SoCs to dt-schema. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 78 ++++++++++++++++++++++ .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 39 ----------- 2 files changed, 78 insertions(+), 39 deletions(-)