From b55a6977c8dcf0d76ad11a2ac1566f6817b58f17 Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Wed, 12 Jan 2022 23:52:28 +0100 Subject: [PATCH] Removed patch --- ...ent-clocks-to-lower-speed-oscillator.patch | 49 ------------------- .../pinephone-sources-5.16.0.ebuild | 1 - 2 files changed, 50 deletions(-) delete mode 100644 sys-kernel/pinephone-sources/files/ccu-sun50i-a64-reparent-clocks-to-lower-speed-oscillator.patch diff --git a/sys-kernel/pinephone-sources/files/ccu-sun50i-a64-reparent-clocks-to-lower-speed-oscillator.patch b/sys-kernel/pinephone-sources/files/ccu-sun50i-a64-reparent-clocks-to-lower-speed-oscillator.patch deleted file mode 100644 index 9522375..0000000 --- a/sys-kernel/pinephone-sources/files/ccu-sun50i-a64-reparent-clocks-to-lower-speed-oscillator.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c -index 149cfde817cb..0399d8714fd0 100644 ---- a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c -+++ b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c -@@ -984,6 +984,8 @@ static int sun50i_a64_ccu_probe(struct p - if (IS_ERR(reg)) - return PTR_ERR(reg); - -+ platform_set_drvdata(pdev, reg); -+ - /* Force the pll-audio variable divider to 3 */ - val = readl(reg + SUN50I_A64_PLL_AUDIO_REG); - val &= ~GENMASK(19, 16); -@@ -974,11 +976,35 @@ static const struct of_device_id sun50i_a64_ccu_ids[] = { - { } - }; - -+#define USBPHY_CFG_REG 0x0cc -+ -+static int sun50i_a64_ccu_suspend(struct device *dev) -+{ -+ void __iomem *reg = dev_get_drvdata(dev); -+ -+ writel(readl(reg + USBPHY_CFG_REG) | 0xa00000, reg + USBPHY_CFG_REG); -+ -+ return 0; -+} -+ -+static int sun50i_a64_ccu_resume(struct device *dev) -+{ -+ void __iomem *reg = dev_get_drvdata(dev); -+ -+ writel(readl(reg + USBPHY_CFG_REG) & ~0xa00000, reg + USBPHY_CFG_REG); -+ -+ return 0; -+} -+ -+static SIMPLE_DEV_PM_OPS(sun50i_a64_ccu_pm_ops, -+ sun50i_a64_ccu_suspend, sun50i_a64_ccu_resume); -+ - static struct platform_driver sun50i_a64_ccu_driver = { - .probe = sun50i_a64_ccu_probe, - .driver = { - .name = "sun50i-a64-ccu", - .of_match_table = sun50i_a64_ccu_ids, -+ .pm = &sun50i_a64_ccu_pm_ops, - }, - }; - builtin_platform_driver(sun50i_a64_ccu_driver); diff --git a/sys-kernel/pinephone-sources/pinephone-sources-5.16.0.ebuild b/sys-kernel/pinephone-sources/pinephone-sources-5.16.0.ebuild index 7eab50e..366ba54 100644 --- a/sys-kernel/pinephone-sources/pinephone-sources-5.16.0.ebuild +++ b/sys-kernel/pinephone-sources/pinephone-sources-5.16.0.ebuild @@ -22,7 +22,6 @@ SRC_URI="${KERNEL_URI} ${MEGI_PATCH_URI} -> all-${PV}.patch" PATCHES=( ${DISTDIR}/all-${PV}.patch - ${FILESDIR}/ccu-sun50i-a64-reparent-clocks-to-lower-speed-oscillator.patch ${FILESDIR}/dts-pinephone-drop-modem-power-node.patch ${FILESDIR}/media-ov5640-Implement-autofocus.patch ${FILESDIR}/0107-quirk-kernel-org-bug-210681-firmware_rome_error.patch