71 lines
2.7 KiB
Groff
71 lines
2.7 KiB
Groff
|
From 31c6231045f48c5adee02190a5c8fdb75b9de012 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Icenowy Zheng <icenowy@aosc.io>
|
||
|
|
Date: Sat, 2 Dec 2017 15:10:53 +0800
|
||
|
|
Subject: [PATCH 07/35] mmc: sunxi: add support for the MMC controller on H6
|
||
|
|
|
||
|
|
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.
|
||
|
|
|
||
|
|
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
|
||
|
|
---
|
||
|
|
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 132e000..e6aa5c7 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"
|
||
|
|
- 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 bad612d..3cb73c1 100644
|
||
|
|
--- a/drivers/mmc/host/sunxi-mmc.c
|
||
|
|
+++ b/drivers/mmc/host/sunxi-mmc.c
|
||
|
|
@@ -1153,6 +1153,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,
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
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 },
|
||
|
|
@@ -1161,6 +1175,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 },
|
||
|
|
{ /* sentinel */ }
|
||
|
|
};
|
||
|
|
MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match);
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|