99f6bef7de
* Attach Meson64 CURRENT to 5.6.y and make DEV = CURRENT at this point. There is a lot of changes to 5.7.y and can be done after release or by someone that feels a need for this right now. * Delete meson64_fclk_div3.patch this fix has been upstream for some time, I had issues with it on 5.4, which is why it had been removed there. * [ meson64 current ] kconfig tweak disable Rockchip SoC drivers * [ meson64 current ] remove rockchip patches * [ meson64 current ] disable CMA patch GX * [ meson64 current] add libretech cc audio patch This brings the dts even with the khilman 5.8/integ branch which includes all of the audio changes. The kernel is registering audio devices, however nothing comes out. committed in case someone wants to spend time debugging/testing theories. * fix permissions was editing from another machine, accidental change of permissions in the patch * Set default mixer settings Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com> * [ meson64 current ] GXL audio commit This moves to the mainline patches and covers le potato and la frite. Adjusted asound config to handle a commonized sound card name. * [ meson64 current ] add gxbb audio WIP Playback is too fast, a clock setting is off somewhere. * Update kernel configs Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com> Co-authored-by: Tony <tonymckahan@gmail.com>
37 lines
900 B
Diff
37 lines
900 B
Diff
From 3d2163ac01d8a5e40589ea9ccaa3d8c59e620b4c Mon Sep 17 00:00:00 2001
|
|
From: Nick Xie <nick@khadas.com>
|
|
Date: Thu, 19 Mar 2020 11:12:00 +0800
|
|
Subject: [PATCH 101/101] VIM3: hack for PCIe
|
|
|
|
provided by @narmstrong
|
|
|
|
Signed-off-by: Nick Xie <nick@khadas.com>
|
|
---
|
|
drivers/pci/controller/dwc/pci-meson.c | 8 +-------
|
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
|
|
|
diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c
|
|
index 3772b02a5c55..b99b23fa4dfb 100644
|
|
--- a/drivers/pci/controller/dwc/pci-meson.c
|
|
+++ b/drivers/pci/controller/dwc/pci-meson.c
|
|
@@ -633,15 +633,9 @@ static int meson_pcie_probe(struct platform_device *pdev)
|
|
goto err_phy;
|
|
}
|
|
|
|
- return 0;
|
|
-
|
|
err_phy:
|
|
- if (mp->param->has_shared_phy) {
|
|
- phy_power_off(mp->phy);
|
|
- phy_exit(mp->phy);
|
|
- }
|
|
|
|
- return ret;
|
|
+ return 0;
|
|
}
|
|
|
|
static struct meson_pcie_param meson_pcie_axg_param = {
|
|
--
|
|
2.17.1
|
|
|