On Sun, 10 Apr 2022 at 21:35, Adam Ford <aford173@xxxxxxxxx> wrote: > > The SDHC controller in the imx8mn and imx8mp have the same controller > as the imx8mm which is slightly different than that of the imx7d. > > Using the fallback of the imx8mm enables the controllers to support > HS400-ES which is not available on the imx7d. After discussion with NXP, > it turns out that the imx8qm should fall back to the imx8qxp, because > those have some additional flags not present in the imx8mm. > > Mark the current state of the fallbacks as deprecated, and add the > proper fallbacks so in the future, the deprecated combination can be > removed and prevent any future devices from using the wrong fallback. > > Suggested-by: haibo.chen@xxxxxxx > Signed-off-by: Adam Ford <aford173@xxxxxxxxx> Applied for next, thanks! Kind regards Uffe > --- > V4: Mark deprecated items with "deprecated: true" instead of a comment > V3: Add support for the interim fallback on imx8mn and imx8mp where > they both fallback to imx8mm, but keep the imx7d to prevent any > breakage. > > diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > index 7dbbcae9485c..58447095f000 100644 > --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml > @@ -34,22 +34,46 @@ properties: > - fsl,imx6ull-usdhc > - fsl,imx7d-usdhc > - fsl,imx7ulp-usdhc > + - fsl,imx8mm-usdhc > - fsl,imxrt1050-usdhc > - nxp,s32g2-usdhc > + - items: > + - enum: > + - fsl,imx8mq-usdhc > + - const: fsl,imx7d-usdhc > + - items: > + - enum: > + - fsl,imx8mn-usdhc > + - fsl,imx8mp-usdhc > + - fsl,imx93-usdhc > + - fsl,imx8ulp-usdhc > + - const: fsl,imx8mm-usdhc > + - items: > + - enum: > + - fsl,imx8qm-usdhc > + - const: fsl,imx8qxp-usdhc > - items: > - enum: > - fsl,imx8mm-usdhc > - fsl,imx8mn-usdhc > - fsl,imx8mp-usdhc > - - fsl,imx8mq-usdhc > - fsl,imx8qm-usdhc > - fsl,imx8qxp-usdhc > - const: fsl,imx7d-usdhc > + deprecated: true > - items: > - enum: > - - fsl,imx93-usdhc > - - fsl,imx8ulp-usdhc > + - fsl,imx8mn-usdhc > + - fsl,imx8mp-usdhc > - const: fsl,imx8mm-usdhc > + - const: fsl,imx7d-usdhc > + deprecated: true > + - items: > + - enum: > + - fsl,imx8qm-usdhc > + - const: fsl,imx8qxp-usdhc > + - const: fsl,imx7d-usdhc > + deprecated: true > > reg: > maxItems: 1 > -- > 2.34.1 >
