| Message ID | 20211126113924.310459-4-miquel.raynal@bootlin.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | External ECC engines & Macronix support | expand |
On Fri, 26 Nov 2021 12:39:07 +0100, Miquel Raynal wrote: > Move the NAND chip description out of the NAND controller file. Indeed, > a subsequent part of the properties supported by a raw NAND chip are > also supported by SPI-NAND chips. So let's create a generic NAND chip > description which will be pulled by nand-controller.yaml and later by > spi-nand.yaml as well. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > --- > .../devicetree/bindings/mtd/nand-chip.yaml | 71 +++++++++++++++++++ > .../bindings/mtd/nand-controller.yaml | 53 ++------------ > 2 files changed, 75 insertions(+), 49 deletions(-) > create mode 100644 Documentation/devicetree/bindings/mtd/nand-chip.yaml > 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/patch/1560072 nand-controller@112000: '#address-cells' is a required property arch/arm/boot/dts/imx6dl-aristainetos2_4.dt.yaml arch/arm/boot/dts/imx6dl-aristainetos2_7.dt.yaml arch/arm/boot/dts/imx6dl-aristainetos_4.dt.yaml arch/arm/boot/dts/imx6dl-aristainetos_7.dt.yaml arch/arm/boot/dts/imx6dl-gw51xx.dt.yaml arch/arm/boot/dts/imx6dl-gw52xx.dt.yaml arch/arm/boot/dts/imx6dl-gw53xx.dt.yaml arch/arm/boot/dts/imx6dl-gw54xx.dt.yaml arch/arm/boot/dts/imx6dl-gw551x.dt.yaml arch/arm/boot/dts/imx6dl-gw552x.dt.yaml arch/arm/boot/dts/imx6dl-gw553x.dt.yaml arch/arm/boot/dts/imx6dl-gw5907.dt.yaml arch/arm/boot/dts/imx6dl-gw5910.dt.yaml arch/arm/boot/dts/imx6dl-gw5912.dt.yaml arch/arm/boot/dts/imx6dl-gw5913.dt.yaml arch/arm/boot/dts/imx6dl-icore.dt.yaml arch/arm/boot/dts/imx6dl-icore-mipi.dt.yaml arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dt.yaml arch/arm/boot/dts/imx6dl-phytec-pbab01.dt.yaml arch/arm/boot/dts/imx6dl-sabreauto.dt.yaml arch/arm/boot/dts/imx6dl-tx6dl-comtft.dt.yaml arch/arm/boot/dts/imx6dl-tx6s-8034.dt.yaml arch/arm/boot/dts/imx6dl-tx6s-8034-mb7.dt.yaml arch/arm/boot/dts/imx6dl-tx6u-801x.dt.yaml arch/arm/boot/dts/imx6dl-tx6u-80xx-mb7.dt.yaml arch/arm/boot/dts/imx6dl-tx6u-811x.dt.yaml arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dt.yaml arch/arm/boot/dts/imx6q-cm-fx6.dt.yaml arch/arm/boot/dts/imx6q-evi.dt.yaml arch/arm/boot/dts/imx6q-gw51xx.dt.yaml arch/arm/boot/dts/imx6q-gw52xx.dt.yaml arch/arm/boot/dts/imx6q-gw53xx.dt.yaml arch/arm/boot/dts/imx6q-gw54xx.dt.yaml arch/arm/boot/dts/imx6q-gw551x.dt.yaml arch/arm/boot/dts/imx6q-gw552x.dt.yaml arch/arm/boot/dts/imx6q-gw553x.dt.yaml arch/arm/boot/dts/imx6q-gw5907.dt.yaml arch/arm/boot/dts/imx6q-gw5910.dt.yaml arch/arm/boot/dts/imx6q-gw5912.dt.yaml arch/arm/boot/dts/imx6q-gw5913.dt.yaml arch/arm/boot/dts/imx6q-icore.dt.yaml arch/arm/boot/dts/imx6q-icore-mipi.dt.yaml arch/arm/boot/dts/imx6q-icore-ofcap10.dt.yaml arch/arm/boot/dts/imx6q-icore-ofcap12.dt.yaml arch/arm/boot/dts/imx6q-logicpd.dt.yaml arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dt.yaml arch/arm/boot/dts/imx6q-phytec-pbab01.dt.yaml arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dt.yaml arch/arm/boot/dts/imx6qp-sabreauto.dt.yaml arch/arm/boot/dts/imx6q-sabreauto.dt.yaml arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dt.yaml arch/arm/boot/dts/imx6q-tx6q-1010.dt.yaml arch/arm/boot/dts/imx6q-tx6q-10x0-mb7.dt.yaml arch/arm/boot/dts/imx6q-tx6q-1110.dt.yaml arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dt.yaml arch/arm/boot/dts/imx6q-utilite-pro.dt.yaml nand-controller@112000: '#size-cells' is a required property arch/arm/boot/dts/imx6dl-aristainetos2_4.dt.yaml arch/arm/boot/dts/imx6dl-aristainetos2_7.dt.yaml arch/arm/boot/dts/imx6dl-aristainetos_4.dt.yaml arch/arm/boot/dts/imx6dl-aristainetos_7.dt.yaml arch/arm/boot/dts/imx6dl-gw51xx.dt.yaml arch/arm/boot/dts/imx6dl-gw52xx.dt.yaml arch/arm/boot/dts/imx6dl-gw53xx.dt.yaml arch/arm/boot/dts/imx6dl-gw54xx.dt.yaml arch/arm/boot/dts/imx6dl-gw551x.dt.yaml arch/arm/boot/dts/imx6dl-gw552x.dt.yaml arch/arm/boot/dts/imx6dl-gw553x.dt.yaml arch/arm/boot/dts/imx6dl-gw5907.dt.yaml arch/arm/boot/dts/imx6dl-gw5910.dt.yaml arch/arm/boot/dts/imx6dl-gw5912.dt.yaml arch/arm/boot/dts/imx6dl-gw5913.dt.yaml arch/arm/boot/dts/imx6dl-icore.dt.yaml arch/arm/boot/dts/imx6dl-icore-mipi.dt.yaml arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dt.yaml arch/arm/boot/dts/imx6dl-phytec-pbab01.dt.yaml arch/arm/boot/dts/imx6dl-sabreauto.dt.yaml arch/arm/boot/dts/imx6dl-tx6dl-comtft.dt.yaml arch/arm/boot/dts/imx6dl-tx6s-8034.dt.yaml arch/arm/boot/dts/imx6dl-tx6s-8034-mb7.dt.yaml arch/arm/boot/dts/imx6dl-tx6u-801x.dt.yaml arch/arm/boot/dts/imx6dl-tx6u-80xx-mb7.dt.yaml arch/arm/boot/dts/imx6dl-tx6u-811x.dt.yaml arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dt.yaml arch/arm/boot/dts/imx6q-cm-fx6.dt.yaml arch/arm/boot/dts/imx6q-evi.dt.yaml arch/arm/boot/dts/imx6q-gw51xx.dt.yaml arch/arm/boot/dts/imx6q-gw52xx.dt.yaml arch/arm/boot/dts/imx6q-gw53xx.dt.yaml arch/arm/boot/dts/imx6q-gw54xx.dt.yaml arch/arm/boot/dts/imx6q-gw551x.dt.yaml arch/arm/boot/dts/imx6q-gw552x.dt.yaml arch/arm/boot/dts/imx6q-gw553x.dt.yaml arch/arm/boot/dts/imx6q-gw5907.dt.yaml arch/arm/boot/dts/imx6q-gw5910.dt.yaml arch/arm/boot/dts/imx6q-gw5912.dt.yaml arch/arm/boot/dts/imx6q-gw5913.dt.yaml arch/arm/boot/dts/imx6q-icore.dt.yaml arch/arm/boot/dts/imx6q-icore-mipi.dt.yaml arch/arm/boot/dts/imx6q-icore-ofcap10.dt.yaml arch/arm/boot/dts/imx6q-icore-ofcap12.dt.yaml arch/arm/boot/dts/imx6q-logicpd.dt.yaml arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dt.yaml arch/arm/boot/dts/imx6q-phytec-pbab01.dt.yaml arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dt.yaml arch/arm/boot/dts/imx6qp-sabreauto.dt.yaml arch/arm/boot/dts/imx6q-sabreauto.dt.yaml arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dt.yaml arch/arm/boot/dts/imx6q-tx6q-1010.dt.yaml arch/arm/boot/dts/imx6q-tx6q-10x0-mb7.dt.yaml arch/arm/boot/dts/imx6q-tx6q-1110.dt.yaml arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dt.yaml arch/arm/boot/dts/imx6q-utilite-pro.dt.yaml nand-controller@18028000: nand@0:nand-ecc-algo:0: 'hw' is not one of ['hamming', 'bch', 'rs'] arch/arm/boot/dts/bcm53016-meraki-mr32.dt.yaml nand-controller@1806000: #size-cells:0:0: 0 was expected arch/arm/boot/dts/imx6sx-nitrogen6sx.dt.yaml arch/arm/boot/dts/imx6sx-sabreauto.dt.yaml arch/arm/boot/dts/imx6sx-sdb.dt.yaml arch/arm/boot/dts/imx6sx-sdb-mqs.dt.yaml arch/arm/boot/dts/imx6sx-sdb-reva.dt.yaml arch/arm/boot/dts/imx6sx-sdb-sai.dt.yaml arch/arm/boot/dts/imx6sx-softing-vining-2000.dt.yaml arch/arm/boot/dts/imx6sx-udoo-neo-basic.dt.yaml arch/arm/boot/dts/imx6sx-udoo-neo-extended.dt.yaml arch/arm/boot/dts/imx6sx-udoo-neo-full.dt.yaml arch/arm/boot/dts/imx6ul-14x14-evk.dt.yaml arch/arm/boot/dts/imx6ul-ccimx6ulsbcexpress.dt.yaml arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dt.yaml arch/arm/boot/dts/imx6ul-geam.dt.yaml arch/arm/boot/dts/imx6ul-isiot-emmc.dt.yaml arch/arm/boot/dts/imx6ul-isiot-nand.dt.yaml arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dt.yaml arch/arm/boot/dts/imx6ul-kontron-n6310-s.dt.yaml arch/arm/boot/dts/imx6ull-14x14-evk.dt.yaml arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dt.yaml arch/arm/boot/dts/imx6ull-colibri-eval-v3.dt.yaml arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dt.yaml arch/arm/boot/dts/imx6ul-liteboard.dt.yaml arch/arm/boot/dts/imx6ull-myir-mys-6ulx-eval.dt.yaml arch/arm/boot/dts/imx6ull-opos6uldev.dt.yaml arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dt.yaml arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dt.yaml arch/arm/boot/dts/imx6ull-phytec-segin-lc-rdk-nand.dt.yaml arch/arm/boot/dts/imx6ul-opos6uldev.dt.yaml arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-emmc.dt.yaml arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dt.yaml arch/arm/boot/dts/imx6ul-pico-dwarf.dt.yaml arch/arm/boot/dts/imx6ul-pico-hobbit.dt.yaml arch/arm/boot/dts/imx6ul-pico-pi.dt.yaml arch/arm/boot/dts/imx6ul-prti6g.dt.yaml arch/arm/boot/dts/imx6ul-tx6ul-0010.dt.yaml arch/arm/boot/dts/imx6ul-tx6ul-0011.dt.yaml arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dt.yaml arch/arm/boot/dts/imx6ulz-14x14-evk.dt.yaml nand-controller@1b30000: nand@0:secure-regions: More than one condition true in oneOf schema: arch/arm/boot/dts/qcom-sdx55-t55.dt.yaml arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dt.yaml nand-controller@33002000: #size-cells:0:0: 0 was expected arch/arm64/boot/dts/freescale/imx8mm-beacon-kit.dt.yaml arch/arm64/boot/dts/freescale/imx8mm-ddr4-evk.dt.yaml arch/arm64/boot/dts/freescale/imx8mm-evk.dt.yaml arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm-ctouch2.dt.yaml arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm-edimm2.2.dt.yaml arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dt.yaml arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dt.yaml arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dt.yaml arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx-0x.dt.yaml arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x.dt.yaml arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x.dt.yaml arch/arm64/boot/dts/freescale/imx8mm-venice-gw7901.dt.yaml arch/arm64/boot/dts/freescale/imx8mm-venice-gw7902.dt.yaml arch/arm64/boot/dts/freescale/imx8mn-beacon-kit.dt.yaml arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dt.yaml arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml arch/arm64/boot/dts/freescale/imx8mn-var-som-symphony.dt.yaml arch/arm64/boot/dts/freescale/imx8mn-venice-gw7902.dt.yaml arch/arm/boot/dts/imx7d-cl-som-imx7.dt.yaml arch/arm/boot/dts/imx7d-colibri-aster.dt.yaml arch/arm/boot/dts/imx7d-colibri-emmc-aster.dt.yaml arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dt.yaml arch/arm/boot/dts/imx7d-colibri-eval-v3.dt.yaml arch/arm/boot/dts/imx7d-flex-concentrator.dt.yaml arch/arm/boot/dts/imx7d-flex-concentrator-mfg.dt.yaml arch/arm/boot/dts/imx7d-mba7.dt.yaml arch/arm/boot/dts/imx7d-meerkat96.dt.yaml arch/arm/boot/dts/imx7d-nitrogen7.dt.yaml arch/arm/boot/dts/imx7d-pico-dwarf.dt.yaml arch/arm/boot/dts/imx7d-pico-hobbit.dt.yaml arch/arm/boot/dts/imx7d-pico-nymph.dt.yaml arch/arm/boot/dts/imx7d-pico-pi.dt.yaml arch/arm/boot/dts/imx7d-remarkable2.dt.yaml arch/arm/boot/dts/imx7d-sbc-imx7.dt.yaml arch/arm/boot/dts/imx7d-sdb.dt.yaml arch/arm/boot/dts/imx7d-sdb-reva.dt.yaml arch/arm/boot/dts/imx7d-sdb-sht11.dt.yaml arch/arm/boot/dts/imx7d-zii-rmu2.dt.yaml arch/arm/boot/dts/imx7d-zii-rpu2.dt.yaml arch/arm/boot/dts/imx7s-colibri-aster.dt.yaml arch/arm/boot/dts/imx7s-colibri-eval-v3.dt.yaml arch/arm/boot/dts/imx7s-mba7.dt.yaml arch/arm/boot/dts/imx7s-warp.dt.yaml nand-controller@8000c000: #size-cells:0:0: 0 was expected arch/arm/boot/dts/imx23-evk.dt.yaml arch/arm/boot/dts/imx23-olinuxino.dt.yaml arch/arm/boot/dts/imx23-sansa.dt.yaml arch/arm/boot/dts/imx23-stmp378x_devb.dt.yaml arch/arm/boot/dts/imx23-xfi3.dt.yaml arch/arm/boot/dts/imx28-apf28dev.dt.yaml arch/arm/boot/dts/imx28-apf28.dt.yaml arch/arm/boot/dts/imx28-apx4devkit.dt.yaml arch/arm/boot/dts/imx28-cfa10036.dt.yaml arch/arm/boot/dts/imx28-cfa10037.dt.yaml arch/arm/boot/dts/imx28-cfa10049.dt.yaml arch/arm/boot/dts/imx28-cfa10055.dt.yaml arch/arm/boot/dts/imx28-cfa10056.dt.yaml arch/arm/boot/dts/imx28-cfa10057.dt.yaml arch/arm/boot/dts/imx28-cfa10058.dt.yaml arch/arm/boot/dts/imx28-duckbill-2-485.dt.yaml arch/arm/boot/dts/imx28-duckbill-2.dt.yaml arch/arm/boot/dts/imx28-duckbill-2-enocean.dt.yaml arch/arm/boot/dts/imx28-duckbill-2-spi.dt.yaml arch/arm/boot/dts/imx28-duckbill.dt.yaml arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dt.yaml arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dt.yaml arch/arm/boot/dts/imx28-evk.dt.yaml arch/arm/boot/dts/imx28-m28cu3.dt.yaml arch/arm/boot/dts/imx28-m28evk.dt.yaml arch/arm/boot/dts/imx28-sps1.dt.yaml arch/arm/boot/dts/imx28-ts4600.dt.yaml arch/arm/boot/dts/imx28-tx28.dt.yaml arch/arm/boot/dts/imx28-xea.dt.yaml nand-controller: #address-cells:0:0: 1 was expected arch/arm/boot/dts/aks-cdu.dt.yaml arch/arm/boot/dts/animeo_ip.dt.yaml arch/arm/boot/dts/at91-ariag25.dt.yaml arch/arm/boot/dts/at91-ariettag25.dt.yaml arch/arm/boot/dts/at91-cosino_mega2560.dt.yaml arch/arm/boot/dts/at91-dvk_som60.dt.yaml arch/arm/boot/dts/at91-foxg20.dt.yaml arch/arm/boot/dts/at91-gatwick.dt.yaml arch/arm/boot/dts/at91-kizbox2-2.dt.yaml arch/arm/boot/dts/at91-kizbox3-hs.dt.yaml arch/arm/boot/dts/at91-kizbox.dt.yaml arch/arm/boot/dts/at91-kizboxmini-base.dt.yaml arch/arm/boot/dts/at91-kizboxmini-mb.dt.yaml arch/arm/boot/dts/at91-kizboxmini-rd.dt.yaml arch/arm/boot/dts/at91-lmu5000.dt.yaml arch/arm/boot/dts/at91-nattis-2-natte-2.dt.yaml arch/arm/boot/dts/at91-q5xr5.dt.yaml arch/arm/boot/dts/at91-qil_a9260.dt.yaml arch/arm/boot/dts/at91sam9260ek.dt.yaml arch/arm/boot/dts/at91sam9261ek.dt.yaml arch/arm/boot/dts/at91sam9263ek.dt.yaml arch/arm/boot/dts/at91sam9263ek.dt.yaml arch/arm/boot/dts/at91sam9g15ek.dt.yaml arch/arm/boot/dts/at91sam9g20ek_2mmc.dt.yaml arch/arm/boot/dts/at91sam9g20ek.dt.yaml arch/arm/boot/dts/at91sam9g25ek.dt.yaml arch/arm/boot/dts/at91sam9g25-gardena-smart-gateway.dt.yaml arch/arm/boot/dts/at91sam9g35ek.dt.yaml arch/arm/boot/dts/at91-sam9_l9260.dt.yaml arch/arm/boot/dts/at91sam9m10g45ek.dt.yaml arch/arm/boot/dts/at91sam9n12ek.dt.yaml arch/arm/boot/dts/at91sam9rlek.dt.yaml arch/arm/boot/dts/at91sam9x25ek.dt.yaml arch/arm/boot/dts/at91sam9x35ek.dt.yaml arch/arm/boot/dts/at91-sam9x60ek.dt.yaml arch/arm/boot/dts/at91-sama5d27_som1_ek.dt.yaml arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dt.yaml arch/arm/boot/dts/at91-sama5d2_icp.dt.yaml arch/arm/boot/dts/at91-sama5d2_ptc_ek.dt.yaml arch/arm/boot/dts/at91-sama5d2_xplained.dt.yaml arch/arm/boot/dts/at91-sama5d3_xplained.dt.yaml arch/arm/boot/dts/at91-sama5d4ek.dt.yaml arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dt.yaml arch/arm/boot/dts/at91-sama5d4_xplained.dt.yaml arch/arm/boot/dts/at91-smartkiz.dt.yaml arch/arm/boot/dts/at91-tse850-3.dt.yaml arch/arm/boot/dts/at91-vinco.dt.yaml arch/arm/boot/dts/at91-wb45n.dt.yaml arch/arm/boot/dts/at91-wb50n.dt.yaml arch/arm/boot/dts/ethernut5.dt.yaml arch/arm/boot/dts/evk-pro3.dt.yaml arch/arm/boot/dts/pm9g45.dt.yaml arch/arm/boot/dts/sama5d31ek.dt.yaml arch/arm/boot/dts/sama5d33ek.dt.yaml arch/arm/boot/dts/sama5d34ek.dt.yaml arch/arm/boot/dts/sama5d35ek.dt.yaml arch/arm/boot/dts/sama5d36ek_cmp.dt.yaml arch/arm/boot/dts/sama5d36ek.dt.yaml arch/arm/boot/dts/tny_a9260.dt.yaml arch/arm/boot/dts/tny_a9263.dt.yaml arch/arm/boot/dts/tny_a9263.dt.yaml arch/arm/boot/dts/tny_a9g20.dt.yaml arch/arm/boot/dts/usb_a9260.dt.yaml arch/arm/boot/dts/usb_a9263.dt.yaml arch/arm/boot/dts/usb_a9263.dt.yaml arch/arm/boot/dts/usb_a9g20.dt.yaml arch/arm/boot/dts/usb_a9g20_lpw.dt.yaml nand-controller@d8000000: #size-cells:0:0: 0 was expected arch/arm/boot/dts/imx27-apf27dev.dt.yaml arch/arm/boot/dts/imx27-apf27.dt.yaml arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dt.yaml arch/arm/boot/dts/imx27-pdk.dt.yaml arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dt.yaml arch/arm/boot/dts/imx27-phytec-phycore-rdk.dt.yaml nand-controller: #size-cells:0:0: 0 was expected arch/arm/boot/dts/aks-cdu.dt.yaml arch/arm/boot/dts/animeo_ip.dt.yaml arch/arm/boot/dts/at91-ariag25.dt.yaml arch/arm/boot/dts/at91-ariettag25.dt.yaml arch/arm/boot/dts/at91-cosino_mega2560.dt.yaml arch/arm/boot/dts/at91-dvk_som60.dt.yaml arch/arm/boot/dts/at91-foxg20.dt.yaml arch/arm/boot/dts/at91-gatwick.dt.yaml arch/arm/boot/dts/at91-kizbox2-2.dt.yaml arch/arm/boot/dts/at91-kizbox3-hs.dt.yaml arch/arm/boot/dts/at91-kizbox.dt.yaml arch/arm/boot/dts/at91-kizboxmini-base.dt.yaml arch/arm/boot/dts/at91-kizboxmini-mb.dt.yaml arch/arm/boot/dts/at91-kizboxmini-rd.dt.yaml arch/arm/boot/dts/at91-lmu5000.dt.yaml arch/arm/boot/dts/at91-nattis-2-natte-2.dt.yaml arch/arm/boot/dts/at91-q5xr5.dt.yaml arch/arm/boot/dts/at91-qil_a9260.dt.yaml arch/arm/boot/dts/at91sam9260ek.dt.yaml arch/arm/boot/dts/at91sam9261ek.dt.yaml arch/arm/boot/dts/at91sam9263ek.dt.yaml arch/arm/boot/dts/at91sam9263ek.dt.yaml arch/arm/boot/dts/at91sam9g15ek.dt.yaml arch/arm/boot/dts/at91sam9g20ek_2mmc.dt.yaml arch/arm/boot/dts/at91sam9g20ek.dt.yaml arch/arm/boot/dts/at91sam9g25ek.dt.yaml arch/arm/boot/dts/at91sam9g25-gardena-smart-gateway.dt.yaml arch/arm/boot/dts/at91sam9g35ek.dt.yaml arch/arm/boot/dts/at91-sam9_l9260.dt.yaml arch/arm/boot/dts/at91sam9m10g45ek.dt.yaml arch/arm/boot/dts/at91sam9n12ek.dt.yaml arch/arm/boot/dts/at91sam9rlek.dt.yaml arch/arm/boot/dts/at91sam9x25ek.dt.yaml arch/arm/boot/dts/at91sam9x35ek.dt.yaml arch/arm/boot/dts/at91-sam9x60ek.dt.yaml arch/arm/boot/dts/at91-sama5d27_som1_ek.dt.yaml arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dt.yaml arch/arm/boot/dts/at91-sama5d2_icp.dt.yaml arch/arm/boot/dts/at91-sama5d2_ptc_ek.dt.yaml arch/arm/boot/dts/at91-sama5d2_xplained.dt.yaml arch/arm/boot/dts/at91-sama5d3_xplained.dt.yaml arch/arm/boot/dts/at91-sama5d4ek.dt.yaml arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dt.yaml arch/arm/boot/dts/at91-sama5d4_xplained.dt.yaml arch/arm/boot/dts/at91-smartkiz.dt.yaml arch/arm/boot/dts/at91-tse850-3.dt.yaml arch/arm/boot/dts/at91-vinco.dt.yaml arch/arm/boot/dts/at91-wb45n.dt.yaml arch/arm/boot/dts/at91-wb50n.dt.yaml arch/arm/boot/dts/ethernut5.dt.yaml arch/arm/boot/dts/evk-pro3.dt.yaml arch/arm/boot/dts/pm9g45.dt.yaml arch/arm/boot/dts/sama5d31ek.dt.yaml arch/arm/boot/dts/sama5d33ek.dt.yaml arch/arm/boot/dts/sama5d34ek.dt.yaml arch/arm/boot/dts/sama5d35ek.dt.yaml arch/arm/boot/dts/sama5d36ek_cmp.dt.yaml arch/arm/boot/dts/sama5d36ek.dt.yaml arch/arm/boot/dts/tny_a9260.dt.yaml arch/arm/boot/dts/tny_a9263.dt.yaml arch/arm/boot/dts/tny_a9263.dt.yaml arch/arm/boot/dts/tny_a9g20.dt.yaml arch/arm/boot/dts/usb_a9260.dt.yaml arch/arm/boot/dts/usb_a9263.dt.yaml arch/arm/boot/dts/usb_a9263.dt.yaml arch/arm/boot/dts/usb_a9g20.dt.yaml arch/arm/boot/dts/usb_a9g20_lpw.dt.yaml
On Fri, Nov 26, 2021 at 12:39:07PM +0100, Miquel Raynal wrote: > Move the NAND chip description out of the NAND controller file. Indeed, > a subsequent part of the properties supported by a raw NAND chip are > also supported by SPI-NAND chips. So let's create a generic NAND chip > description which will be pulled by nand-controller.yaml and later by > spi-nand.yaml as well. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > --- > .../devicetree/bindings/mtd/nand-chip.yaml | 71 +++++++++++++++++++ > .../bindings/mtd/nand-controller.yaml | 53 ++------------ > 2 files changed, 75 insertions(+), 49 deletions(-) > create mode 100644 Documentation/devicetree/bindings/mtd/nand-chip.yaml > > diff --git a/Documentation/devicetree/bindings/mtd/nand-chip.yaml b/Documentation/devicetree/bindings/mtd/nand-chip.yaml > new file mode 100644 > index 000000000000..6d13e8cdbb21 > --- /dev/null > +++ b/Documentation/devicetree/bindings/mtd/nand-chip.yaml > @@ -0,0 +1,71 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/mtd/nand-chip.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: NAND Chip and NAND Controller Generic Binding > + > +maintainers: > + - Miquel Raynal <miquel.raynal@bootlin.com> > + > +description: | > + This file covers the generic description of a NAND chip. It implies that the > + bus interface should not be taken into account: both raw NAND devices and > + SPI-NAND devices are concerned by this description. > + > +properties: > + reg: > + description: > + Contains the chip-select IDs. > + > + nand-ecc-engine: > + allOf: Can you drop the allOf here. > + - $ref: /schemas/types.yaml#/definitions/phandle > + description: | > + A phandle on the hardware ECC engine if any. There are > + basically three possibilities: > + 1/ The ECC engine is part of the NAND controller, in this > + case the phandle should reference the parent node. > + 2/ The ECC engine is part of the NAND part (on-die), in this > + case the phandle should reference the node itself. > + 3/ The ECC engine is external, in this case the phandle should > + reference the specific ECC engine node. > + > + nand-use-soft-ecc-engine: > + type: boolean > + description: Use a software ECC engine. > + > + nand-no-ecc-engine: > + type: boolean > + description: Do not use any ECC correction. > + > + nand-ecc-algo: > + description: > + Desired ECC algorithm. > + $ref: /schemas/types.yaml#/definitions/string > + enum: [hamming, bch, rs] > + > + nand-ecc-strength: > + description: > + Maximum number of bits that can be corrected per ECC step. > + $ref: /schemas/types.yaml#/definitions/uint32 > + minimum: 1 > + > + nand-ecc-step-size: > + description: > + Number of data bytes covered by a single ECC step. > + $ref: /schemas/types.yaml#/definitions/uint32 > + minimum: 1 > + > + secure-regions: > + $ref: /schemas/types.yaml#/definitions/uint64-matrix > + description: > + Regions in the NAND chip which are protected using a secure element > + like Trustzone. This property contains the start address and size of > + the secure regions present. > + > +required: > + - reg > + > +additionalProperties: true > diff --git a/Documentation/devicetree/bindings/mtd/nand-controller.yaml b/Documentation/devicetree/bindings/mtd/nand-controller.yaml > index 5cd144a9ec99..44825dc95412 100644 > --- a/Documentation/devicetree/bindings/mtd/nand-controller.yaml > +++ b/Documentation/devicetree/bindings/mtd/nand-controller.yaml > @@ -52,32 +52,15 @@ properties: > patternProperties: > "^nand@[a-f0-9]$": > type: object > + > + allOf: Also not needed here. With that, Reviewed-by: Rob Herring <robh@kernel.org> > + - $ref: "nand-chip.yaml#" > +
diff --git a/Documentation/devicetree/bindings/mtd/nand-chip.yaml b/Documentation/devicetree/bindings/mtd/nand-chip.yaml new file mode 100644 index 000000000000..6d13e8cdbb21 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/nand-chip.yaml @@ -0,0 +1,71 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/nand-chip.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NAND Chip and NAND Controller Generic Binding + +maintainers: + - Miquel Raynal <miquel.raynal@bootlin.com> + +description: | + This file covers the generic description of a NAND chip. It implies that the + bus interface should not be taken into account: both raw NAND devices and + SPI-NAND devices are concerned by this description. + +properties: + reg: + description: + Contains the chip-select IDs. + + nand-ecc-engine: + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle + description: | + A phandle on the hardware ECC engine if any. There are + basically three possibilities: + 1/ The ECC engine is part of the NAND controller, in this + case the phandle should reference the parent node. + 2/ The ECC engine is part of the NAND part (on-die), in this + case the phandle should reference the node itself. + 3/ The ECC engine is external, in this case the phandle should + reference the specific ECC engine node. + + nand-use-soft-ecc-engine: + type: boolean + description: Use a software ECC engine. + + nand-no-ecc-engine: + type: boolean + description: Do not use any ECC correction. + + nand-ecc-algo: + description: + Desired ECC algorithm. + $ref: /schemas/types.yaml#/definitions/string + enum: [hamming, bch, rs] + + nand-ecc-strength: + description: + Maximum number of bits that can be corrected per ECC step. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 1 + + nand-ecc-step-size: + description: + Number of data bytes covered by a single ECC step. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 1 + + secure-regions: + $ref: /schemas/types.yaml#/definitions/uint64-matrix + description: + Regions in the NAND chip which are protected using a secure element + like Trustzone. This property contains the start address and size of + the secure regions present. + +required: + - reg + +additionalProperties: true diff --git a/Documentation/devicetree/bindings/mtd/nand-controller.yaml b/Documentation/devicetree/bindings/mtd/nand-controller.yaml index 5cd144a9ec99..44825dc95412 100644 --- a/Documentation/devicetree/bindings/mtd/nand-controller.yaml +++ b/Documentation/devicetree/bindings/mtd/nand-controller.yaml @@ -52,32 +52,15 @@ properties: patternProperties: "^nand@[a-f0-9]$": type: object + + allOf: + - $ref: "nand-chip.yaml#" + properties: reg: description: Contains the chip-select IDs. - nand-ecc-engine: - allOf: - - $ref: /schemas/types.yaml#/definitions/phandle - description: | - A phandle on the hardware ECC engine if any. There are - basically three possibilities: - 1/ The ECC engine is part of the NAND controller, in this - case the phandle should reference the parent node. - 2/ The ECC engine is part of the NAND part (on-die), in this - case the phandle should reference the node itself. - 3/ The ECC engine is external, in this case the phandle should - reference the specific ECC engine node. - - nand-use-soft-ecc-engine: - type: boolean - description: Use a software ECC engine. - - nand-no-ecc-engine: - type: boolean - description: Do not use any ECC correction. - nand-ecc-placement: allOf: - $ref: /schemas/types.yaml#/definitions/string @@ -88,12 +71,6 @@ patternProperties: known to be stored in the OOB area, or "interleaved" if ECC bytes will be interleaved with regular data in the main area. - nand-ecc-algo: - description: - Desired ECC algorithm. - $ref: /schemas/types.yaml#/definitions/string - enum: [hamming, bch, rs] - nand-bus-width: description: Bus width to the NAND chip @@ -112,18 +89,6 @@ patternProperties: find Bad Block Markers (BBM). These markers will help to build a volatile BBT in RAM. - nand-ecc-strength: - description: - Maximum number of bits that can be corrected per ECC step. - $ref: /schemas/types.yaml#/definitions/uint32 - minimum: 1 - - nand-ecc-step-size: - description: - Number of data bytes covered by a single ECC step. - $ref: /schemas/types.yaml#/definitions/uint32 - minimum: 1 - nand-ecc-maximize: $ref: /schemas/types.yaml#/definitions/flag description: @@ -154,13 +119,6 @@ patternProperties: Ready/Busy pins. Active state refers to the NAND ready state and should be set to GPIOD_ACTIVE_HIGH unless the signal is inverted. - secure-regions: - $ref: /schemas/types.yaml#/definitions/uint64-matrix - description: - Regions in the NAND chip which are protected using a secure element - like Trustzone. This property contains the start address and size of - the secure regions present. - required: - reg @@ -181,9 +139,6 @@ examples: nand@0 { reg = <0>; /* Native CS */ - nand-use-soft-ecc-engine; - nand-ecc-algo = "bch"; - /* NAND chip specific properties */ };
Move the NAND chip description out of the NAND controller file. Indeed, a subsequent part of the properties supported by a raw NAND chip are also supported by SPI-NAND chips. So let's create a generic NAND chip description which will be pulled by nand-controller.yaml and later by spi-nand.yaml as well. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- .../devicetree/bindings/mtd/nand-chip.yaml | 71 +++++++++++++++++++ .../bindings/mtd/nand-controller.yaml | 53 ++------------ 2 files changed, 75 insertions(+), 49 deletions(-) create mode 100644 Documentation/devicetree/bindings/mtd/nand-chip.yaml