mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 6.1 to 6.1.66 (#11694)
This commit is contained in:
parent
62daffa7a2
commit
93443d24b4
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-6.1 = .62
|
LINUX_VERSION-6.1 = .66
|
||||||
LINUX_KERNEL_HASH-6.1.62 = b9fd616facd6becfceef88b9be718d0f16625cab3fe81d11384802a7091e85ec
|
LINUX_KERNEL_HASH-6.1.66 = 419e62cd6c4239e6950b688db9e8753eb1e99c216dc3204f7932398a3fef1a0c
|
||||||
|
@ -325,7 +325,7 @@ Signed-off-by: T.J. Mercier <tjmercier@google.com>
|
|||||||
mctz = soft_limit_tree.rb_tree_per_node[nid];
|
mctz = soft_limit_tree.rb_tree_per_node[nid];
|
||||||
if (!mctz)
|
if (!mctz)
|
||||||
return;
|
return;
|
||||||
@@ -3523,6 +3533,9 @@ unsigned long mem_cgroup_soft_limit_recl
|
@@ -3524,6 +3534,9 @@ unsigned long mem_cgroup_soft_limit_recl
|
||||||
struct mem_cgroup_tree_per_node *mctz;
|
struct mem_cgroup_tree_per_node *mctz;
|
||||||
unsigned long excess;
|
unsigned long excess;
|
||||||
|
|
||||||
@ -335,7 +335,7 @@ Signed-off-by: T.J. Mercier <tjmercier@google.com>
|
|||||||
if (order > 0)
|
if (order > 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@@ -5386,6 +5399,7 @@ static int mem_cgroup_css_online(struct
|
@@ -5387,6 +5400,7 @@ static int mem_cgroup_css_online(struct
|
||||||
if (unlikely(mem_cgroup_is_root(memcg)))
|
if (unlikely(mem_cgroup_is_root(memcg)))
|
||||||
queue_delayed_work(system_unbound_wq, &stats_flush_dwork,
|
queue_delayed_work(system_unbound_wq, &stats_flush_dwork,
|
||||||
2UL*HZ);
|
2UL*HZ);
|
||||||
@ -343,7 +343,7 @@ Signed-off-by: T.J. Mercier <tjmercier@google.com>
|
|||||||
return 0;
|
return 0;
|
||||||
offline_kmem:
|
offline_kmem:
|
||||||
memcg_offline_kmem(memcg);
|
memcg_offline_kmem(memcg);
|
||||||
@@ -5417,6 +5431,7 @@ static void mem_cgroup_css_offline(struc
|
@@ -5418,6 +5432,7 @@ static void mem_cgroup_css_offline(struc
|
||||||
memcg_offline_kmem(memcg);
|
memcg_offline_kmem(memcg);
|
||||||
reparent_shrinker_deferred(memcg);
|
reparent_shrinker_deferred(memcg);
|
||||||
wb_memcg_offline(memcg);
|
wb_memcg_offline(memcg);
|
||||||
@ -351,7 +351,7 @@ Signed-off-by: T.J. Mercier <tjmercier@google.com>
|
|||||||
|
|
||||||
drain_all_stock(memcg);
|
drain_all_stock(memcg);
|
||||||
|
|
||||||
@@ -5428,6 +5443,7 @@ static void mem_cgroup_css_released(stru
|
@@ -5429,6 +5444,7 @@ static void mem_cgroup_css_released(stru
|
||||||
struct mem_cgroup *memcg = mem_cgroup_from_css(css);
|
struct mem_cgroup *memcg = mem_cgroup_from_css(css);
|
||||||
|
|
||||||
invalidate_reclaim_iterators(memcg);
|
invalidate_reclaim_iterators(memcg);
|
||||||
|
@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <linux/property.h>
|
#include <linux/property.h>
|
||||||
@@ -3511,3 +3512,5 @@ static int __init regmap_initcall(void)
|
@@ -3513,3 +3514,5 @@ static int __init regmap_initcall(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
postcore_initcall(regmap_initcall);
|
postcore_initcall(regmap_initcall);
|
||||||
|
@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
|||||||
|
|
||||||
#define QUECTEL_VENDOR_ID 0x2c7c
|
#define QUECTEL_VENDOR_ID 0x2c7c
|
||||||
/* These Quectel products use Quectel's vendor ID */
|
/* These Quectel products use Quectel's vendor ID */
|
||||||
@@ -1144,6 +1149,11 @@ static const struct usb_device_id option
|
@@ -1147,6 +1152,11 @@ static const struct usb_device_id option
|
||||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
|
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
|
||||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
|
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
|
||||||
.driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
|
.driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
|
||||||
@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
|||||||
/* Quectel products using Qualcomm vendor ID */
|
/* Quectel products using Qualcomm vendor ID */
|
||||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
|
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
|
||||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
|
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
|
||||||
@@ -1185,6 +1195,11 @@ static const struct usb_device_id option
|
@@ -1188,6 +1198,11 @@ static const struct usb_device_id option
|
||||||
.driver_info = ZLP },
|
.driver_info = ZLP },
|
||||||
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
||||||
.driver_info = RSVD(4) },
|
.driver_info = RSVD(4) },
|
||||||
|
@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
--- a/kernel/sched/core.c
|
--- a/kernel/sched/core.c
|
||||||
+++ b/kernel/sched/core.c
|
+++ b/kernel/sched/core.c
|
||||||
@@ -4363,6 +4363,7 @@ int wake_up_state(struct task_struct *p,
|
@@ -4367,6 +4367,7 @@ int wake_up_state(struct task_struct *p,
|
||||||
{
|
{
|
||||||
return try_to_wake_up(p, state, 0);
|
return try_to_wake_up(p, state, 0);
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
|
{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
|
||||||
--- a/drivers/usb/serial/option.c
|
--- a/drivers/usb/serial/option.c
|
||||||
+++ b/drivers/usb/serial/option.c
|
+++ b/drivers/usb/serial/option.c
|
||||||
@@ -2262,6 +2262,12 @@ static const struct usb_device_id option
|
@@ -2266,6 +2266,12 @@ static const struct usb_device_id option
|
||||||
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a2, 0xff) }, /* Fibocom FM101-GL (laptop MBIM) */
|
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a2, 0xff) }, /* Fibocom FM101-GL (laptop MBIM) */
|
||||||
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a4, 0xff), /* Fibocom FM101-GL (laptop MBIM) */
|
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a4, 0xff), /* Fibocom FM101-GL (laptop MBIM) */
|
||||||
.driver_info = RSVD(4) },
|
.driver_info = RSVD(4) },
|
||||||
|
@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|||||||
help
|
help
|
||||||
--- a/init/main.c
|
--- a/init/main.c
|
||||||
+++ b/init/main.c
|
+++ b/init/main.c
|
||||||
@@ -607,6 +607,29 @@ static inline void setup_nr_cpu_ids(void
|
@@ -611,6 +611,29 @@ static inline void setup_nr_cpu_ids(void
|
||||||
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
|
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|||||||
/*
|
/*
|
||||||
* We need to store the untouched command line for future reference.
|
* We need to store the untouched command line for future reference.
|
||||||
* We also need to store the touched command line since the parameter
|
* We also need to store the touched command line since the parameter
|
||||||
@@ -954,6 +977,7 @@ asmlinkage __visible void __init __no_sa
|
@@ -958,6 +981,7 @@ asmlinkage __visible void __init __no_sa
|
||||||
pr_notice("%s", linux_banner);
|
pr_notice("%s", linux_banner);
|
||||||
early_security_init();
|
early_security_init();
|
||||||
setup_arch(&command_line);
|
setup_arch(&command_line);
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
#define QUECTEL_PRODUCT_EC200U 0x0901
|
#define QUECTEL_PRODUCT_EC200U 0x0901
|
||||||
#define QUECTEL_PRODUCT_EC200S_CN 0x6002
|
#define QUECTEL_PRODUCT_EC200S_CN 0x6002
|
||||||
#define QUECTEL_PRODUCT_EC200A 0x6005
|
#define QUECTEL_PRODUCT_EC200A 0x6005
|
||||||
@@ -1243,6 +1244,7 @@ static const struct usb_device_id option
|
@@ -1245,6 +1246,7 @@ static const struct usb_device_id option
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) },
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) },
|
||||||
|
@ -15,11 +15,9 @@ Link: https://lore.kernel.org/r/20230113150310.29709-2-quic_devipriy@quicinc.com
|
|||||||
drivers/soc/qcom/smd-rpm.c | 1 +
|
drivers/soc/qcom/smd-rpm.c | 1 +
|
||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/drivers/soc/qcom/smd-rpm.c b/drivers/soc/qcom/smd-rpm.c
|
|
||||||
index 413f9f4ae9cd..10765775ee17 100644
|
|
||||||
--- a/drivers/soc/qcom/smd-rpm.c
|
--- a/drivers/soc/qcom/smd-rpm.c
|
||||||
+++ b/drivers/soc/qcom/smd-rpm.c
|
+++ b/drivers/soc/qcom/smd-rpm.c
|
||||||
@@ -233,6 +233,7 @@ static void qcom_smd_rpm_remove(struct rpmsg_device *rpdev)
|
@@ -233,6 +233,7 @@ static void qcom_smd_rpm_remove(struct r
|
||||||
static const struct of_device_id qcom_smd_rpm_of_match[] = {
|
static const struct of_device_id qcom_smd_rpm_of_match[] = {
|
||||||
{ .compatible = "qcom,rpm-apq8084" },
|
{ .compatible = "qcom,rpm-apq8084" },
|
||||||
{ .compatible = "qcom,rpm-ipq6018" },
|
{ .compatible = "qcom,rpm-ipq6018" },
|
||||||
@ -27,6 +25,3 @@ index 413f9f4ae9cd..10765775ee17 100644
|
|||||||
{ .compatible = "qcom,rpm-msm8226" },
|
{ .compatible = "qcom,rpm-msm8226" },
|
||||||
{ .compatible = "qcom,rpm-msm8909" },
|
{ .compatible = "qcom,rpm-msm8909" },
|
||||||
{ .compatible = "qcom,rpm-msm8916" },
|
{ .compatible = "qcom,rpm-msm8916" },
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -17,8 +17,6 @@ Link: https://lore.kernel.org/r/20230217083308.12017-2-quic_kathirav@quicinc.com
|
|||||||
drivers/clk/qcom/apss-ipq-pll.c | 60 ++++++++++++++++++++++-----------
|
drivers/clk/qcom/apss-ipq-pll.c | 60 ++++++++++++++++++++++-----------
|
||||||
1 file changed, 41 insertions(+), 19 deletions(-)
|
1 file changed, 41 insertions(+), 19 deletions(-)
|
||||||
|
|
||||||
diff --git a/drivers/clk/qcom/apss-ipq-pll.c b/drivers/clk/qcom/apss-ipq-pll.c
|
|
||||||
index a5aea27eb867..4f2a147e9fb2 100644
|
|
||||||
--- a/drivers/clk/qcom/apss-ipq-pll.c
|
--- a/drivers/clk/qcom/apss-ipq-pll.c
|
||||||
+++ b/drivers/clk/qcom/apss-ipq-pll.c
|
+++ b/drivers/clk/qcom/apss-ipq-pll.c
|
||||||
@@ -8,20 +8,27 @@
|
@@ -8,20 +8,27 @@
|
||||||
@ -60,7 +58,7 @@ index a5aea27eb867..4f2a147e9fb2 100644
|
|||||||
.flags = SUPPORTS_DYNAMIC_UPDATE,
|
.flags = SUPPORTS_DYNAMIC_UPDATE,
|
||||||
.clkr = {
|
.clkr = {
|
||||||
.enable_reg = 0x0,
|
.enable_reg = 0x0,
|
||||||
@@ -61,6 +68,21 @@ static const struct alpha_pll_config ipq8074_pll_config = {
|
@@ -61,6 +68,21 @@ static const struct alpha_pll_config ipq
|
||||||
.test_ctl_hi_val = 0x4000,
|
.test_ctl_hi_val = 0x4000,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -82,7 +80,7 @@ index a5aea27eb867..4f2a147e9fb2 100644
|
|||||||
static const struct regmap_config ipq_pll_regmap_config = {
|
static const struct regmap_config ipq_pll_regmap_config = {
|
||||||
.reg_bits = 32,
|
.reg_bits = 32,
|
||||||
.reg_stride = 4,
|
.reg_stride = 4,
|
||||||
@@ -71,7 +93,7 @@ static const struct regmap_config ipq_pll_regmap_config = {
|
@@ -71,7 +93,7 @@ static const struct regmap_config ipq_pl
|
||||||
|
|
||||||
static int apss_ipq_pll_probe(struct platform_device *pdev)
|
static int apss_ipq_pll_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
@ -91,7 +89,7 @@ index a5aea27eb867..4f2a147e9fb2 100644
|
|||||||
struct device *dev = &pdev->dev;
|
struct device *dev = &pdev->dev;
|
||||||
struct regmap *regmap;
|
struct regmap *regmap;
|
||||||
void __iomem *base;
|
void __iomem *base;
|
||||||
@@ -85,23 +107,23 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
|
@@ -85,23 +107,23 @@ static int apss_ipq_pll_probe(struct pla
|
||||||
if (IS_ERR(regmap))
|
if (IS_ERR(regmap))
|
||||||
return PTR_ERR(regmap);
|
return PTR_ERR(regmap);
|
||||||
|
|
||||||
@ -122,6 +120,3 @@ index a5aea27eb867..4f2a147e9fb2 100644
|
|||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
|
MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -18,8 +18,6 @@ Link: https://lore.kernel.org/r/20230307062232.4889-2-quic_kathirav@quicinc.com
|
|||||||
drivers/clk/qcom/clk-alpha-pll.h | 13 +++-
|
drivers/clk/qcom/clk-alpha-pll.h | 13 +++-
|
||||||
2 files changed, 139 insertions(+), 2 deletions(-)
|
2 files changed, 139 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
|
|
||||||
index 1973d79c9465..8e5e7a26bcc4 100644
|
|
||||||
--- a/drivers/clk/qcom/clk-alpha-pll.c
|
--- a/drivers/clk/qcom/clk-alpha-pll.c
|
||||||
+++ b/drivers/clk/qcom/clk-alpha-pll.c
|
+++ b/drivers/clk/qcom/clk-alpha-pll.c
|
||||||
@@ -1,7 +1,7 @@
|
@@ -1,7 +1,7 @@
|
||||||
@ -31,7 +29,7 @@ index 1973d79c9465..8e5e7a26bcc4 100644
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
@@ -188,6 +188,18 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MAX_REGS] = {
|
@@ -188,6 +188,18 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MA
|
||||||
[PLL_OFF_CONFIG_CTL] = 0x1C,
|
[PLL_OFF_CONFIG_CTL] = 0x1C,
|
||||||
[PLL_OFF_STATUS] = 0x20,
|
[PLL_OFF_STATUS] = 0x20,
|
||||||
},
|
},
|
||||||
@ -59,7 +57,7 @@ index 1973d79c9465..8e5e7a26bcc4 100644
|
|||||||
#define PLL_HUAYRA_M_WIDTH 8
|
#define PLL_HUAYRA_M_WIDTH 8
|
||||||
#define PLL_HUAYRA_M_SHIFT 8
|
#define PLL_HUAYRA_M_SHIFT 8
|
||||||
#define PLL_HUAYRA_M_MASK 0xff
|
#define PLL_HUAYRA_M_MASK 0xff
|
||||||
@@ -2308,3 +2322,115 @@ const struct clk_ops clk_alpha_pll_rivian_evo_ops = {
|
@@ -2308,3 +2322,115 @@ const struct clk_ops clk_alpha_pll_rivia
|
||||||
.round_rate = clk_rivian_evo_pll_round_rate,
|
.round_rate = clk_rivian_evo_pll_round_rate,
|
||||||
};
|
};
|
||||||
EXPORT_SYMBOL_GPL(clk_alpha_pll_rivian_evo_ops);
|
EXPORT_SYMBOL_GPL(clk_alpha_pll_rivian_evo_ops);
|
||||||
@ -175,8 +173,6 @@ index 1973d79c9465..8e5e7a26bcc4 100644
|
|||||||
+ .set_rate = clk_alpha_pll_stromer_set_rate,
|
+ .set_rate = clk_alpha_pll_stromer_set_rate,
|
||||||
+};
|
+};
|
||||||
+EXPORT_SYMBOL_GPL(clk_alpha_pll_stromer_ops);
|
+EXPORT_SYMBOL_GPL(clk_alpha_pll_stromer_ops);
|
||||||
diff --git a/drivers/clk/qcom/clk-alpha-pll.h b/drivers/clk/qcom/clk-alpha-pll.h
|
|
||||||
index f9524b3fce6b..51d4043c7e4f 100644
|
|
||||||
--- a/drivers/clk/qcom/clk-alpha-pll.h
|
--- a/drivers/clk/qcom/clk-alpha-pll.h
|
||||||
+++ b/drivers/clk/qcom/clk-alpha-pll.h
|
+++ b/drivers/clk/qcom/clk-alpha-pll.h
|
||||||
@@ -1,5 +1,9 @@
|
@@ -1,5 +1,9 @@
|
||||||
@ -208,7 +204,7 @@ index f9524b3fce6b..51d4043c7e4f 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
extern const struct clk_ops clk_alpha_pll_ops;
|
extern const struct clk_ops clk_alpha_pll_ops;
|
||||||
@@ -136,6 +144,7 @@ extern const struct clk_ops clk_alpha_pll_hwfsm_ops;
|
@@ -136,6 +144,7 @@ extern const struct clk_ops clk_alpha_pl
|
||||||
extern const struct clk_ops clk_alpha_pll_postdiv_ops;
|
extern const struct clk_ops clk_alpha_pll_postdiv_ops;
|
||||||
extern const struct clk_ops clk_alpha_pll_huayra_ops;
|
extern const struct clk_ops clk_alpha_pll_huayra_ops;
|
||||||
extern const struct clk_ops clk_alpha_pll_postdiv_ro_ops;
|
extern const struct clk_ops clk_alpha_pll_postdiv_ro_ops;
|
||||||
@ -216,7 +212,7 @@ index f9524b3fce6b..51d4043c7e4f 100644
|
|||||||
|
|
||||||
extern const struct clk_ops clk_alpha_pll_fabia_ops;
|
extern const struct clk_ops clk_alpha_pll_fabia_ops;
|
||||||
extern const struct clk_ops clk_alpha_pll_fixed_fabia_ops;
|
extern const struct clk_ops clk_alpha_pll_fixed_fabia_ops;
|
||||||
@@ -182,5 +191,7 @@ void clk_lucid_evo_pll_configure(struct clk_alpha_pll *pll, struct regmap *regma
|
@@ -182,5 +191,7 @@ void clk_lucid_evo_pll_configure(struct
|
||||||
const struct alpha_pll_config *config);
|
const struct alpha_pll_config *config);
|
||||||
void clk_rivian_evo_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,
|
void clk_rivian_evo_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,
|
||||||
const struct alpha_pll_config *config);
|
const struct alpha_pll_config *config);
|
||||||
@ -224,6 +220,3 @@ index f9524b3fce6b..51d4043c7e4f 100644
|
|||||||
+ const struct alpha_pll_config *config);
|
+ const struct alpha_pll_config *config);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -16,8 +16,6 @@ Link: https://lore.kernel.org/r/1678774414-14414-3-git-send-email-quic_varada@qu
|
|||||||
drivers/soc/qcom/socinfo.c | 6 ++++++
|
drivers/soc/qcom/socinfo.c | 6 ++++++
|
||||||
1 file changed, 6 insertions(+)
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
|
|
||||||
index 510a48dbc4ac..5b507f247a64 100644
|
|
||||||
--- a/drivers/soc/qcom/socinfo.c
|
--- a/drivers/soc/qcom/socinfo.c
|
||||||
+++ b/drivers/soc/qcom/socinfo.c
|
+++ b/drivers/soc/qcom/socinfo.c
|
||||||
@@ -280,6 +280,12 @@ static const struct soc_id soc_id[] = {
|
@@ -280,6 +280,12 @@ static const struct soc_id soc_id[] = {
|
||||||
@ -33,6 +31,3 @@ index 510a48dbc4ac..5b507f247a64 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
static const char *socinfo_machine(struct device *dev, unsigned int id)
|
static const char *socinfo_machine(struct device *dev, unsigned int id)
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -21,11 +21,9 @@ Link: https://lore.kernel.org/r/20230316072940.29137-6-quic_devipriy@quicinc.com
|
|||||||
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-al02-c7.dts
|
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-al02-c7.dts
|
||||||
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
|
|
||||||
index d7669a7cee9f..8e04f0f663da 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/Makefile
|
--- a/arch/arm64/boot/dts/qcom/Makefile
|
||||||
+++ b/arch/arm64/boot/dts/qcom/Makefile
|
+++ b/arch/arm64/boot/dts/qcom/Makefile
|
||||||
@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-c1.dtb
|
@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb
|
||||||
@ -33,9 +31,6 @@ index d7669a7cee9f..8e04f0f663da 100644
|
|||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-al02-c7.dts b/arch/arm64/boot/dts/qcom/ipq9574-al02-c7.dts
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..2c8430197ec0
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-al02-c7.dts
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-al02-c7.dts
|
||||||
@@ -0,0 +1,84 @@
|
@@ -0,0 +1,84 @@
|
||||||
@ -123,9 +118,6 @@ index 000000000000..2c8430197ec0
|
|||||||
+&xo_board_clk {
|
+&xo_board_clk {
|
||||||
+ clock-frequency = <24000000>;
|
+ clock-frequency = <24000000>;
|
||||||
+};
|
+};
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..3bb7435f5e7f
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -0,0 +1,270 @@
|
@@ -0,0 +1,270 @@
|
||||||
@ -399,6 +391,3 @@ index 000000000000..3bb7435f5e7f
|
|||||||
+ <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
|
+ <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
|
||||||
+ };
|
+ };
|
||||||
+};
|
+};
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -13,8 +13,6 @@ Link: https://lore.kernel.org/r/20230316072940.29137-7-quic_devipriy@quicinc.com
|
|||||||
arch/arm64/configs/defconfig | 2 ++
|
arch/arm64/configs/defconfig | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
|
|
||||||
index 623e9f308f38..90dd3cf7bcad 100644
|
|
||||||
--- a/arch/arm64/configs/defconfig
|
--- a/arch/arm64/configs/defconfig
|
||||||
+++ b/arch/arm64/configs/defconfig
|
+++ b/arch/arm64/configs/defconfig
|
||||||
@@ -537,6 +537,7 @@ CONFIG_PINCTRL_IMX93=y
|
@@ -537,6 +537,7 @@ CONFIG_PINCTRL_IMX93=y
|
||||||
@ -33,6 +31,3 @@ index 623e9f308f38..90dd3cf7bcad 100644
|
|||||||
CONFIG_MSM_GCC_8916=y
|
CONFIG_MSM_GCC_8916=y
|
||||||
CONFIG_MSM_GCC_8994=y
|
CONFIG_MSM_GCC_8994=y
|
||||||
CONFIG_MSM_MMCC_8996=y
|
CONFIG_MSM_MMCC_8996=y
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -18,8 +18,6 @@ Link: https://lore.kernel.org/r/20230316072940.29137-3-quic_devipriy@quicinc.com
|
|||||||
3 files changed, 4257 insertions(+)
|
3 files changed, 4257 insertions(+)
|
||||||
create mode 100644 drivers/clk/qcom/gcc-ipq9574.c
|
create mode 100644 drivers/clk/qcom/gcc-ipq9574.c
|
||||||
|
|
||||||
diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
|
|
||||||
index cbf55949c649..94340ee631c3 100644
|
|
||||||
--- a/drivers/clk/qcom/Kconfig
|
--- a/drivers/clk/qcom/Kconfig
|
||||||
+++ b/drivers/clk/qcom/Kconfig
|
+++ b/drivers/clk/qcom/Kconfig
|
||||||
@@ -174,6 +174,14 @@ config IPQ_GCC_8074
|
@@ -174,6 +174,14 @@ config IPQ_GCC_8074
|
||||||
@ -37,11 +35,9 @@ index cbf55949c649..94340ee631c3 100644
|
|||||||
config MSM_GCC_8660
|
config MSM_GCC_8660
|
||||||
tristate "MSM8660 Global Clock Controller"
|
tristate "MSM8660 Global Clock Controller"
|
||||||
help
|
help
|
||||||
diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile
|
|
||||||
index e6cecf9e0436..1a4c4d55cb17 100644
|
|
||||||
--- a/drivers/clk/qcom/Makefile
|
--- a/drivers/clk/qcom/Makefile
|
||||||
+++ b/drivers/clk/qcom/Makefile
|
+++ b/drivers/clk/qcom/Makefile
|
||||||
@@ -27,6 +27,7 @@ obj-$(CONFIG_IPQ_GCC_4019) += gcc-ipq4019.o
|
@@ -27,6 +27,7 @@ obj-$(CONFIG_IPQ_GCC_4019) += gcc-ipq401
|
||||||
obj-$(CONFIG_IPQ_GCC_6018) += gcc-ipq6018.o
|
obj-$(CONFIG_IPQ_GCC_6018) += gcc-ipq6018.o
|
||||||
obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o
|
obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o
|
||||||
obj-$(CONFIG_IPQ_GCC_8074) += gcc-ipq8074.o
|
obj-$(CONFIG_IPQ_GCC_8074) += gcc-ipq8074.o
|
||||||
@ -49,9 +45,6 @@ index e6cecf9e0436..1a4c4d55cb17 100644
|
|||||||
obj-$(CONFIG_IPQ_LCC_806X) += lcc-ipq806x.o
|
obj-$(CONFIG_IPQ_LCC_806X) += lcc-ipq806x.o
|
||||||
obj-$(CONFIG_MDM_GCC_9607) += gcc-mdm9607.o
|
obj-$(CONFIG_MDM_GCC_9607) += gcc-mdm9607.o
|
||||||
obj-$(CONFIG_MDM_GCC_9615) += gcc-mdm9615.o
|
obj-$(CONFIG_MDM_GCC_9615) += gcc-mdm9615.o
|
||||||
diff --git a/drivers/clk/qcom/gcc-ipq9574.c b/drivers/clk/qcom/gcc-ipq9574.c
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..b2a2d618a5ec
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/drivers/clk/qcom/gcc-ipq9574.c
|
+++ b/drivers/clk/qcom/gcc-ipq9574.c
|
||||||
@@ -0,0 +1,4248 @@
|
@@ -0,0 +1,4248 @@
|
||||||
@ -4303,6 +4296,3 @@ index 000000000000..b2a2d618a5ec
|
|||||||
+
|
+
|
||||||
+MODULE_DESCRIPTION("Qualcomm Technologies, Inc. GCC IPQ9574 Driver");
|
+MODULE_DESCRIPTION("Qualcomm Technologies, Inc. GCC IPQ9574 Driver");
|
||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -21,9 +21,6 @@ Link: https://lore.kernel.org/r/20230316072940.29137-2-quic_devipriy@quicinc.com
|
|||||||
create mode 100644 include/dt-bindings/clock/qcom,ipq9574-gcc.h
|
create mode 100644 include/dt-bindings/clock/qcom,ipq9574-gcc.h
|
||||||
create mode 100644 include/dt-bindings/reset/qcom,ipq9574-gcc.h
|
create mode 100644 include/dt-bindings/reset/qcom,ipq9574-gcc.h
|
||||||
|
|
||||||
diff --git a/Documentation/devicetree/bindings/clock/qcom,ipq9574-gcc.yaml b/Documentation/devicetree/bindings/clock/qcom,ipq9574-gcc.yaml
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..afc68eb9d7cc
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/Documentation/devicetree/bindings/clock/qcom,ipq9574-gcc.yaml
|
+++ b/Documentation/devicetree/bindings/clock/qcom,ipq9574-gcc.yaml
|
||||||
@@ -0,0 +1,61 @@
|
@@ -0,0 +1,61 @@
|
||||||
@ -88,9 +85,6 @@ index 000000000000..afc68eb9d7cc
|
|||||||
+ #power-domain-cells = <1>;
|
+ #power-domain-cells = <1>;
|
||||||
+ };
|
+ };
|
||||||
+...
|
+...
|
||||||
diff --git a/include/dt-bindings/clock/qcom,ipq9574-gcc.h b/include/dt-bindings/clock/qcom,ipq9574-gcc.h
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..5a2961bfe893
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/include/dt-bindings/clock/qcom,ipq9574-gcc.h
|
+++ b/include/dt-bindings/clock/qcom,ipq9574-gcc.h
|
||||||
@@ -0,0 +1,213 @@
|
@@ -0,0 +1,213 @@
|
||||||
@ -307,9 +301,6 @@ index 000000000000..5a2961bfe893
|
|||||||
+#define GCC_SNOC_PCIE2_2LANE_S_CLK 202
|
+#define GCC_SNOC_PCIE2_2LANE_S_CLK 202
|
||||||
+#define GCC_SNOC_PCIE3_2LANE_S_CLK 203
|
+#define GCC_SNOC_PCIE3_2LANE_S_CLK 203
|
||||||
+#endif
|
+#endif
|
||||||
diff --git a/include/dt-bindings/reset/qcom,ipq9574-gcc.h b/include/dt-bindings/reset/qcom,ipq9574-gcc.h
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..d01dc6a24cf1
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/include/dt-bindings/reset/qcom,ipq9574-gcc.h
|
+++ b/include/dt-bindings/reset/qcom,ipq9574-gcc.h
|
||||||
@@ -0,0 +1,164 @@
|
@@ -0,0 +1,164 @@
|
||||||
@ -477,6 +468,3 @@ index 000000000000..d01dc6a24cf1
|
|||||||
+#define GCC_TCSR_BCR 153
|
+#define GCC_TCSR_BCR 153
|
||||||
+
|
+
|
||||||
+#endif
|
+#endif
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -18,8 +18,6 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|||||||
3 files changed, 838 insertions(+)
|
3 files changed, 838 insertions(+)
|
||||||
create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq9574.c
|
create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq9574.c
|
||||||
|
|
||||||
diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
|
|
||||||
index 9dc2d803a586..c8b6a4d90f3c 100644
|
|
||||||
--- a/drivers/pinctrl/qcom/Kconfig
|
--- a/drivers/pinctrl/qcom/Kconfig
|
||||||
+++ b/drivers/pinctrl/qcom/Kconfig
|
+++ b/drivers/pinctrl/qcom/Kconfig
|
||||||
@@ -70,6 +70,17 @@ config PINCTRL_IPQ6018
|
@@ -70,6 +70,17 @@ config PINCTRL_IPQ6018
|
||||||
@ -40,11 +38,9 @@ index 9dc2d803a586..c8b6a4d90f3c 100644
|
|||||||
config PINCTRL_MSM8226
|
config PINCTRL_MSM8226
|
||||||
tristate "Qualcomm 8226 pin controller driver"
|
tristate "Qualcomm 8226 pin controller driver"
|
||||||
depends on OF
|
depends on OF
|
||||||
diff --git a/drivers/pinctrl/qcom/Makefile b/drivers/pinctrl/qcom/Makefile
|
|
||||||
index 8269a1db8794..79302d518ff3 100644
|
|
||||||
--- a/drivers/pinctrl/qcom/Makefile
|
--- a/drivers/pinctrl/qcom/Makefile
|
||||||
+++ b/drivers/pinctrl/qcom/Makefile
|
+++ b/drivers/pinctrl/qcom/Makefile
|
||||||
@@ -7,6 +7,7 @@ obj-$(CONFIG_PINCTRL_IPQ4019) += pinctrl-ipq4019.o
|
@@ -7,6 +7,7 @@ obj-$(CONFIG_PINCTRL_IPQ4019) += pinctrl
|
||||||
obj-$(CONFIG_PINCTRL_IPQ8064) += pinctrl-ipq8064.o
|
obj-$(CONFIG_PINCTRL_IPQ8064) += pinctrl-ipq8064.o
|
||||||
obj-$(CONFIG_PINCTRL_IPQ8074) += pinctrl-ipq8074.o
|
obj-$(CONFIG_PINCTRL_IPQ8074) += pinctrl-ipq8074.o
|
||||||
obj-$(CONFIG_PINCTRL_IPQ6018) += pinctrl-ipq6018.o
|
obj-$(CONFIG_PINCTRL_IPQ6018) += pinctrl-ipq6018.o
|
||||||
@ -52,9 +48,6 @@ index 8269a1db8794..79302d518ff3 100644
|
|||||||
obj-$(CONFIG_PINCTRL_MSM8226) += pinctrl-msm8226.o
|
obj-$(CONFIG_PINCTRL_MSM8226) += pinctrl-msm8226.o
|
||||||
obj-$(CONFIG_PINCTRL_MSM8660) += pinctrl-msm8660.o
|
obj-$(CONFIG_PINCTRL_MSM8660) += pinctrl-msm8660.o
|
||||||
obj-$(CONFIG_PINCTRL_MSM8960) += pinctrl-msm8960.o
|
obj-$(CONFIG_PINCTRL_MSM8960) += pinctrl-msm8960.o
|
||||||
diff --git a/drivers/pinctrl/qcom/pinctrl-ipq9574.c b/drivers/pinctrl/qcom/pinctrl-ipq9574.c
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..7f057b62475f
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/drivers/pinctrl/qcom/pinctrl-ipq9574.c
|
+++ b/drivers/pinctrl/qcom/pinctrl-ipq9574.c
|
||||||
@@ -0,0 +1,826 @@
|
@@ -0,0 +1,826 @@
|
||||||
@ -884,6 +877,3 @@ index 000000000000..7f057b62475f
|
|||||||
+
|
+
|
||||||
+MODULE_DESCRIPTION("QTI IPQ9574 TLMM driver");
|
+MODULE_DESCRIPTION("QTI IPQ9574 TLMM driver");
|
||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/20230406061314.10916-5-quic_devipriy@quicinc.com
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 18 ++++++++++++++++++
|
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 18 ++++++++++++++++++
|
||||||
1 file changed, 18 insertions(+)
|
1 file changed, 18 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
index 3bb7435f5e7f..00aeb994ee60 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -201,6 +201,24 @@ v2m2: v2m@2000 {
|
@@ -201,6 +201,24 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -43,6 +41,3 @@ index 3bb7435f5e7f..00aeb994ee60 100644
|
|||||||
timer@b120000 {
|
timer@b120000 {
|
||||||
compatible = "arm,armv7-timer-mem";
|
compatible = "arm,armv7-timer-mem";
|
||||||
reg = <0x0b120000 0x1000>;
|
reg = <0x0b120000 0x1000>;
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -17,11 +17,9 @@ Link: https://lore.kernel.org/r/20230406061314.10916-3-quic_devipriy@quicinc.com
|
|||||||
drivers/clk/qcom/apss-ipq-pll.c | 19 +++++++++++++++++++
|
drivers/clk/qcom/apss-ipq-pll.c | 19 +++++++++++++++++++
|
||||||
1 file changed, 19 insertions(+)
|
1 file changed, 19 insertions(+)
|
||||||
|
|
||||||
diff --git a/drivers/clk/qcom/apss-ipq-pll.c b/drivers/clk/qcom/apss-ipq-pll.c
|
|
||||||
index 4f2a147e9fb2..56f33af11311 100644
|
|
||||||
--- a/drivers/clk/qcom/apss-ipq-pll.c
|
--- a/drivers/clk/qcom/apss-ipq-pll.c
|
||||||
+++ b/drivers/clk/qcom/apss-ipq-pll.c
|
+++ b/drivers/clk/qcom/apss-ipq-pll.c
|
||||||
@@ -68,6 +68,18 @@ static const struct alpha_pll_config ipq8074_pll_config = {
|
@@ -68,6 +68,18 @@ static const struct alpha_pll_config ipq
|
||||||
.test_ctl_hi_val = 0x4000,
|
.test_ctl_hi_val = 0x4000,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -40,7 +38,7 @@ index 4f2a147e9fb2..56f33af11311 100644
|
|||||||
struct apss_pll_data {
|
struct apss_pll_data {
|
||||||
struct clk_alpha_pll *pll;
|
struct clk_alpha_pll *pll;
|
||||||
const struct alpha_pll_config *pll_config;
|
const struct alpha_pll_config *pll_config;
|
||||||
@@ -83,6 +95,12 @@ static struct apss_pll_data ipq6018_pll_data = {
|
@@ -83,6 +95,12 @@ static struct apss_pll_data ipq6018_pll_
|
||||||
.pll_config = &ipq6018_pll_config,
|
.pll_config = &ipq6018_pll_config,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -53,7 +51,7 @@ index 4f2a147e9fb2..56f33af11311 100644
|
|||||||
static const struct regmap_config ipq_pll_regmap_config = {
|
static const struct regmap_config ipq_pll_regmap_config = {
|
||||||
.reg_bits = 32,
|
.reg_bits = 32,
|
||||||
.reg_stride = 4,
|
.reg_stride = 4,
|
||||||
@@ -124,6 +142,7 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
|
@@ -124,6 +142,7 @@ static int apss_ipq_pll_probe(struct pla
|
||||||
static const struct of_device_id apss_ipq_pll_match_table[] = {
|
static const struct of_device_id apss_ipq_pll_match_table[] = {
|
||||||
{ .compatible = "qcom,ipq6018-a53pll", .data = &ipq6018_pll_data },
|
{ .compatible = "qcom,ipq6018-a53pll", .data = &ipq6018_pll_data },
|
||||||
{ .compatible = "qcom,ipq8074-a53pll", .data = &ipq8074_pll_data },
|
{ .compatible = "qcom,ipq8074-a53pll", .data = &ipq8074_pll_data },
|
||||||
@ -61,6 +59,3 @@ index 4f2a147e9fb2..56f33af11311 100644
|
|||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
|
MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -15,11 +15,9 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
|||||||
drivers/regulator/qcom_smd-regulator.c | 5 +++--
|
drivers/regulator/qcom_smd-regulator.c | 5 +++--
|
||||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/drivers/regulator/qcom_smd-regulator.c b/drivers/regulator/qcom_smd-regulator.c
|
|
||||||
index f98168d58dce..88ef56a60b2a 100644
|
|
||||||
--- a/drivers/regulator/qcom_smd-regulator.c
|
--- a/drivers/regulator/qcom_smd-regulator.c
|
||||||
+++ b/drivers/regulator/qcom_smd-regulator.c
|
+++ b/drivers/regulator/qcom_smd-regulator.c
|
||||||
@@ -731,7 +731,7 @@ static const struct regulator_desc pms405_pldo600 = {
|
@@ -731,7 +731,7 @@ static const struct regulator_desc pms40
|
||||||
.ops = &rpm_smps_ldo_ops,
|
.ops = &rpm_smps_ldo_ops,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -38,6 +36,3 @@ index f98168d58dce..88ef56a60b2a 100644
|
|||||||
{ "l2", QCOM_SMD_RPM_LDOA, 2, &mp5496_ldoa2, "l2" },
|
{ "l2", QCOM_SMD_RPM_LDOA, 2, &mp5496_ldoa2, "l2" },
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -16,11 +16,9 @@ Link: https://lore.kernel.org/r/20230425084010.15581-7-quic_devipriy@quicinc.com
|
|||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
rename arch/arm64/boot/dts/qcom/{ipq9574-al02-c7.dts => ipq9574-rdp433.dts} (97%)
|
rename arch/arm64/boot/dts/qcom/{ipq9574-al02-c7.dts => ipq9574-rdp433.dts} (97%)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
|
|
||||||
index 8e04f0f663da..3754d83ed2cb 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/Makefile
|
--- a/arch/arm64/boot/dts/qcom/Makefile
|
||||||
+++ b/arch/arm64/boot/dts/qcom/Makefile
|
+++ b/arch/arm64/boot/dts/qcom/Makefile
|
||||||
@@ -7,7 +7,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-c1.dtb
|
@@ -7,7 +7,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb
|
||||||
@ -29,21 +27,177 @@ index 8e04f0f663da..3754d83ed2cb 100644
|
|||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-al02-c7.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
|
||||||
similarity index 97%
|
|
||||||
rename from arch/arm64/boot/dts/qcom/ipq9574-al02-c7.dts
|
|
||||||
rename to arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
|
||||||
index 2c8430197ec0..2ce8e09e7565 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574-al02-c7.dts
|
--- a/arch/arm64/boot/dts/qcom/ipq9574-al02-c7.dts
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
+++ /dev/null
|
||||||
@@ -1,6 +1,6 @@
|
@@ -1,84 +0,0 @@
|
||||||
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
|
-// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
|
||||||
/*
|
-/*
|
||||||
- * IPQ9574 AL02-C7 board device tree source
|
- * IPQ9574 AL02-C7 board device tree source
|
||||||
|
- *
|
||||||
|
- * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
|
||||||
|
- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
-/dts-v1/;
|
||||||
|
-
|
||||||
|
-#include "ipq9574.dtsi"
|
||||||
|
-
|
||||||
|
-/ {
|
||||||
|
- model = "Qualcomm Technologies, Inc. IPQ9574/AP-AL02-C7";
|
||||||
|
- compatible = "qcom,ipq9574-ap-al02-c7", "qcom,ipq9574";
|
||||||
|
-
|
||||||
|
- aliases {
|
||||||
|
- serial0 = &blsp1_uart2;
|
||||||
|
- };
|
||||||
|
-
|
||||||
|
- chosen {
|
||||||
|
- stdout-path = "serial0:115200n8";
|
||||||
|
- };
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-&blsp1_uart2 {
|
||||||
|
- pinctrl-0 = <&uart2_pins>;
|
||||||
|
- pinctrl-names = "default";
|
||||||
|
- status = "okay";
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-&sdhc_1 {
|
||||||
|
- pinctrl-0 = <&sdc_default_state>;
|
||||||
|
- pinctrl-names = "default";
|
||||||
|
- mmc-ddr-1_8v;
|
||||||
|
- mmc-hs200-1_8v;
|
||||||
|
- mmc-hs400-1_8v;
|
||||||
|
- mmc-hs400-enhanced-strobe;
|
||||||
|
- max-frequency = <384000000>;
|
||||||
|
- bus-width = <8>;
|
||||||
|
- status = "okay";
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-&sleep_clk {
|
||||||
|
- clock-frequency = <32000>;
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-&tlmm {
|
||||||
|
- sdc_default_state: sdc-default-state {
|
||||||
|
- clk-pins {
|
||||||
|
- pins = "gpio5";
|
||||||
|
- function = "sdc_clk";
|
||||||
|
- drive-strength = <8>;
|
||||||
|
- bias-disable;
|
||||||
|
- };
|
||||||
|
-
|
||||||
|
- cmd-pins {
|
||||||
|
- pins = "gpio4";
|
||||||
|
- function = "sdc_cmd";
|
||||||
|
- drive-strength = <8>;
|
||||||
|
- bias-pull-up;
|
||||||
|
- };
|
||||||
|
-
|
||||||
|
- data-pins {
|
||||||
|
- pins = "gpio0", "gpio1", "gpio2",
|
||||||
|
- "gpio3", "gpio6", "gpio7",
|
||||||
|
- "gpio8", "gpio9";
|
||||||
|
- function = "sdc_data";
|
||||||
|
- drive-strength = <8>;
|
||||||
|
- bias-pull-up;
|
||||||
|
- };
|
||||||
|
-
|
||||||
|
- rclk-pins {
|
||||||
|
- pins = "gpio10";
|
||||||
|
- function = "sdc_rclk";
|
||||||
|
- drive-strength = <8>;
|
||||||
|
- bias-pull-down;
|
||||||
|
- };
|
||||||
|
- };
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-&xo_board_clk {
|
||||||
|
- clock-frequency = <24000000>;
|
||||||
|
-};
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
||||||
|
@@ -0,0 +1,84 @@
|
||||||
|
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
|
||||||
|
+/*
|
||||||
+ * IPQ9574 RDP433 board device tree source
|
+ * IPQ9574 RDP433 board device tree source
|
||||||
*
|
+ *
|
||||||
* Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
|
+ * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
|
||||||
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
--
|
+ */
|
||||||
2.34.1
|
+
|
||||||
|
+/dts-v1/;
|
||||||
|
+
|
||||||
|
+#include "ipq9574.dtsi"
|
||||||
|
+
|
||||||
|
+/ {
|
||||||
|
+ model = "Qualcomm Technologies, Inc. IPQ9574/AP-AL02-C7";
|
||||||
|
+ compatible = "qcom,ipq9574-ap-al02-c7", "qcom,ipq9574";
|
||||||
|
+
|
||||||
|
+ aliases {
|
||||||
|
+ serial0 = &blsp1_uart2;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ chosen {
|
||||||
|
+ stdout-path = "serial0:115200n8";
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&blsp1_uart2 {
|
||||||
|
+ pinctrl-0 = <&uart2_pins>;
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&sdhc_1 {
|
||||||
|
+ pinctrl-0 = <&sdc_default_state>;
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ mmc-ddr-1_8v;
|
||||||
|
+ mmc-hs200-1_8v;
|
||||||
|
+ mmc-hs400-1_8v;
|
||||||
|
+ mmc-hs400-enhanced-strobe;
|
||||||
|
+ max-frequency = <384000000>;
|
||||||
|
+ bus-width = <8>;
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&sleep_clk {
|
||||||
|
+ clock-frequency = <32000>;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&tlmm {
|
||||||
|
+ sdc_default_state: sdc-default-state {
|
||||||
|
+ clk-pins {
|
||||||
|
+ pins = "gpio5";
|
||||||
|
+ function = "sdc_clk";
|
||||||
|
+ drive-strength = <8>;
|
||||||
|
+ bias-disable;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ cmd-pins {
|
||||||
|
+ pins = "gpio4";
|
||||||
|
+ function = "sdc_cmd";
|
||||||
|
+ drive-strength = <8>;
|
||||||
|
+ bias-pull-up;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ data-pins {
|
||||||
|
+ pins = "gpio0", "gpio1", "gpio2",
|
||||||
|
+ "gpio3", "gpio6", "gpio7",
|
||||||
|
+ "gpio8", "gpio9";
|
||||||
|
+ function = "sdc_data";
|
||||||
|
+ drive-strength = <8>;
|
||||||
|
+ bias-pull-up;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ rclk-pins {
|
||||||
|
+ pins = "gpio10";
|
||||||
|
+ function = "sdc_rclk";
|
||||||
|
+ drive-strength = <8>;
|
||||||
|
+ bias-pull-down;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&xo_board_clk {
|
||||||
|
+ clock-frequency = <24000000>;
|
||||||
|
+};
|
||||||
|
@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/20230425084010.15581-6-quic_devipriy@quicinc.com
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 8 +-------
|
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 8 +-------
|
||||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
index 00aeb994ee60..0b8cd6ca0abe 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -16,12 +16,6 @@ / {
|
@@ -16,12 +16,6 @@
|
||||||
#size-cells = <2>;
|
#size-cells = <2>;
|
||||||
|
|
||||||
clocks {
|
clocks {
|
||||||
@ -30,7 +28,7 @@ index 00aeb994ee60..0b8cd6ca0abe 100644
|
|||||||
sleep_clk: sleep-clk {
|
sleep_clk: sleep-clk {
|
||||||
compatible = "fixed-clock";
|
compatible = "fixed-clock";
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
@@ -131,7 +125,7 @@ gcc: clock-controller@1800000 {
|
@@ -131,7 +125,7 @@
|
||||||
reg = <0x01800000 0x80000>;
|
reg = <0x01800000 0x80000>;
|
||||||
clocks = <&xo_board_clk>,
|
clocks = <&xo_board_clk>,
|
||||||
<&sleep_clk>,
|
<&sleep_clk>,
|
||||||
@ -39,6 +37,3 @@ index 00aeb994ee60..0b8cd6ca0abe 100644
|
|||||||
<0>,
|
<0>,
|
||||||
<0>,
|
<0>,
|
||||||
<0>,
|
<0>,
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -15,11 +15,9 @@ Link: https://lore.kernel.org/r/20230425084010.15581-2-quic_devipriy@quicinc.com
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 6 +++---
|
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 6 +++---
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
index 0b8cd6ca0abe..77fd9b02df69 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -166,14 +166,14 @@ blsp1_uart2: serial@78b1000 {
|
@@ -166,14 +166,14 @@
|
||||||
intc: interrupt-controller@b000000 {
|
intc: interrupt-controller@b000000 {
|
||||||
compatible = "qcom,msm-qgic2";
|
compatible = "qcom,msm-qgic2";
|
||||||
reg = <0x0b000000 0x1000>, /* GICD */
|
reg = <0x0b000000 0x1000>, /* GICD */
|
||||||
@ -37,6 +35,3 @@ index 0b8cd6ca0abe..77fd9b02df69 100644
|
|||||||
ranges = <0 0x0b00c000 0x3000>;
|
ranges = <0 0x0b00c000 0x3000>;
|
||||||
|
|
||||||
v2m0: v2m@0 {
|
v2m0: v2m@0 {
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -19,11 +19,9 @@ Link: https://lore.kernel.org/r/20230510104359.16678-3-quic_devipriy@quicinc.com
|
|||||||
2 files changed, 125 insertions(+)
|
2 files changed, 125 insertions(+)
|
||||||
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
|
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
|
|
||||||
index 3754d83ed2cb..c3aaa9e91dce 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/Makefile
|
--- a/arch/arm64/boot/dts/qcom/Makefile
|
||||||
+++ b/arch/arm64/boot/dts/qcom/Makefile
|
+++ b/arch/arm64/boot/dts/qcom/Makefile
|
||||||
@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-c1.dtb
|
@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb
|
||||||
@ -31,9 +29,6 @@ index 3754d83ed2cb..c3aaa9e91dce 100644
|
|||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..2b093e02637b
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
|
||||||
@@ -0,0 +1,124 @@
|
@@ -0,0 +1,124 @@
|
||||||
@ -161,6 +156,3 @@ index 000000000000..2b093e02637b
|
|||||||
+&xo_board_clk {
|
+&xo_board_clk {
|
||||||
+ clock-frequency = <24000000>;
|
+ clock-frequency = <24000000>;
|
||||||
+};
|
+};
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -12,11 +12,9 @@ Link: https://lore.kernel.org/r/20230511075814.2370-3-quic_poovendh@quicinc.com
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 13 +++++++++++++
|
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 13 +++++++++++++
|
||||||
1 file changed, 13 insertions(+)
|
1 file changed, 13 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
index 77fd9b02df69..a8ce148e52e4 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -94,6 +94,13 @@ tz_region: tz@4a600000 {
|
@@ -94,6 +94,13 @@
|
||||||
reg = <0x0 0x4a600000 0x0 0x400000>;
|
reg = <0x0 0x4a600000 0x0 0x400000>;
|
||||||
no-map;
|
no-map;
|
||||||
};
|
};
|
||||||
@ -30,7 +28,7 @@ index 77fd9b02df69..a8ce148e52e4 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
soc: soc@0 {
|
soc: soc@0 {
|
||||||
@@ -136,6 +143,12 @@ gcc: clock-controller@1800000 {
|
@@ -136,6 +143,12 @@
|
||||||
#power-domain-cells = <1>;
|
#power-domain-cells = <1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -43,6 +41,3 @@ index 77fd9b02df69..a8ce148e52e4 100644
|
|||||||
sdhc_1: mmc@7804000 {
|
sdhc_1: mmc@7804000 {
|
||||||
compatible = "qcom,ipq9574-sdhci", "qcom,sdhci-msm-v5";
|
compatible = "qcom,ipq9574-sdhci", "qcom,sdhci-msm-v5";
|
||||||
reg = <0x07804000 0x1000>, <0x07805000 0x1000>;
|
reg = <0x07804000 0x1000>, <0x07805000 0x1000>;
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -18,11 +18,9 @@ Link: https://lore.kernel.org/r/20230516135013.3547-3-quic_devipriy@quicinc.com
|
|||||||
2 files changed, 81 insertions(+)
|
2 files changed, 81 insertions(+)
|
||||||
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
|
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
|
|
||||||
index c3aaa9e91dce..f237a3683ca4 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/Makefile
|
--- a/arch/arm64/boot/dts/qcom/Makefile
|
||||||
+++ b/arch/arm64/boot/dts/qcom/Makefile
|
+++ b/arch/arm64/boot/dts/qcom/Makefile
|
||||||
@@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb
|
@@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp418.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp418.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb
|
||||||
@ -30,9 +28,6 @@ index c3aaa9e91dce..f237a3683ca4 100644
|
|||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..c8fa54e1a62c
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
|
||||||
@@ -0,0 +1,80 @@
|
@@ -0,0 +1,80 @@
|
||||||
@ -116,6 +111,3 @@ index 000000000000..c8fa54e1a62c
|
|||||||
+&xo_board_clk {
|
+&xo_board_clk {
|
||||||
+ clock-frequency = <24000000>;
|
+ clock-frequency = <24000000>;
|
||||||
+};
|
+};
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -15,8 +15,6 @@ Link: https://lore.kernel.org/r/20230517172527.1968-4-quic_devipriy@quicinc.com
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 60 ++++++++++++++++++++++++++-
|
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 60 ++++++++++++++++++++++++++-
|
||||||
1 file changed, 59 insertions(+), 1 deletion(-)
|
1 file changed, 59 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
index a8ce148e52e4..2d0a10f6c302 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -6,8 +6,9 @@
|
@@ -6,8 +6,9 @@
|
||||||
@ -30,7 +28,7 @@ index a8ce148e52e4..2d0a10f6c302 100644
|
|||||||
#include <dt-bindings/reset/qcom,ipq9574-gcc.h>
|
#include <dt-bindings/reset/qcom,ipq9574-gcc.h>
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
@@ -37,6 +38,10 @@ CPU0: cpu@0 {
|
@@ -37,6 +38,10 @@
|
||||||
reg = <0x0>;
|
reg = <0x0>;
|
||||||
enable-method = "psci";
|
enable-method = "psci";
|
||||||
next-level-cache = <&L2_0>;
|
next-level-cache = <&L2_0>;
|
||||||
@ -41,7 +39,7 @@ index a8ce148e52e4..2d0a10f6c302 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
CPU1: cpu@1 {
|
CPU1: cpu@1 {
|
||||||
@@ -45,6 +50,10 @@ CPU1: cpu@1 {
|
@@ -45,6 +50,10 @@
|
||||||
reg = <0x1>;
|
reg = <0x1>;
|
||||||
enable-method = "psci";
|
enable-method = "psci";
|
||||||
next-level-cache = <&L2_0>;
|
next-level-cache = <&L2_0>;
|
||||||
@ -52,7 +50,7 @@ index a8ce148e52e4..2d0a10f6c302 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
CPU2: cpu@2 {
|
CPU2: cpu@2 {
|
||||||
@@ -53,6 +62,10 @@ CPU2: cpu@2 {
|
@@ -53,6 +62,10 @@
|
||||||
reg = <0x2>;
|
reg = <0x2>;
|
||||||
enable-method = "psci";
|
enable-method = "psci";
|
||||||
next-level-cache = <&L2_0>;
|
next-level-cache = <&L2_0>;
|
||||||
@ -63,7 +61,7 @@ index a8ce148e52e4..2d0a10f6c302 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
CPU3: cpu@3 {
|
CPU3: cpu@3 {
|
||||||
@@ -61,6 +74,10 @@ CPU3: cpu@3 {
|
@@ -61,6 +74,10 @@
|
||||||
reg = <0x3>;
|
reg = <0x3>;
|
||||||
enable-method = "psci";
|
enable-method = "psci";
|
||||||
next-level-cache = <&L2_0>;
|
next-level-cache = <&L2_0>;
|
||||||
@ -74,7 +72,7 @@ index a8ce148e52e4..2d0a10f6c302 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
L2_0: l2-cache {
|
L2_0: l2-cache {
|
||||||
@@ -75,6 +92,47 @@ memory@40000000 {
|
@@ -75,6 +92,47 @@
|
||||||
reg = <0x0 0x40000000 0x0 0x0>;
|
reg = <0x0 0x40000000 0x0 0x0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -122,6 +120,3 @@ index a8ce148e52e4..2d0a10f6c302 100644
|
|||||||
pmu {
|
pmu {
|
||||||
compatible = "arm,cortex-a73-pmu";
|
compatible = "arm,cortex-a73-pmu";
|
||||||
interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
|
interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -15,11 +15,9 @@ Link: https://lore.kernel.org/r/20230517172527.1968-3-quic_devipriy@quicinc.com
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts | 19 +++++++++++++++++++
|
arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts | 19 +++++++++++++++++++
|
||||||
1 file changed, 19 insertions(+)
|
1 file changed, 19 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
|
||||||
index 2ce8e09e7565..2b3ed8d351f7 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
||||||
@@ -29,6 +29,25 @@ &blsp1_uart2 {
|
@@ -29,6 +29,25 @@
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -45,6 +43,3 @@ index 2ce8e09e7565..2b3ed8d351f7 100644
|
|||||||
&sdhc_1 {
|
&sdhc_1 {
|
||||||
pinctrl-0 = <&sdc_default_state>;
|
pinctrl-0 = <&sdc_default_state>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -16,11 +16,9 @@ Link: https://lore.kernel.org/r/20230517172527.1968-2-quic_devipriy@quicinc.com
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 17 +++++++++++++++++
|
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 17 +++++++++++++++++
|
||||||
1 file changed, 17 insertions(+)
|
1 file changed, 17 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
index 2d0a10f6c302..5d99b9660e33 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -161,12 +161,29 @@ smem@4aa00000 {
|
@@ -161,12 +161,29 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -50,6 +48,3 @@ index 2d0a10f6c302..5d99b9660e33 100644
|
|||||||
tlmm: pinctrl@1000000 {
|
tlmm: pinctrl@1000000 {
|
||||||
compatible = "qcom,ipq9574-tlmm";
|
compatible = "qcom,ipq9574-tlmm";
|
||||||
reg = <0x01000000 0x300000>;
|
reg = <0x01000000 0x300000>;
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/20230517072806.13170-1-quic_kathirav@quicinc.com
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 202 ++++++++++++++++++++++++++
|
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 202 ++++++++++++++++++++++++++
|
||||||
1 file changed, 202 insertions(+)
|
1 file changed, 202 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
index 5d99b9660e33..3bef06ea1c19 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -184,6 +184,13 @@ rpm_msg_ram: sram@60000 {
|
@@ -184,6 +184,13 @@
|
||||||
reg = <0x00060000 0x6000>;
|
reg = <0x00060000 0x6000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -31,7 +29,7 @@ index 5d99b9660e33..3bef06ea1c19 100644
|
|||||||
tlmm: pinctrl@1000000 {
|
tlmm: pinctrl@1000000 {
|
||||||
compatible = "qcom,ipq9574-tlmm";
|
compatible = "qcom,ipq9574-tlmm";
|
||||||
reg = <0x01000000 0x300000>;
|
reg = <0x01000000 0x300000>;
|
||||||
@@ -241,6 +248,36 @@ sdhc_1: mmc@7804000 {
|
@@ -241,6 +248,36 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -68,7 +66,7 @@ index 5d99b9660e33..3bef06ea1c19 100644
|
|||||||
blsp1_uart2: serial@78b1000 {
|
blsp1_uart2: serial@78b1000 {
|
||||||
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
|
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
|
||||||
reg = <0x078b1000 0x200>;
|
reg = <0x078b1000 0x200>;
|
||||||
@@ -251,6 +288,163 @@ blsp1_uart2: serial@78b1000 {
|
@@ -251,6 +288,163 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -232,7 +230,7 @@ index 5d99b9660e33..3bef06ea1c19 100644
|
|||||||
intc: interrupt-controller@b000000 {
|
intc: interrupt-controller@b000000 {
|
||||||
compatible = "qcom,msm-qgic2";
|
compatible = "qcom,msm-qgic2";
|
||||||
reg = <0x0b000000 0x1000>, /* GICD */
|
reg = <0x0b000000 0x1000>, /* GICD */
|
||||||
@@ -301,6 +495,14 @@ a73pll: clock@b116000 {
|
@@ -301,6 +495,14 @@
|
||||||
clock-names = "xo";
|
clock-names = "xo";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -247,6 +245,3 @@ index 5d99b9660e33..3bef06ea1c19 100644
|
|||||||
timer@b120000 {
|
timer@b120000 {
|
||||||
compatible = "arm,armv7-timer-mem";
|
compatible = "arm,armv7-timer-mem";
|
||||||
reg = <0x0b120000 0x1000>;
|
reg = <0x0b120000 0x1000>;
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -24,11 +24,9 @@ Link: https://lore.kernel.org/r/20230526110653.27777-4-quic_viswanat@quicinc.com
|
|||||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 14 ++++++++++++--
|
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 14 ++++++++++++--
|
||||||
2 files changed, 25 insertions(+), 5 deletions(-)
|
2 files changed, 25 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
|
|
||||||
index c3492a383155..25cc02d30356 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
|
||||||
@@ -150,18 +150,28 @@ rpm_msg_ram: memory@60000 {
|
@@ -150,18 +150,28 @@
|
||||||
no-map;
|
no-map;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -60,40 +58,3 @@ index c3492a383155..25cc02d30356 100644
|
|||||||
no-map;
|
no-map;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
|
||||||
index 3f7cf3fdd319..18e2cbe5687b 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
|
||||||
@@ -85,17 +85,27 @@ reserved-memory {
|
|
||||||
#size-cells = <2>;
|
|
||||||
ranges;
|
|
||||||
|
|
||||||
+ bootloader@4a600000 {
|
|
||||||
+ reg = <0x0 0x4a600000 0x0 0x400000>;
|
|
||||||
+ no-map;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ sbl@4aa00000 {
|
|
||||||
+ reg = <0x0 0x4aa00000 0x0 0x100000>;
|
|
||||||
+ no-map;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
smem@4ab00000 {
|
|
||||||
compatible = "qcom,smem";
|
|
||||||
- reg = <0x0 0x4ab00000 0x0 0x00100000>;
|
|
||||||
+ reg = <0x0 0x4ab00000 0x0 0x100000>;
|
|
||||||
no-map;
|
|
||||||
|
|
||||||
hwlocks = <&tcsr_mutex 0>;
|
|
||||||
};
|
|
||||||
|
|
||||||
memory@4ac00000 {
|
|
||||||
+ reg = <0x0 0x4ac00000 0x0 0x400000>;
|
|
||||||
no-map;
|
|
||||||
- reg = <0x0 0x4ac00000 0x0 0x00400000>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -15,11 +15,9 @@ Link: https://lore.kernel.org/r/20230526125305.19626-5-quic_kathirav@quicinc.com
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 7 +++++++
|
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 7 +++++++
|
||||||
1 file changed, 7 insertions(+)
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
index 3bef06ea1c19..b6e4a8a73354 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -191,6 +191,13 @@ rng: rng@e3000 {
|
@@ -191,6 +191,13 @@
|
||||||
clock-names = "core";
|
clock-names = "core";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -33,6 +31,3 @@ index 3bef06ea1c19..b6e4a8a73354 100644
|
|||||||
tlmm: pinctrl@1000000 {
|
tlmm: pinctrl@1000000 {
|
||||||
compatible = "qcom,ipq9574-tlmm";
|
compatible = "qcom,ipq9574-tlmm";
|
||||||
reg = <0x01000000 0x300000>;
|
reg = <0x01000000 0x300000>;
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -17,11 +17,9 @@ Link: https://lore.kernel.org/r/20230526153152.777-3-quic_devipriy@quicinc.com
|
|||||||
2 files changed, 81 insertions(+)
|
2 files changed, 81 insertions(+)
|
||||||
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
|
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
|
|
||||||
index f237a3683ca4..082a5c975288 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/Makefile
|
--- a/arch/arm64/boot/dts/qcom/Makefile
|
||||||
+++ b/arch/arm64/boot/dts/qcom/Makefile
|
+++ b/arch/arm64/boot/dts/qcom/Makefile
|
||||||
@@ -10,6 +10,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb
|
@@ -10,6 +10,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp418.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp418.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp449.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp449.dtb
|
||||||
@ -29,9 +27,6 @@ index f237a3683ca4..082a5c975288 100644
|
|||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..f01de6628c3b
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
|
||||||
@@ -0,0 +1,80 @@
|
@@ -0,0 +1,80 @@
|
||||||
@ -115,6 +110,3 @@ index 000000000000..f01de6628c3b
|
|||||||
+&xo_board_clk {
|
+&xo_board_clk {
|
||||||
+ clock-frequency = <24000000>;
|
+ clock-frequency = <24000000>;
|
||||||
+};
|
+};
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -17,11 +17,9 @@ Link: https://lore.kernel.org/r/20230531032648.23816-3-quic_poovendh@quicinc.com
|
|||||||
2 files changed, 81 insertions(+)
|
2 files changed, 81 insertions(+)
|
||||||
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
|
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
|
|
||||||
index 082a5c975288..a3816c25181e 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/Makefile
|
--- a/arch/arm64/boot/dts/qcom/Makefile
|
||||||
+++ b/arch/arm64/boot/dts/qcom/Makefile
|
+++ b/arch/arm64/boot/dts/qcom/Makefile
|
||||||
@@ -11,6 +11,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp418.dtb
|
@@ -11,6 +11,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp41
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp449.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp449.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp453.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp453.dtb
|
||||||
@ -29,9 +27,6 @@ index 082a5c975288..a3816c25181e 100644
|
|||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
|
||||||
dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb
|
dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..6efae3426cb8
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
|
||||||
@@ -0,0 +1,80 @@
|
@@ -0,0 +1,80 @@
|
||||||
@ -115,6 +110,3 @@ index 000000000000..6efae3426cb8
|
|||||||
+&xo_board_clk {
|
+&xo_board_clk {
|
||||||
+ clock-frequency = <24000000>;
|
+ clock-frequency = <24000000>;
|
||||||
+};
|
+};
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -25,11 +25,9 @@ Link: https://lore.kernel.org/r/20230602084431.19134-1-quic_anusha@quicinc.com
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 12 +++++++++++-
|
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 12 +++++++++++-
|
||||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
index b6e4a8a73354..30430133e39a 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -148,6 +148,16 @@ reserved-memory {
|
@@ -148,6 +148,16 @@
|
||||||
#size-cells = <2>;
|
#size-cells = <2>;
|
||||||
ranges;
|
ranges;
|
||||||
|
|
||||||
@ -46,7 +44,7 @@ index b6e4a8a73354..30430133e39a 100644
|
|||||||
tz_region: tz@4a600000 {
|
tz_region: tz@4a600000 {
|
||||||
reg = <0x0 0x4a600000 0x0 0x400000>;
|
reg = <0x0 0x4a600000 0x0 0x400000>;
|
||||||
no-map;
|
no-map;
|
||||||
@@ -155,7 +165,7 @@ tz_region: tz@4a600000 {
|
@@ -155,7 +165,7 @@
|
||||||
|
|
||||||
smem@4aa00000 {
|
smem@4aa00000 {
|
||||||
compatible = "qcom,smem";
|
compatible = "qcom,smem";
|
||||||
@ -55,6 +53,3 @@ index b6e4a8a73354..30430133e39a 100644
|
|||||||
hwlocks = <&tcsr_mutex 0>;
|
hwlocks = <&tcsr_mutex 0>;
|
||||||
no-map;
|
no-map;
|
||||||
};
|
};
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -14,11 +14,9 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 8 ++++++++
|
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 8 ++++++++
|
||||||
1 file changed, 8 insertions(+)
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
index 30430133e39a..ced7779f87ac 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -358,6 +358,8 @@ blsp1_i2c1: i2c@78b6000 {
|
@@ -358,6 +358,8 @@
|
||||||
clocks = <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>,
|
clocks = <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>,
|
||||||
<&gcc GCC_BLSP1_AHB_CLK>;
|
<&gcc GCC_BLSP1_AHB_CLK>;
|
||||||
clock-names = "core", "iface";
|
clock-names = "core", "iface";
|
||||||
@ -27,7 +25,7 @@ index 30430133e39a..ced7779f87ac 100644
|
|||||||
dmas = <&blsp_dma 14>, <&blsp_dma 15>;
|
dmas = <&blsp_dma 14>, <&blsp_dma 15>;
|
||||||
dma-names = "tx", "rx";
|
dma-names = "tx", "rx";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
@@ -386,6 +388,8 @@ blsp1_i2c2: i2c@78b7000 {
|
@@ -386,6 +388,8 @@
|
||||||
clocks = <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>,
|
clocks = <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>,
|
||||||
<&gcc GCC_BLSP1_AHB_CLK>;
|
<&gcc GCC_BLSP1_AHB_CLK>;
|
||||||
clock-names = "core", "iface";
|
clock-names = "core", "iface";
|
||||||
@ -36,7 +34,7 @@ index 30430133e39a..ced7779f87ac 100644
|
|||||||
dmas = <&blsp_dma 16>, <&blsp_dma 17>;
|
dmas = <&blsp_dma 16>, <&blsp_dma 17>;
|
||||||
dma-names = "tx", "rx";
|
dma-names = "tx", "rx";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
@@ -414,6 +418,8 @@ blsp1_i2c3: i2c@78b8000 {
|
@@ -414,6 +418,8 @@
|
||||||
clocks = <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>,
|
clocks = <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>,
|
||||||
<&gcc GCC_BLSP1_AHB_CLK>;
|
<&gcc GCC_BLSP1_AHB_CLK>;
|
||||||
clock-names = "core", "iface";
|
clock-names = "core", "iface";
|
||||||
@ -45,7 +43,7 @@ index 30430133e39a..ced7779f87ac 100644
|
|||||||
dmas = <&blsp_dma 18>, <&blsp_dma 19>;
|
dmas = <&blsp_dma 18>, <&blsp_dma 19>;
|
||||||
dma-names = "tx", "rx";
|
dma-names = "tx", "rx";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
@@ -443,6 +449,8 @@ blsp1_i2c4: i2c@78b9000 {
|
@@ -443,6 +449,8 @@
|
||||||
clocks = <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>,
|
clocks = <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>,
|
||||||
<&gcc GCC_BLSP1_AHB_CLK>;
|
<&gcc GCC_BLSP1_AHB_CLK>;
|
||||||
clock-names = "core", "iface";
|
clock-names = "core", "iface";
|
||||||
@ -54,6 +52,3 @@ index 30430133e39a..ced7779f87ac 100644
|
|||||||
dmas = <&blsp_dma 20>, <&blsp_dma 21>;
|
dmas = <&blsp_dma 20>, <&blsp_dma 21>;
|
||||||
dma-names = "tx", "rx";
|
dma-names = "tx", "rx";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -18,11 +18,9 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 2 +-
|
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
index ced7779f87ac..3b4ebf165380 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -166,7 +166,7 @@ tz_region: tz@4a600000 {
|
@@ -166,7 +166,7 @@
|
||||||
smem@4aa00000 {
|
smem@4aa00000 {
|
||||||
compatible = "qcom,smem";
|
compatible = "qcom,smem";
|
||||||
reg = <0x0 0x4aa00000 0x0 0x100000>;
|
reg = <0x0 0x4aa00000 0x0 0x100000>;
|
||||||
@ -31,6 +29,3 @@ index ced7779f87ac..3b4ebf165380 100644
|
|||||||
no-map;
|
no-map;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -20,11 +20,9 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 4 ++--
|
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 4 ++--
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
index 3b4ebf165380..452ac4deed0b 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -507,8 +507,8 @@ apcs_glb: mailbox@b111000 {
|
@@ -507,8 +507,8 @@
|
||||||
"qcom,ipq6018-apcs-apps-global";
|
"qcom,ipq6018-apcs-apps-global";
|
||||||
reg = <0x0b111000 0x1000>;
|
reg = <0x0b111000 0x1000>;
|
||||||
#clock-cells = <1>;
|
#clock-cells = <1>;
|
||||||
@ -35,6 +33,3 @@ index 3b4ebf165380..452ac4deed0b 100644
|
|||||||
#mbox-cells = <1>;
|
#mbox-cells = <1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -21,8 +21,6 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|||||||
drivers/clk/qcom/apss-ipq6018.c | 3 +++
|
drivers/clk/qcom/apss-ipq6018.c | 3 +++
|
||||||
1 file changed, 3 insertions(+)
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
diff --git a/drivers/clk/qcom/apss-ipq6018.c b/drivers/clk/qcom/apss-ipq6018.c
|
|
||||||
index f2f502e2d5a4..4e13a085a857 100644
|
|
||||||
--- a/drivers/clk/qcom/apss-ipq6018.c
|
--- a/drivers/clk/qcom/apss-ipq6018.c
|
||||||
+++ b/drivers/clk/qcom/apss-ipq6018.c
|
+++ b/drivers/clk/qcom/apss-ipq6018.c
|
||||||
@@ -20,16 +20,19 @@
|
@@ -20,16 +20,19 @@
|
||||||
@ -45,6 +43,3 @@ index f2f502e2d5a4..4e13a085a857 100644
|
|||||||
{ P_APSS_PLL_EARLY, 5 },
|
{ P_APSS_PLL_EARLY, 5 },
|
||||||
};
|
};
|
||||||
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -21,11 +21,9 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|||||||
drivers/clk/qcom/gcc-ipq9574.c | 4 ----
|
drivers/clk/qcom/gcc-ipq9574.c | 4 ----
|
||||||
1 file changed, 4 deletions(-)
|
1 file changed, 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/drivers/clk/qcom/gcc-ipq9574.c b/drivers/clk/qcom/gcc-ipq9574.c
|
|
||||||
index b2a2d618a5ec..806b8ba9633c 100644
|
|
||||||
--- a/drivers/clk/qcom/gcc-ipq9574.c
|
--- a/drivers/clk/qcom/gcc-ipq9574.c
|
||||||
+++ b/drivers/clk/qcom/gcc-ipq9574.c
|
+++ b/drivers/clk/qcom/gcc-ipq9574.c
|
||||||
@@ -87,7 +87,6 @@ static struct clk_fixed_factor gpll0_out_main_div2 = {
|
@@ -87,7 +87,6 @@ static struct clk_fixed_factor gpll0_out
|
||||||
&gpll0_main.clkr.hw
|
&gpll0_main.clkr.hw
|
||||||
},
|
},
|
||||||
.num_parents = 1,
|
.num_parents = 1,
|
||||||
@ -33,7 +31,7 @@ index b2a2d618a5ec..806b8ba9633c 100644
|
|||||||
.ops = &clk_fixed_factor_ops,
|
.ops = &clk_fixed_factor_ops,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -102,7 +101,6 @@ static struct clk_alpha_pll_postdiv gpll0 = {
|
@@ -102,7 +101,6 @@ static struct clk_alpha_pll_postdiv gpll
|
||||||
&gpll0_main.clkr.hw
|
&gpll0_main.clkr.hw
|
||||||
},
|
},
|
||||||
.num_parents = 1,
|
.num_parents = 1,
|
||||||
@ -41,7 +39,7 @@ index b2a2d618a5ec..806b8ba9633c 100644
|
|||||||
.ops = &clk_alpha_pll_postdiv_ro_ops,
|
.ops = &clk_alpha_pll_postdiv_ro_ops,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -132,7 +130,6 @@ static struct clk_alpha_pll_postdiv gpll4 = {
|
@@ -132,7 +130,6 @@ static struct clk_alpha_pll_postdiv gpll
|
||||||
&gpll4_main.clkr.hw
|
&gpll4_main.clkr.hw
|
||||||
},
|
},
|
||||||
.num_parents = 1,
|
.num_parents = 1,
|
||||||
@ -49,7 +47,7 @@ index b2a2d618a5ec..806b8ba9633c 100644
|
|||||||
.ops = &clk_alpha_pll_postdiv_ro_ops,
|
.ops = &clk_alpha_pll_postdiv_ro_ops,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -162,7 +159,6 @@ static struct clk_alpha_pll_postdiv gpll2 = {
|
@@ -162,7 +159,6 @@ static struct clk_alpha_pll_postdiv gpll
|
||||||
&gpll2_main.clkr.hw
|
&gpll2_main.clkr.hw
|
||||||
},
|
},
|
||||||
.num_parents = 1,
|
.num_parents = 1,
|
||||||
@ -57,6 +55,3 @@ index b2a2d618a5ec..806b8ba9633c 100644
|
|||||||
.ops = &clk_alpha_pll_postdiv_ro_ops,
|
.ops = &clk_alpha_pll_postdiv_ro_ops,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -23,31 +23,26 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|||||||
drivers/firmware/qcom_scm.c | 7 +++++++
|
drivers/firmware/qcom_scm.c | 7 +++++++
|
||||||
1 file changed, 7 insertions(+)
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
|
|
||||||
index 51eb85354c05..58f1a86065dc 100644
|
|
||||||
--- a/drivers/firmware/qcom_scm.c
|
--- a/drivers/firmware/qcom_scm.c
|
||||||
+++ b/drivers/firmware/qcom_scm.c
|
+++ b/drivers/firmware/qcom_scm.c
|
||||||
@@ -164,6 +164,12 @@ static enum qcom_scm_convention __get_convention(void)
|
@@ -171,6 +171,12 @@ static enum qcom_scm_convention __get_co
|
||||||
if (likely(qcom_scm_convention != SMC_CONVENTION_UNKNOWN))
|
*/
|
||||||
return qcom_scm_convention;
|
#if IS_ENABLED(CONFIG_ARM64)
|
||||||
|
/*
|
||||||
+ /*
|
|
||||||
+ * Per the "SMC calling convention specification", the 64-bit calling
|
+ * Per the "SMC calling convention specification", the 64-bit calling
|
||||||
+ * convention can only be used when the client is 64-bit, otherwise
|
+ * convention can only be used when the client is 64-bit, otherwise
|
||||||
+ * system will encounter the undefined behaviour.
|
+ * system will encounter the undefined behaviour.
|
||||||
+ */
|
+ */
|
||||||
+#if IS_ENABLED(CONFIG_ARM64)
|
+#if IS_ENABLED(CONFIG_ARM64)
|
||||||
/*
|
+ /*
|
||||||
* Device isn't required as there is only one argument - no device
|
* Device isn't required as there is only one argument - no device
|
||||||
* needed to dma_map_single to secure world
|
* needed to dma_map_single to secure world
|
||||||
@@ -184,6 +190,7 @@ static enum qcom_scm_convention __get_convention(void)
|
*/
|
||||||
forced = true;
|
@@ -286,6 +292,7 @@ static bool __qcom_scm_is_call_available
|
||||||
goto found;
|
pr_err("Unknown SMC convention being used\n");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
+#endif
|
+#endif
|
||||||
|
|
||||||
probed_convention = SMC_CONVENTION_ARM_32;
|
ret = qcom_scm_call(dev, &desc, &res);
|
||||||
ret = __scm_smc_call(NULL, &desc, probed_convention, &res, true);
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -20,9 +20,6 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|||||||
6 files changed, 107 insertions(+), 292 deletions(-)
|
6 files changed, 107 insertions(+), 292 deletions(-)
|
||||||
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
|
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..c935ac53efe6
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
|
||||||
@@ -0,0 +1,102 @@
|
@@ -0,0 +1,102 @@
|
||||||
@ -128,8 +125,6 @@ index 000000000000..c935ac53efe6
|
|||||||
+&xo_board_clk {
|
+&xo_board_clk {
|
||||||
+ clock-frequency = <24000000>;
|
+ clock-frequency = <24000000>;
|
||||||
+};
|
+};
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
|
|
||||||
index 2b093e02637b..f4f9199d4ab1 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
|
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
|
||||||
@@ -8,58 +8,12 @@
|
@@ -8,58 +8,12 @@
|
||||||
@ -192,7 +187,7 @@ index 2b093e02637b..f4f9199d4ab1 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
&sdhc_1 {
|
&sdhc_1 {
|
||||||
@@ -74,10 +28,6 @@ &sdhc_1 {
|
@@ -74,10 +28,6 @@
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -203,7 +198,7 @@ index 2b093e02637b..f4f9199d4ab1 100644
|
|||||||
&tlmm {
|
&tlmm {
|
||||||
sdc_default_state: sdc-default-state {
|
sdc_default_state: sdc-default-state {
|
||||||
clk-pins {
|
clk-pins {
|
||||||
@@ -110,15 +60,4 @@ rclk-pins {
|
@@ -110,15 +60,4 @@
|
||||||
bias-pull-down;
|
bias-pull-down;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -219,8 +214,6 @@ index 2b093e02637b..f4f9199d4ab1 100644
|
|||||||
-&xo_board_clk {
|
-&xo_board_clk {
|
||||||
- clock-frequency = <24000000>;
|
- clock-frequency = <24000000>;
|
||||||
};
|
};
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
|
||||||
index 2b3ed8d351f7..16217471893d 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
|
||||||
@@ -8,44 +8,12 @@
|
@@ -8,44 +8,12 @@
|
||||||
@ -269,7 +262,7 @@ index 2b3ed8d351f7..16217471893d 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
&sdhc_1 {
|
&sdhc_1 {
|
||||||
@@ -97,7 +65,3 @@ rclk-pins {
|
@@ -97,7 +65,3 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -277,8 +270,6 @@ index 2b3ed8d351f7..16217471893d 100644
|
|||||||
-&xo_board_clk {
|
-&xo_board_clk {
|
||||||
- clock-frequency = <24000000>;
|
- clock-frequency = <24000000>;
|
||||||
-};
|
-};
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
|
|
||||||
index c8fa54e1a62c..d36d1078763e 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
|
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
|
||||||
@@ -8,73 +8,10 @@
|
@@ -8,73 +8,10 @@
|
||||||
@ -356,8 +347,6 @@ index c8fa54e1a62c..d36d1078763e 100644
|
|||||||
-&xo_board_clk {
|
-&xo_board_clk {
|
||||||
- clock-frequency = <24000000>;
|
- clock-frequency = <24000000>;
|
||||||
};
|
};
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
|
|
||||||
index f01de6628c3b..c30c9fbedf26 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
|
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
|
||||||
@@ -8,73 +8,10 @@
|
@@ -8,73 +8,10 @@
|
||||||
@ -435,8 +424,6 @@ index f01de6628c3b..c30c9fbedf26 100644
|
|||||||
-&xo_board_clk {
|
-&xo_board_clk {
|
||||||
- clock-frequency = <24000000>;
|
- clock-frequency = <24000000>;
|
||||||
};
|
};
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
|
|
||||||
index 6efae3426cb8..0dc382f5d5ec 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
|
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
|
||||||
@@ -8,73 +8,9 @@
|
@@ -8,73 +8,9 @@
|
||||||
@ -514,6 +501,3 @@ index 6efae3426cb8..0dc382f5d5ec 100644
|
|||||||
-&xo_board_clk {
|
-&xo_board_clk {
|
||||||
- clock-frequency = <24000000>;
|
- clock-frequency = <24000000>;
|
||||||
};
|
};
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -31,11 +31,9 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|||||||
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 21 ++++++++++++++++++++-
|
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 21 ++++++++++++++++++++-
|
||||||
1 file changed, 20 insertions(+), 1 deletion(-)
|
1 file changed, 20 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
|
||||||
index 452ac4deed0b..a4123453f5e8 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
|
||||||
@@ -93,42 +93,56 @@ memory@40000000 {
|
@@ -93,42 +93,56 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
cpu_opp_table: opp-table-cpu {
|
cpu_opp_table: opp-table-cpu {
|
||||||
@ -93,7 +91,7 @@ index 452ac4deed0b..a4123453f5e8 100644
|
|||||||
clock-latency-ns = <200000>;
|
clock-latency-ns = <200000>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -206,6 +220,11 @@ qfprom: efuse@a4000 {
|
@@ -206,6 +220,11 @@
|
||||||
reg = <0x000a4000 0x5a1>;
|
reg = <0x000a4000 0x5a1>;
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
@ -105,6 +103,3 @@ index 452ac4deed0b..a4123453f5e8 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
tlmm: pinctrl@1000000 {
|
tlmm: pinctrl@1000000 {
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -18,11 +18,9 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|||||||
drivers/clk/qcom/clk-alpha-pll.h | 1 +
|
drivers/clk/qcom/clk-alpha-pll.h | 1 +
|
||||||
2 files changed, 64 insertions(+)
|
2 files changed, 64 insertions(+)
|
||||||
|
|
||||||
diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
|
|
||||||
index 8e5e7a26bcc4..56f1795847cd 100644
|
|
||||||
--- a/drivers/clk/qcom/clk-alpha-pll.c
|
--- a/drivers/clk/qcom/clk-alpha-pll.c
|
||||||
+++ b/drivers/clk/qcom/clk-alpha-pll.c
|
+++ b/drivers/clk/qcom/clk-alpha-pll.c
|
||||||
@@ -2434,3 +2434,66 @@ const struct clk_ops clk_alpha_pll_stromer_ops = {
|
@@ -2434,3 +2434,66 @@ const struct clk_ops clk_alpha_pll_strom
|
||||||
.set_rate = clk_alpha_pll_stromer_set_rate,
|
.set_rate = clk_alpha_pll_stromer_set_rate,
|
||||||
};
|
};
|
||||||
EXPORT_SYMBOL_GPL(clk_alpha_pll_stromer_ops);
|
EXPORT_SYMBOL_GPL(clk_alpha_pll_stromer_ops);
|
||||||
@ -89,11 +87,9 @@ index 8e5e7a26bcc4..56f1795847cd 100644
|
|||||||
+ .set_rate = clk_alpha_pll_stromer_plus_set_rate,
|
+ .set_rate = clk_alpha_pll_stromer_plus_set_rate,
|
||||||
+};
|
+};
|
||||||
+EXPORT_SYMBOL_GPL(clk_alpha_pll_stromer_plus_ops);
|
+EXPORT_SYMBOL_GPL(clk_alpha_pll_stromer_plus_ops);
|
||||||
diff --git a/drivers/clk/qcom/clk-alpha-pll.h b/drivers/clk/qcom/clk-alpha-pll.h
|
|
||||||
index 51d4043c7e4f..eb072ae7861c 100644
|
|
||||||
--- a/drivers/clk/qcom/clk-alpha-pll.h
|
--- a/drivers/clk/qcom/clk-alpha-pll.h
|
||||||
+++ b/drivers/clk/qcom/clk-alpha-pll.h
|
+++ b/drivers/clk/qcom/clk-alpha-pll.h
|
||||||
@@ -145,6 +145,7 @@ extern const struct clk_ops clk_alpha_pll_postdiv_ops;
|
@@ -145,6 +145,7 @@ extern const struct clk_ops clk_alpha_pl
|
||||||
extern const struct clk_ops clk_alpha_pll_huayra_ops;
|
extern const struct clk_ops clk_alpha_pll_huayra_ops;
|
||||||
extern const struct clk_ops clk_alpha_pll_postdiv_ro_ops;
|
extern const struct clk_ops clk_alpha_pll_postdiv_ro_ops;
|
||||||
extern const struct clk_ops clk_alpha_pll_stromer_ops;
|
extern const struct clk_ops clk_alpha_pll_stromer_ops;
|
||||||
@ -101,6 +97,3 @@ index 51d4043c7e4f..eb072ae7861c 100644
|
|||||||
|
|
||||||
extern const struct clk_ops clk_alpha_pll_fabia_ops;
|
extern const struct clk_ops clk_alpha_pll_fabia_ops;
|
||||||
extern const struct clk_ops clk_alpha_pll_fixed_fabia_ops;
|
extern const struct clk_ops clk_alpha_pll_fixed_fabia_ops;
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -24,11 +24,9 @@ Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
|
|||||||
include/dt-bindings/arm/qcom,ids.h | 6 ++++++
|
include/dt-bindings/arm/qcom,ids.h | 6 ++++++
|
||||||
3 files changed, 12 insertions(+)
|
3 files changed, 12 insertions(+)
|
||||||
|
|
||||||
diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c
|
|
||||||
index 69a8742c0a7a..3df1d5747ab7 100644
|
|
||||||
--- a/drivers/cpufreq/cpufreq-dt-platdev.c
|
--- a/drivers/cpufreq/cpufreq-dt-platdev.c
|
||||||
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
|
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
|
||||||
@@ -164,6 +164,7 @@ static const struct of_device_id blocklist[] __initconst = {
|
@@ -164,6 +164,7 @@ static const struct of_device_id blockli
|
||||||
{ .compatible = "ti,omap3", },
|
{ .compatible = "ti,omap3", },
|
||||||
|
|
||||||
{ .compatible = "qcom,ipq8064", },
|
{ .compatible = "qcom,ipq8064", },
|
||||||
@ -36,11 +34,9 @@ index 69a8742c0a7a..3df1d5747ab7 100644
|
|||||||
{ .compatible = "qcom,apq8064", },
|
{ .compatible = "qcom,apq8064", },
|
||||||
{ .compatible = "qcom,msm8974", },
|
{ .compatible = "qcom,msm8974", },
|
||||||
{ .compatible = "qcom,msm8960", },
|
{ .compatible = "qcom,msm8960", },
|
||||||
diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c
|
|
||||||
index a88b6fe5db50..902a0557d832 100644
|
|
||||||
--- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
|
--- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
|
||||||
+++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
|
+++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
|
||||||
@@ -149,6 +149,11 @@ static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev,
|
@@ -149,6 +149,11 @@ static int qcom_cpufreq_kryo_name_versio
|
||||||
switch (msm_id) {
|
switch (msm_id) {
|
||||||
case QCOM_ID_MSM8996:
|
case QCOM_ID_MSM8996:
|
||||||
case QCOM_ID_APQ8096:
|
case QCOM_ID_APQ8096:
|
||||||
@ -52,8 +48,6 @@ index a88b6fe5db50..902a0557d832 100644
|
|||||||
drv->versions = 1 << (unsigned int)(*speedbin);
|
drv->versions = 1 << (unsigned int)(*speedbin);
|
||||||
break;
|
break;
|
||||||
case QCOM_ID_MSM8996SG:
|
case QCOM_ID_MSM8996SG:
|
||||||
diff --git a/include/dt-bindings/arm/qcom,ids.h b/include/dt-bindings/arm/qcom,ids.h
|
|
||||||
index 755e08d494c5..7e77a7d84e2a 100644
|
|
||||||
--- a/include/dt-bindings/arm/qcom,ids.h
|
--- a/include/dt-bindings/arm/qcom,ids.h
|
||||||
+++ b/include/dt-bindings/arm/qcom,ids.h
|
+++ b/include/dt-bindings/arm/qcom,ids.h
|
||||||
@@ -140,6 +140,12 @@
|
@@ -140,6 +140,12 @@
|
||||||
@ -69,6 +63,3 @@ index 755e08d494c5..7e77a7d84e2a 100644
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* The board type and revision information, used by Qualcomm bootloaders and
|
* The board type and revision information, used by Qualcomm bootloaders and
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -14,8 +14,6 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|||||||
.../boot/dts/qcom/ipq9574-rdp-common.dtsi | 22 +++++++++++++++++++
|
.../boot/dts/qcom/ipq9574-rdp-common.dtsi | 22 +++++++++++++++++++
|
||||||
1 file changed, 22 insertions(+)
|
1 file changed, 22 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
|
|
||||||
index c935ac53efe6..526f0dbbdbe9 100644
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
|
||||||
@@ -8,6 +8,8 @@
|
@@ -8,6 +8,8 @@
|
||||||
@ -27,7 +25,7 @@ index c935ac53efe6..526f0dbbdbe9 100644
|
|||||||
#include "ipq9574.dtsi"
|
#include "ipq9574.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
@@ -36,6 +38,19 @@ regulator_fixed_0p925: s0925 {
|
@@ -36,6 +38,19 @@
|
||||||
regulator-always-on;
|
regulator-always-on;
|
||||||
regulator-name = "fixed_0p925";
|
regulator-name = "fixed_0p925";
|
||||||
};
|
};
|
||||||
@ -47,7 +45,7 @@ index c935ac53efe6..526f0dbbdbe9 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
&blsp1_spi0 {
|
&blsp1_spi0 {
|
||||||
@@ -95,6 +110,13 @@ spi_0_pins: spi-0-state {
|
@@ -95,6 +110,13 @@
|
||||||
drive-strength = <8>;
|
drive-strength = <8>;
|
||||||
bias-disable;
|
bias-disable;
|
||||||
};
|
};
|
||||||
@ -61,6 +59,3 @@ index c935ac53efe6..526f0dbbdbe9 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
&xo_board_clk {
|
&xo_board_clk {
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -18,11 +18,9 @@ Link: https://lore.kernel.org/r/20230217083308.12017-4-quic_kathirav@quicinc.com
|
|||||||
drivers/clk/qcom/apss-ipq-pll.c | 59 ++++++++++++++++++++++++++++++++-
|
drivers/clk/qcom/apss-ipq-pll.c | 59 ++++++++++++++++++++++++++++++++-
|
||||||
1 file changed, 58 insertions(+), 1 deletion(-)
|
1 file changed, 58 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/drivers/clk/qcom/apss-ipq-pll.c b/drivers/clk/qcom/apss-ipq-pll.c
|
|
||||||
index 56f33af11311..4ec347f0e8b1 100644
|
|
||||||
--- a/drivers/clk/qcom/apss-ipq-pll.c
|
--- a/drivers/clk/qcom/apss-ipq-pll.c
|
||||||
+++ b/drivers/clk/qcom/apss-ipq-pll.c
|
+++ b/drivers/clk/qcom/apss-ipq-pll.c
|
||||||
@@ -24,6 +24,18 @@ static const u8 ipq_pll_offsets[][PLL_OFF_MAX_REGS] = {
|
@@ -24,6 +24,18 @@ static const u8 ipq_pll_offsets[][PLL_OF
|
||||||
[PLL_OFF_TEST_CTL] = 0x30,
|
[PLL_OFF_TEST_CTL] = 0x30,
|
||||||
[PLL_OFF_TEST_CTL_U] = 0x34,
|
[PLL_OFF_TEST_CTL_U] = 0x34,
|
||||||
},
|
},
|
||||||
@ -41,7 +39,7 @@ index 56f33af11311..4ec347f0e8b1 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
static struct clk_alpha_pll ipq_pll_huayra = {
|
static struct clk_alpha_pll ipq_pll_huayra = {
|
||||||
@@ -44,6 +56,38 @@ static struct clk_alpha_pll ipq_pll_huayra = {
|
@@ -44,6 +56,38 @@ static struct clk_alpha_pll ipq_pll_huay
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -80,7 +78,7 @@ index 56f33af11311..4ec347f0e8b1 100644
|
|||||||
static const struct alpha_pll_config ipq6018_pll_config = {
|
static const struct alpha_pll_config ipq6018_pll_config = {
|
||||||
.l = 0x37,
|
.l = 0x37,
|
||||||
.config_ctl_val = 0x240d4828,
|
.config_ctl_val = 0x240d4828,
|
||||||
@@ -81,16 +125,25 @@ static const struct alpha_pll_config ipq9574_pll_config = {
|
@@ -81,16 +125,25 @@ static const struct alpha_pll_config ipq
|
||||||
};
|
};
|
||||||
|
|
||||||
struct apss_pll_data {
|
struct apss_pll_data {
|
||||||
@ -106,7 +104,7 @@ index 56f33af11311..4ec347f0e8b1 100644
|
|||||||
.pll = &ipq_pll_huayra,
|
.pll = &ipq_pll_huayra,
|
||||||
.pll_config = &ipq6018_pll_config,
|
.pll_config = &ipq6018_pll_config,
|
||||||
};
|
};
|
||||||
@@ -129,7 +182,10 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
|
@@ -129,7 +182,10 @@ static int apss_ipq_pll_probe(struct pla
|
||||||
if (!data)
|
if (!data)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
@ -118,7 +116,7 @@ index 56f33af11311..4ec347f0e8b1 100644
|
|||||||
|
|
||||||
ret = devm_clk_register_regmap(dev, &data->pll->clkr);
|
ret = devm_clk_register_regmap(dev, &data->pll->clkr);
|
||||||
if (ret)
|
if (ret)
|
||||||
@@ -140,6 +196,7 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
|
@@ -140,6 +196,7 @@ static int apss_ipq_pll_probe(struct pla
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct of_device_id apss_ipq_pll_match_table[] = {
|
static const struct of_device_id apss_ipq_pll_match_table[] = {
|
||||||
@ -126,6 +124,3 @@ index 56f33af11311..4ec347f0e8b1 100644
|
|||||||
{ .compatible = "qcom,ipq6018-a53pll", .data = &ipq6018_pll_data },
|
{ .compatible = "qcom,ipq6018-a53pll", .data = &ipq6018_pll_data },
|
||||||
{ .compatible = "qcom,ipq8074-a53pll", .data = &ipq8074_pll_data },
|
{ .compatible = "qcom,ipq8074-a53pll", .data = &ipq8074_pll_data },
|
||||||
{ .compatible = "qcom,ipq9574-a73pll", .data = &ipq9574_pll_data },
|
{ .compatible = "qcom,ipq9574-a73pll", .data = &ipq9574_pll_data },
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -21,11 +21,9 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|||||||
drivers/clk/qcom/apss-ipq-pll.c | 2 +-
|
drivers/clk/qcom/apss-ipq-pll.c | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/drivers/clk/qcom/apss-ipq-pll.c b/drivers/clk/qcom/apss-ipq-pll.c
|
|
||||||
index 4ec347f0e8b1..87547db3bfb3 100644
|
|
||||||
--- a/drivers/clk/qcom/apss-ipq-pll.c
|
--- a/drivers/clk/qcom/apss-ipq-pll.c
|
||||||
+++ b/drivers/clk/qcom/apss-ipq-pll.c
|
+++ b/drivers/clk/qcom/apss-ipq-pll.c
|
||||||
@@ -69,7 +69,7 @@ static struct clk_alpha_pll ipq_pll_stromer_plus = {
|
@@ -69,7 +69,7 @@ static struct clk_alpha_pll ipq_pll_stro
|
||||||
.fw_name = "xo",
|
.fw_name = "xo",
|
||||||
},
|
},
|
||||||
.num_parents = 1,
|
.num_parents = 1,
|
||||||
@ -34,6 +32,3 @@ index 4ec347f0e8b1..87547db3bfb3 100644
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -16,11 +16,9 @@ Link: https://lore.kernel.org/r/20230307062232.4889-3-quic_kathirav@quicinc.com
|
|||||||
drivers/clk/qcom/clk-alpha-pll.h | 1 +
|
drivers/clk/qcom/clk-alpha-pll.h | 1 +
|
||||||
2 files changed, 12 insertions(+)
|
2 files changed, 12 insertions(+)
|
||||||
|
|
||||||
diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
|
|
||||||
index 56f1795847cd..b3d1a39c835b 100644
|
|
||||||
--- a/drivers/clk/qcom/clk-alpha-pll.c
|
--- a/drivers/clk/qcom/clk-alpha-pll.c
|
||||||
+++ b/drivers/clk/qcom/clk-alpha-pll.c
|
+++ b/drivers/clk/qcom/clk-alpha-pll.c
|
||||||
@@ -200,6 +200,17 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MAX_REGS] = {
|
@@ -200,6 +200,17 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MA
|
||||||
[PLL_OFF_TEST_CTL_U] = 0x34,
|
[PLL_OFF_TEST_CTL_U] = 0x34,
|
||||||
[PLL_OFF_STATUS] = 0x28,
|
[PLL_OFF_STATUS] = 0x28,
|
||||||
},
|
},
|
||||||
@ -38,8 +36,6 @@ index 56f1795847cd..b3d1a39c835b 100644
|
|||||||
};
|
};
|
||||||
EXPORT_SYMBOL_GPL(clk_alpha_pll_regs);
|
EXPORT_SYMBOL_GPL(clk_alpha_pll_regs);
|
||||||
|
|
||||||
diff --git a/drivers/clk/qcom/clk-alpha-pll.h b/drivers/clk/qcom/clk-alpha-pll.h
|
|
||||||
index eb072ae7861c..42d2a93a28ba 100644
|
|
||||||
--- a/drivers/clk/qcom/clk-alpha-pll.h
|
--- a/drivers/clk/qcom/clk-alpha-pll.h
|
||||||
+++ b/drivers/clk/qcom/clk-alpha-pll.h
|
+++ b/drivers/clk/qcom/clk-alpha-pll.h
|
||||||
@@ -26,6 +26,7 @@ enum {
|
@@ -26,6 +26,7 @@ enum {
|
||||||
@ -50,6 +46,3 @@ index eb072ae7861c..42d2a93a28ba 100644
|
|||||||
CLK_ALPHA_PLL_TYPE_MAX,
|
CLK_ALPHA_PLL_TYPE_MAX,
|
||||||
};
|
};
|
||||||
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ Subject: [PATCH] r8169: add LED configuration from OF
|
|||||||
TxDescStartAddrLow = 0x20,
|
TxDescStartAddrLow = 0x20,
|
||||||
TxDescStartAddrHigh = 0x24,
|
TxDescStartAddrHigh = 0x24,
|
||||||
TxHDescStartAddrLow = 0x28,
|
TxHDescStartAddrLow = 0x28,
|
||||||
@@ -5132,6 +5134,22 @@ static bool rtl_aspm_is_safe(struct rtl8
|
@@ -5174,6 +5176,22 @@ static bool rtl_aspm_is_safe(struct rtl8
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ Subject: [PATCH] r8169: add LED configuration from OF
|
|||||||
static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||||
{
|
{
|
||||||
struct rtl8169_private *tp;
|
struct rtl8169_private *tp;
|
||||||
@@ -5299,6 +5317,7 @@ static int rtl_init_one(struct pci_dev *
|
@@ -5342,6 +5360,7 @@ static int rtl_init_one(struct pci_dev *
|
||||||
if (!tp->counters)
|
if (!tp->counters)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
|||||||
|
|
||||||
--- a/drivers/mmc/core/core.c
|
--- a/drivers/mmc/core/core.c
|
||||||
+++ b/drivers/mmc/core/core.c
|
+++ b/drivers/mmc/core/core.c
|
||||||
@@ -1366,6 +1366,8 @@ void mmc_power_off(struct mmc_host *host
|
@@ -1371,6 +1371,8 @@ void mmc_power_off(struct mmc_host *host
|
||||||
|
|
||||||
mmc_pwrseq_power_off(host);
|
mmc_pwrseq_power_off(host);
|
||||||
|
|
||||||
|
@ -444,8 +444,7 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
|
|||||||
+ struct device_node *np = pdev->dev.of_node, *node;
|
+ struct device_node *np = pdev->dev.of_node, *node;
|
||||||
+ struct resource *res;
|
+ struct resource *res;
|
||||||
+ u32 val;
|
+ u32 val;
|
||||||
|
+
|
||||||
-static int rockchip_dfi_probe(struct platform_device *pdev)
|
|
||||||
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
+ data->regs = devm_ioremap_resource(&pdev->dev, res);
|
+ data->regs = devm_ioremap_resource(&pdev->dev, res);
|
||||||
+ if (IS_ERR(data->regs))
|
+ if (IS_ERR(data->regs))
|
||||||
@ -467,7 +466,8 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
|
|||||||
+
|
+
|
||||||
+ return 0;
|
+ return 0;
|
||||||
+}
|
+}
|
||||||
+
|
|
||||||
|
-static int rockchip_dfi_probe(struct platform_device *pdev)
|
||||||
+static __init int rk3128_dfi_init(struct platform_device *pdev,
|
+static __init int rk3128_dfi_init(struct platform_device *pdev,
|
||||||
+ struct rockchip_dfi *data,
|
+ struct rockchip_dfi *data,
|
||||||
+ struct devfreq_event_desc *desc)
|
+ struct devfreq_event_desc *desc)
|
||||||
@ -557,106 +557,3 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
|
|||||||
|
|
||||||
data->regs = devm_platform_ioremap_resource(pdev, 0);
|
data->regs = devm_platform_ioremap_resource(pdev, 0);
|
||||||
if (IS_ERR(data->regs))
|
if (IS_ERR(data->regs))
|
||||||
@@ -201,21 +581,97 @@ static int rockchip_dfi_probe(struct pla
|
|
||||||
if (IS_ERR(data->regmap_pmu))
|
|
||||||
return PTR_ERR(data->regmap_pmu);
|
|
||||||
}
|
|
||||||
- data->dev = dev;
|
|
||||||
+
|
|
||||||
+ regmap_read(data->regmap_pmu, PMUGRF_OS_REG2, &val);
|
|
||||||
+ data->dram_type = READ_DRAMTYPE_INFO(val);
|
|
||||||
+ data->ch_msk = READ_CH_INFO(val);
|
|
||||||
+
|
|
||||||
+ desc->ops = &rockchip_dfi_ops;
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static __init int rk3328_dfi_init(struct platform_device *pdev,
|
|
||||||
+ struct rockchip_dfi *data,
|
|
||||||
+ struct devfreq_event_desc *desc)
|
|
||||||
+{
|
|
||||||
+ struct device_node *np = pdev->dev.of_node, *node;
|
|
||||||
+ struct resource *res;
|
|
||||||
+ u32 val;
|
|
||||||
+
|
|
||||||
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
||||||
+ data->regs = devm_ioremap_resource(&pdev->dev, res);
|
|
||||||
+ if (IS_ERR(data->regs))
|
|
||||||
+ return PTR_ERR(data->regs);
|
|
||||||
+
|
|
||||||
+ node = of_parse_phandle(np, "rockchip,grf", 0);
|
|
||||||
+ if (node) {
|
|
||||||
+ data->regmap_grf = syscon_node_to_regmap(node);
|
|
||||||
+ if (IS_ERR(data->regmap_grf))
|
|
||||||
+ return PTR_ERR(data->regmap_grf);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ regmap_read(data->regmap_grf, RK3328_GRF_OS_REG2, &val);
|
|
||||||
+ data->dram_type = READ_DRAMTYPE_INFO(val);
|
|
||||||
+ data->ch_msk = 1;
|
|
||||||
+ data->clk = NULL;
|
|
||||||
+
|
|
||||||
+ desc->ops = &rockchip_dfi_ops;
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static const struct of_device_id rockchip_dfi_id_match[] = {
|
|
||||||
+ { .compatible = "rockchip,px30-dfi", .data = px30_dfi_init },
|
|
||||||
+ { .compatible = "rockchip,rk1808-dfi", .data = px30_dfi_init },
|
|
||||||
+ { .compatible = "rockchip,rk3128-dfi", .data = rk3128_dfi_init },
|
|
||||||
+ { .compatible = "rockchip,rk3288-dfi", .data = rk3288_dfi_init },
|
|
||||||
+ { .compatible = "rockchip,rk3328-dfi", .data = rk3328_dfi_init },
|
|
||||||
+ { .compatible = "rockchip,rk3368-dfi", .data = rk3368_dfi_init },
|
|
||||||
+ { .compatible = "rockchip,rk3399-dfi", .data = rockchip_dfi_init },
|
|
||||||
+ { },
|
|
||||||
+};
|
|
||||||
+MODULE_DEVICE_TABLE(of, rockchip_dfi_id_match);
|
|
||||||
+
|
|
||||||
+static int rockchip_dfi_probe(struct platform_device *pdev)
|
|
||||||
+{
|
|
||||||
+ struct device *dev = &pdev->dev;
|
|
||||||
+ struct rockchip_dfi *data;
|
|
||||||
+ struct devfreq_event_desc *desc;
|
|
||||||
+ struct device_node *np = pdev->dev.of_node;
|
|
||||||
+ const struct of_device_id *match;
|
|
||||||
+ int (*init)(struct platform_device *pdev, struct rockchip_dfi *data,
|
|
||||||
+ struct devfreq_event_desc *desc);
|
|
||||||
+
|
|
||||||
+ data = devm_kzalloc(dev, sizeof(struct rockchip_dfi), GFP_KERNEL);
|
|
||||||
+ if (!data)
|
|
||||||
+ return -ENOMEM;
|
|
||||||
|
|
||||||
desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL);
|
|
||||||
if (!desc)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
- desc->ops = &rockchip_dfi_ops;
|
|
||||||
+ match = of_match_node(rockchip_dfi_id_match, pdev->dev.of_node);
|
|
||||||
+ if (match) {
|
|
||||||
+ init = match->data;
|
|
||||||
+ if (init) {
|
|
||||||
+ if (init(pdev, data, desc))
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ } else {
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+ } else {
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
desc->driver_data = data;
|
|
||||||
desc->name = np->name;
|
|
||||||
data->desc = desc;
|
|
||||||
+ data->dev = dev;
|
|
||||||
|
|
||||||
- data->edev = devm_devfreq_event_add_edev(&pdev->dev, desc);
|
|
||||||
+ data->edev = devm_devfreq_event_add_edev(dev, desc);
|
|
||||||
if (IS_ERR(data->edev)) {
|
|
||||||
- dev_err(&pdev->dev,
|
|
||||||
- "failed to add devfreq-event device\n");
|
|
||||||
+ dev_err(dev, "failed to add devfreq-event device\n");
|
|
||||||
return PTR_ERR(data->edev);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user