Fix H616 patches
This commit is contained in:
commit
4e4b066df7
@ -93,4 +93,4 @@ index 782117dc0b28..128302696ca1 100644
|
||||
+#define CLK_NUMBER_H6 (CLK_W1 + 1)
|
||||
+#define CLK_NUMBER_H616 (CLK_IR + 1)
|
||||
|
||||
#endif /* _CCU_SUN50I_H6_R_H */
|
||||
#endif /* _CCU_SUN50I_H6_R_H */
|
||||
|
||||
@ -1421,4 +1421,4 @@ index 000000000000..1c992cfbbbab
|
||||
+#define RST_BUS_HDCP 55
|
||||
+#define RST_BUS_KEYADC 56
|
||||
+
|
||||
+#endif /* _DT_BINDINGS_RESET_SUN50I_H616_H_ */
|
||||
+#endif /* _DT_BINDINGS_RESET_SUN50I_H616_H_ */
|
||||
|
||||
@ -56,11 +56,19 @@ index fc62773602ec..1518b64112b7 100644
|
||||
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 },
|
||||
@@ -1186,6 +1206,8 @@ static const struct of_device_id sunxi_mmc_of_match[] = {
|
||||
@@ -1186,6 +1207,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-h5-emmc", .data = &sun50i_h5_emmc_cfg },
|
||||
+ { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg },
|
||||
+ { .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg },
|
||||
{ /* sentinel */ }
|
||||
};
|
||||
};
|
||||
--
|
||||
|
||||
# Note
|
||||
# This patch has been modified to allow proper applying.
|
||||
# The line
|
||||
# { .compatible = "allwinner,sun50i-h5-emmc", .data = &sun50i_h5_emmc_cfg },
|
||||
# as been added to compensate for another patch applied before this one.
|
||||
@ -707,4 +707,4 @@ index 000000000000..dcffbfdcd26b
|
||||
+ #size-cells = <0>;
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+};
|
||||
|
||||
@ -20,19 +20,5 @@ index d3eab3b57..e71c04a80 100644
|
||||
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb
|
||||
|
||||
subdir-y := $(dts-dirs) overlay
|
||||
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
|
||||
index a8dbc3e3e..efab65ae9 100644
|
||||
--- a/drivers/mmc/host/sunxi-mmc.c
|
||||
+++ b/drivers/mmc/host/sunxi-mmc.c
|
||||
@@ -1220,6 +1220,8 @@ static const struct of_device_id sunxi_mmc_of_match[] = {
|
||||
{ .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg },
|
||||
{ .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg },
|
||||
{ .compatible = "allwinner,sun50i-h5-emmc", .data = &sun50i_h5_emmc_cfg },
|
||||
+ { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg },
|
||||
+ { .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg },
|
||||
{ /* sentinel */ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match);
|
||||
--
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user