mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
c026408fae
Manually rebased: bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch lantiq/patches-5.15/0028-NET-lantiq-various-etop-fixes.patch All other patches automatically rebased Co-authored-by: John Audia <therealgraysky@proton.me> Signed-off-by: John Audia <therealgraysky@proton.me>
69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
From 8878f39722eeacbb40babe82ad763d8d20214018 Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Sat, 9 Jul 2022 00:32:04 +0200
|
|
Subject: [PATCH 104/137] clk: qcom: apss-ipq-pll: use OF match data for Alpha
|
|
PLL config
|
|
|
|
Convert the driver to use OF match data for providing the Alpha PLL config
|
|
per compatible.
|
|
This is required for IPQ8074 support since it uses a different Alpha PLL
|
|
config.
|
|
|
|
While we are here rename "ipq_pll_config" to "ipq6018_pll_config" to make
|
|
it clear that it is for IPQ6018 only.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
---
|
|
drivers/clk/qcom/apss-ipq-pll.c | 12 +++++++++---
|
|
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/clk/qcom/apss-ipq-pll.c
|
|
+++ b/drivers/clk/qcom/apss-ipq-pll.c
|
|
@@ -2,6 +2,7 @@
|
|
// Copyright (c) 2018, The Linux Foundation. All rights reserved.
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/module.h>
|
|
+#include <linux/of_device.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/regmap.h>
|
|
|
|
@@ -36,7 +37,7 @@ static struct clk_alpha_pll ipq_pll = {
|
|
},
|
|
};
|
|
|
|
-static const struct alpha_pll_config ipq_pll_config = {
|
|
+static const struct alpha_pll_config ipq6018_pll_config = {
|
|
.l = 0x37,
|
|
.config_ctl_val = 0x04141200,
|
|
.config_ctl_hi_val = 0x0,
|
|
@@ -54,6 +55,7 @@ static const struct regmap_config ipq_pl
|
|
|
|
static int apss_ipq_pll_probe(struct platform_device *pdev)
|
|
{
|
|
+ const struct alpha_pll_config *ipq_pll_config;
|
|
struct device *dev = &pdev->dev;
|
|
struct regmap *regmap;
|
|
void __iomem *base;
|
|
@@ -67,7 +69,11 @@ static int apss_ipq_pll_probe(struct pla
|
|
if (IS_ERR(regmap))
|
|
return PTR_ERR(regmap);
|
|
|
|
- clk_alpha_pll_configure(&ipq_pll, regmap, &ipq_pll_config);
|
|
+ ipq_pll_config = of_device_get_match_data(&pdev->dev);
|
|
+ if (!ipq_pll_config)
|
|
+ return -ENODEV;
|
|
+
|
|
+ clk_alpha_pll_configure(&ipq_pll, regmap, ipq_pll_config);
|
|
|
|
ret = devm_clk_register_regmap(dev, &ipq_pll.clkr);
|
|
if (ret)
|
|
@@ -78,7 +84,7 @@ static int apss_ipq_pll_probe(struct pla
|
|
}
|
|
|
|
static const struct of_device_id apss_ipq_pll_match_table[] = {
|
|
- { .compatible = "qcom,ipq6018-a53pll" },
|
|
+ { .compatible = "qcom,ipq6018-a53pll", .data = &ipq6018_pll_config },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
|