| Message ID | 20220203015112.12008-1-samuel@sholland.org |
|---|---|
| State | Accepted |
| Commit | 02d9c3f436d6ad9ec086d11130be3d22927f457d |
| Headers | show |
| Series | [1/2] dt-bindings: mmc: sunxi: Add D1 MMC and eMMC compatibles | expand |
On Thu, 3 Feb 2022 at 02:51, Samuel Holland <samuel@sholland.org> wrote: > > D1's MMC controllers are unique in that they have the DMA address shift > (like A100) with a 13-bit descriptor size field (like sun4i). Add the > compatible and parameters for this new variant. > > Signed-off-by: Samuel Holland <samuel@sholland.org> Applied for next, thanks! Kind regards Uffe > --- > > drivers/mmc/host/sunxi-mmc.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c > index 2702736a1c57..c62afd212692 100644 > --- a/drivers/mmc/host/sunxi-mmc.c > +++ b/drivers/mmc/host/sunxi-mmc.c > @@ -1167,6 +1167,14 @@ static const struct sunxi_mmc_cfg sun9i_a80_cfg = { > .can_calibrate = false, > }; > > +static const struct sunxi_mmc_cfg sun20i_d1_cfg = { > + .idma_des_size_bits = 13, > + .idma_des_shift = 2, > + .can_calibrate = true, > + .mask_data0 = true, > + .needs_new_timings = true, > +}; > + > static const struct sunxi_mmc_cfg sun50i_a64_cfg = { > .idma_des_size_bits = 16, > .clk_delays = NULL, > @@ -1205,6 +1213,7 @@ static const struct of_device_id sunxi_mmc_of_match[] = { > { .compatible = "allwinner,sun7i-a20-mmc", .data = &sun7i_a20_cfg }, > { .compatible = "allwinner,sun8i-a83t-emmc", .data = &sun8i_a83t_emmc_cfg }, > { .compatible = "allwinner,sun9i-a80-mmc", .data = &sun9i_a80_cfg }, > + { .compatible = "allwinner,sun20i-d1-mmc", .data = &sun20i_d1_cfg }, > { .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg }, > { .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg }, > { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg }, > -- > 2.33.1 >
diff --git a/Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml b/Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml index 4f62ad6ce50c..94e2c6c4e4b7 100644 --- a/Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml +++ b/Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml @@ -24,6 +24,7 @@ properties: - const: allwinner,sun7i-a20-mmc - const: allwinner,sun8i-a83t-emmc - const: allwinner,sun9i-a80-mmc + - const: allwinner,sun20i-d1-mmc - const: allwinner,sun50i-a64-emmc - const: allwinner,sun50i-a64-mmc - const: allwinner,sun50i-a100-emmc @@ -49,6 +50,9 @@ properties: - items: - const: allwinner,sun50i-h6-mmc - const: allwinner,sun50i-a64-mmc + - items: + - const: allwinner,sun20i-d1-emmc + - const: allwinner,sun50i-a100-emmc - items: - const: allwinner,sun50i-h616-emmc - const: allwinner,sun50i-a100-emmc
D1 contains variants of the usual sunxi MMC controller. The eMMC controller has the same parameters as the A100 eMMC controller. The other controllers have a DMA address shift like on A100, but they have a smaller 13-bit size field, making them a new incompatible variant. Signed-off-by: Samuel Holland <samuel@sholland.org> --- .../devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 4 ++++ 1 file changed, 4 insertions(+)