diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-10-20 10:09:19 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-10-20 10:09:19 +0200 |
| commit | 54adc36a15c1fe1e056864f84fe918a8102c5733 (patch) | |
| tree | 12d181d080482bceddb3d7130f09038117287176 | |
| parent | 189ed8bc1982accd8b66a963853e5025c152a766 (diff) | |
| parent | b4d25f7cc56044b9b917a61adc4168dc00be8163 (diff) | |
| download | kernel-54adc36a15c1fe1e056864f84fe918a8102c5733.tar.gz kernel-54adc36a15c1fe1e056864f84fe918a8102c5733.tar.xz kernel-54adc36a15c1fe1e056864f84fe918a8102c5733.zip | |
Merge remote-tracking branch 'origin/f29' into f29-user-thl-vanilla-fedora
| -rw-r--r-- | hikey-mmc-softdeps.patch | 34 | ||||
| -rw-r--r-- | kernel.spec | 8 |
2 files changed, 42 insertions, 0 deletions
diff --git a/hikey-mmc-softdeps.patch b/hikey-mmc-softdeps.patch new file mode 100644 index 000000000..842243280 --- /dev/null +++ b/hikey-mmc-softdeps.patch @@ -0,0 +1,34 @@ +From: Jeremy Linton <lintonrjeremy@gmail.com> + +mmc: dw_mmc-k3: Add clk and reset softdep + +The mmc/k3 driver is dependent on a number of other linux modules +which must be built into the initrd in order to use the mmc/sd +as a boot device for initrd/module based distros. + +Normally this would be taken care of with linux's modules.deps +based on symbolic dependencies but the dwmmc drivers have +particularly complex relationships that are based on soft +callback APIs. The result is that dracut and other initrd builders +are unable to determine the module dependencies directly. + +To solve this problem linux has MODULE_SOFTDEP() so lets softdep +the hisi clock and reset drivers associated with the k3 implementation. + +Signed-off-by: Jeremy Linton <lintonrjeremy@gmail.com> +--- + drivers/mmc/host/dw_mmc-k3.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c +index 89cdb3d533bb..cd8f545fa30d 100644 +--- a/drivers/mmc/host/dw_mmc-k3.c ++++ b/drivers/mmc/host/dw_mmc-k3.c +@@ -487,3 +487,4 @@ module_platform_driver(dw_mci_k3_pltfm_driver); + MODULE_DESCRIPTION("K3 Specific DW-MSHC Driver Extension"); + MODULE_LICENSE("GPL v2"); + MODULE_ALIAS("platform:dwmmc_k3"); ++MODULE_SOFTDEP("pre: hi6220_reset clk_hi655x"); + +-- +2.13.6 diff --git a/kernel.spec b/kernel.spec index 8fa3482f6..e39423b94 100644 --- a/kernel.spec +++ b/kernel.spec @@ -624,6 +624,8 @@ Patch318: arm64-drm-msm-fix-missing-CTL-flush.patch Patch319: gpio-pxa-handle-corner-case-of-unprobed-device.patch +Patch320: hikey-mmc-softdeps.patch + # Enabling Patches for the RPi3+ Patch330: bcm2837-enable-pmu.patch @@ -1953,6 +1955,12 @@ fi # # %changelog +* Thu Oct 18 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.18.15-300 +- Linux v4.18.15 + +* Thu Oct 18 2018 Peter Robinson <pbrobinson@fedoraproject.org> +- Add patch to fix mSD on 96boards Hikey + * Tue Oct 16 2018 Peter Robinson <pbrobinson@fedoraproject.org> - Fixes to Rock960 series of devices, improves stability considerably - Raspberry Pi graphics fix |