于 2018年4月27日 GMT+08:00 上午12:45:24, Andre Przywara <andre.przywara@xxxxxxx> 写到: >Hi, > >On 26/04/18 15:07, Icenowy Zheng wrote: >> The new Allwinner H6 SoC have 3 MMC controllers. The first and second >> ones are similar to the ones on A64, but the third one adds EMCE >> (Embedded Crypto Engine) support which does hardware transparent >crypto >> on the eMMC. >> >> As we still do not have support for EMCE, and the support of it is >> disabled by defualt, we just duplicate the A64 mmc configurations and >> change the compatible string. > >So if the A64 MMC part is compatible, we should express it like this: > >> Signed-off-by: Icenowy Zheng <icenowy@xxxxxxx> >> --- >> Documentation/devicetree/bindings/mmc/sunxi-mmc.txt | 2 ++ >> drivers/mmc/host/sunxi-mmc.c | 16 >++++++++++++++++ >> 2 files changed, 18 insertions(+) >> >> diff --git a/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt >b/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt >> index 132e0007d7d6..e6aa5c7a5e12 100644 >> --- a/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt >> +++ b/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt >> @@ -16,6 +16,8 @@ Required properties: >> * "allwinner,sun9i-a80-mmc" >> * "allwinner,sun50i-a64-emmc" >> * "allwinner,sun50i-a64-mmc" >> + * "allwinner,sun50i-h6-emmc" >> + * "allwinner,sun50i-h6-mmc" > >This should be changed to: > > * "allwinner,sun50i-h6-emmc", "allwinner,sun50i-a64-emmc" > * "allwinner,sun50i-h6-mmc", "allwinner,sun50i-a64-mmc" This list shouldn't list pairs, and as I said in the reply, these pairs are not valid. > >> - reg : mmc controller base registers >> - clocks : a list with 4 phandle + clock specifier pairs >> - clock-names : must contain "ahb", "mmc", "output" and "sample" >> diff --git a/drivers/mmc/host/sunxi-mmc.c >b/drivers/mmc/host/sunxi-mmc.c >> index 97c6b79b7d6f..05e2b5fd7aa4 100644 >> --- a/drivers/mmc/host/sunxi-mmc.c >> +++ b/drivers/mmc/host/sunxi-mmc.c >> @@ -1168,6 +1168,20 @@ static const struct sunxi_mmc_cfg >sun50i_a64_emmc_cfg = { >> .can_calibrate = true, >> }; >> >> +static const struct sunxi_mmc_cfg sun50i_h6_cfg = { >> + .idma_des_size_bits = 16, >> + .clk_delays = NULL, >> + .can_calibrate = true, >> + .mask_data0 = true, >> + .needs_new_timings = true, >> +}; >> + >> +static const struct sunxi_mmc_cfg sun50i_h6_emmc_cfg = { >> + .idma_des_size_bits = 13, >> + .clk_delays = NULL, >> + .can_calibrate = true, >> +}; >> + > >... and then we don't need those changes ... > >> static const struct of_device_id sunxi_mmc_of_match[] = { >> { .compatible = "allwinner,sun4i-a10-mmc", .data = &sun4i_a10_cfg >}, >> { .compatible = "allwinner,sun5i-a13-mmc", .data = &sun5i_a13_cfg >}, >> @@ -1176,6 +1190,8 @@ static const struct of_device_id >sunxi_mmc_of_match[] = { >> { .compatible = "allwinner,sun9i-a80-mmc", .data = &sun9i_a80_cfg >}, >> { .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg >}, >> { .compatible = "allwinner,sun50i-a64-emmc", .data = >&sun50i_a64_emmc_cfg }, >> + { .compatible = "allwinner,sun50i-h6-mmc", .data = &sun50i_h6_cfg >}, >> + { .compatible = "allwinner,sun50i-h6-emmc", .data = >&sun50i_h6_emmc_cfg }, > >... and those, at least yet. >Should we ever extend the driver to support the EMCE, we can add them >at >this occasion. > >So this patch would just add the compatible pairs to the binding doc. > >Cheers, >Andre. > >> { /* sentinel */ } >> }; >> MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match); >> > >_______________________________________________ >linux-arm-kernel mailing list >linux-arm-kernel@xxxxxxxxxxxxxxxxxxx >http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html