mirror of
https://github.com/armbian/build.git
synced 2025-09-19 04:31:38 +02:00
d1186b8a0e
I have changed the way the patches are generated a bit. Instead of using orange-pi branch from megous tree for 6.6 kernel, I have used the following kernel branches a83t-suspend, af8133j, anx, audio, axp, cam, drm, err, fixes, mbus, modem, opi3, pb, pinetab, pp, ppkb, samuel, speed, tbs-a711, ths These branches were carefully chosen to include only allwinner related patches and remove importing of the rockchip related patches into the allwinner kernel. Following patches are modified to fix patch application failure - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch - patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch - patches.armbian/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch - patches.armbian/arm64-dts-allwinner-overlay-Add-Overlays-for-sunxi64.patch - patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch Following patches are modified because of kernel api change to fix compilation failure - patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ukhellfire <afaulkner420@gmail.com>
|
|
Date: Thu, 24 Mar 2022 22:21:00 +0000
|
|
Subject: mmc/host/sunxi-mmc: Fix H6 emmc
|
|
|
|
We have the wrong MMC CAP voltage for the emmc on this board
|
|
---
|
|
drivers/mmc/host/sunxi-mmc.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
|
|
index 7f336908a21c..a2747093de99 100644
|
|
--- a/drivers/mmc/host/sunxi-mmc.c
|
|
+++ b/drivers/mmc/host/sunxi-mmc.c
|
|
@@ -1233,6 +1233,7 @@ static const struct of_device_id sunxi_mmc_of_match[] = {
|
|
{ .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg },
|
|
{ .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg },
|
|
{ .compatible = "allwinner,sun50i-h5-emmc", .data = &sun50i_h5_emmc_cfg },
|
|
+ { .compatible = "allwinner,sun50i-h6-emmc", .data = &sun50i_a64_emmc_cfg },
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match);
|
|
@@ -1444,7 +1445,7 @@ static int sunxi_mmc_probe(struct platform_device *pdev)
|
|
MMC_CAP_SDIO_IRQ;
|
|
|
|
/*
|
|
- * Some H5 devices do not have signal traces precise enough to
|
|
+ * Some H5 and H6 devices do not have signal traces precise enough to
|
|
* use HS DDR mode for their eMMC chips.
|
|
*
|
|
* We still enable HS DDR modes for all the other controller
|
|
@@ -1453,6 +1454,8 @@ static int sunxi_mmc_probe(struct platform_device *pdev)
|
|
if ((host->cfg->clk_delays || host->use_new_timings) &&
|
|
!of_device_is_compatible(pdev->dev.of_node,
|
|
"allwinner,sun50i-h5-emmc") &&
|
|
+ !of_device_is_compatible(pdev->dev.of_node,
|
|
+ "allwinner,sun50i-h6-emmc") &&
|
|
!of_machine_is_compatible("allwinner,sun7i-a20") &&
|
|
!of_machine_is_compatible("olimex,a64-olinuxino-2ge8g"))
|
|
mmc->caps |= MMC_CAP_1_8V_DDR | MMC_CAP_3_3V_DDR;
|
|
--
|
|
Armbian
|
|
|