Skip to content

Commit d989a32

Browse files
committed
qualcommb/ipq95xx: refresh patches ahead of 6.6.75
Refreshed patches for qualcommb/ipq95xx by running make target/linux/refresh after creating a .config containing: CONFIG_TARGET_qualcommbe=y CONFIG_TARGET_qualcommbe_ipq95xx=y CONFIG_TARGET_qualcommbe_ipq95xx_DEVICE_qcom_rdp433=y Signed-off-by: John Audia <therealgraysky@proton.me> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
1 parent 8311a3f commit d989a32

File tree

97 files changed

+433
-3527
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+433
-3527
lines changed

target/linux/qualcommbe/patches-6.6/001-v6.8-arm64-dts-qcom-ipq9574-Add-common-RDP-dtsi-file.patch

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
2020
6 files changed, 130 insertions(+), 345 deletions(-)
2121
create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
2222

23-
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
24-
new file mode 100644
25-
index 000000000000..40a7aefd0540
2623
--- /dev/null
2724
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
2825
@@ -0,0 +1,125 @@
@@ -151,8 +148,6 @@ index 000000000000..40a7aefd0540
151148
+&xo_board_clk {
152149
+ clock-frequency = <24000000>;
153150
+};
154-
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
155-
index 2b093e02637b..f4f9199d4ab1 100644
156151
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
157152
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
158153
@@ -8,58 +8,12 @@
@@ -215,7 +210,7 @@ index 2b093e02637b..f4f9199d4ab1 100644
215210
};
216211

217212
&sdhc_1 {
218-
@@ -74,10 +28,6 @@ &sdhc_1 {
213+
@@ -74,10 +28,6 @@
219214
status = "okay";
220215
};
221216

@@ -226,7 +221,7 @@ index 2b093e02637b..f4f9199d4ab1 100644
226221
&tlmm {
227222
sdc_default_state: sdc-default-state {
228223
clk-pins {
229-
@@ -110,15 +60,4 @@ rclk-pins {
224+
@@ -110,15 +60,4 @@
230225
bias-pull-down;
231226
};
232227
};
@@ -242,8 +237,6 @@ index 2b093e02637b..f4f9199d4ab1 100644
242237
-&xo_board_clk {
243238
- clock-frequency = <24000000>;
244239
};
245-
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
246-
index 877026ccc6e2..1bb8d96c9a82 100644
247240
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
248241
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
249242
@@ -8,69 +8,11 @@
@@ -317,7 +310,7 @@ index 877026ccc6e2..1bb8d96c9a82 100644
317310
};
318311

319312
&sdhc_1 {
320-
@@ -85,10 +27,6 @@ &sdhc_1 {
313+
@@ -85,10 +27,6 @@
321314
status = "okay";
322315
};
323316

@@ -328,7 +321,7 @@ index 877026ccc6e2..1bb8d96c9a82 100644
328321
&tlmm {
329322
sdc_default_state: sdc-default-state {
330323
clk-pins {
331-
@@ -122,30 +60,3 @@ rclk-pins {
324+
@@ -122,30 +60,3 @@
332325
};
333326
};
334327
};
@@ -359,8 +352,6 @@ index 877026ccc6e2..1bb8d96c9a82 100644
359352
-&xo_board_clk {
360353
- clock-frequency = <24000000>;
361354
-};
362-
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
363-
index c8fa54e1a62c..d36d1078763e 100644
364355
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
365356
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
366357
@@ -8,73 +8,10 @@
@@ -438,8 +429,6 @@ index c8fa54e1a62c..d36d1078763e 100644
438429
-&xo_board_clk {
439430
- clock-frequency = <24000000>;
440431
};
441-
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
442-
index f01de6628c3b..c30c9fbedf26 100644
443432
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
444433
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
445434
@@ -8,73 +8,10 @@
@@ -517,8 +506,6 @@ index f01de6628c3b..c30c9fbedf26 100644
517506
-&xo_board_clk {
518507
- clock-frequency = <24000000>;
519508
};
520-
diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
521-
index 6efae3426cb8..0dc382f5d5ec 100644
522509
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
523510
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
524511
@@ -8,73 +8,9 @@
@@ -596,6 +583,3 @@ index 6efae3426cb8..0dc382f5d5ec 100644
596583
-&xo_board_clk {
597584
- clock-frequency = <24000000>;
598585
};
599-
--
600-
2.45.2
601-

target/linux/qualcommbe/patches-6.6/002-01-v6.11-dt-bindings-clock-add-qca8386-qca8084-clock-and-rese.patch

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
2121
create mode 100644 include/dt-bindings/clock/qcom,qca8k-nsscc.h
2222
create mode 100644 include/dt-bindings/reset/qcom,qca8k-nsscc.h
2323

24-
diff --git a/Documentation/devicetree/bindings/clock/qcom,qca8k-nsscc.yaml b/Documentation/devicetree/bindings/clock/qcom,qca8k-nsscc.yaml
25-
new file mode 100644
26-
index 000000000000..61473385da2d
2724
--- /dev/null
2825
+++ b/Documentation/devicetree/bindings/clock/qcom,qca8k-nsscc.yaml
2926
@@ -0,0 +1,86 @@
@@ -113,9 +110,6 @@ index 000000000000..61473385da2d
113110
+ };
114111
+ };
115112
+...
116-
diff --git a/include/dt-bindings/clock/qcom,qca8k-nsscc.h b/include/dt-bindings/clock/qcom,qca8k-nsscc.h
117-
new file mode 100644
118-
index 000000000000..0ac3e4c69a1a
119113
--- /dev/null
120114
+++ b/include/dt-bindings/clock/qcom,qca8k-nsscc.h
121115
@@ -0,0 +1,101 @@
@@ -220,9 +214,6 @@ index 000000000000..0ac3e4c69a1a
220214
+#define NSS_CC_GEPHY2_SYS_CLK 90
221215
+#define NSS_CC_GEPHY3_SYS_CLK 91
222216
+#endif
223-
diff --git a/include/dt-bindings/reset/qcom,qca8k-nsscc.h b/include/dt-bindings/reset/qcom,qca8k-nsscc.h
224-
new file mode 100644
225-
index 000000000000..c71167a3bd41
226217
--- /dev/null
227218
+++ b/include/dt-bindings/reset/qcom,qca8k-nsscc.h
228219
@@ -0,0 +1,76 @@
@@ -302,6 +293,3 @@ index 000000000000..c71167a3bd41
302293
+#define NSS_CC_GLOBAL_ARES 66
303294
+#define NSS_CC_XPCS_ARES 67
304295
+#endif
305-
--
306-
2.45.2
307-

target/linux/qualcommbe/patches-6.6/002-02-v6.11-clk-qcom-add-clock-controller-driver-for-qca8386-qca.patch

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
3232
3 files changed, 2231 insertions(+)
3333
create mode 100644 drivers/clk/qcom/nsscc-qca8k.c
3434

35-
diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
36-
index 20ba2eeb24ec..4432b1cce478 100644
3735
--- a/drivers/clk/qcom/Kconfig
3836
+++ b/drivers/clk/qcom/Kconfig
39-
@@ -249,6 +249,15 @@ config IPQ_GCC_9574
37+
@@ -204,6 +204,15 @@ config IPQ_GCC_9574
4038
i2c, USB, SD/eMMC, etc. Select this for the root clock
4139
of ipq9574.
4240

@@ -52,21 +50,16 @@ index 20ba2eeb24ec..4432b1cce478 100644
5250
config MSM_GCC_8660
5351
tristate "MSM8660 Global Clock Controller"
5452
depends on ARM || COMPILE_TEST
55-
diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile
56-
index b7de8600dc3d..0241f00689bc 100644
5753
--- a/drivers/clk/qcom/Makefile
5854
+++ b/drivers/clk/qcom/Makefile
59-
@@ -36,6 +36,7 @@ obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o
55+
@@ -31,6 +31,7 @@ obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806
6056
obj-$(CONFIG_IPQ_GCC_8074) += gcc-ipq8074.o
6157
obj-$(CONFIG_IPQ_GCC_9574) += gcc-ipq9574.o
6258
obj-$(CONFIG_IPQ_LCC_806X) += lcc-ipq806x.o
6359
+obj-$(CONFIG_IPQ_NSSCC_QCA8K) += nsscc-qca8k.o
6460
obj-$(CONFIG_MDM_GCC_9607) += gcc-mdm9607.o
6561
obj-$(CONFIG_MDM_GCC_9615) += gcc-mdm9615.o
6662
obj-$(CONFIG_MSM_GCC_8660) += gcc-msm8660.o
67-
diff --git a/drivers/clk/qcom/nsscc-qca8k.c b/drivers/clk/qcom/nsscc-qca8k.c
68-
new file mode 100644
69-
index 000000000000..5c8324e2bcca
7063
--- /dev/null
7164
+++ b/drivers/clk/qcom/nsscc-qca8k.c
7265
@@ -0,0 +1,2221 @@
@@ -2291,6 +2284,3 @@ index 000000000000..5c8324e2bcca
22912284
+
22922285
+MODULE_DESCRIPTION("QCOM NSS_CC QCA8K Driver");
22932286
+MODULE_LICENSE("GPL");
2294-
--
2295-
2.45.2
2296-

target/linux/qualcommbe/patches-6.6/003-v6.11-arm64-dts-qcom-ipq9574-add-MDIO-bus.patch

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1313
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 10 ++++++++++
1414
1 file changed, 10 insertions(+)
1515

16-
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
17-
index 7f2e5cbf3bbb..ded02bc39275 100644
1816
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
1917
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
20-
@@ -232,6 +232,16 @@ rng: rng@e3000 {
18+
@@ -218,6 +218,16 @@
2119
clock-names = "core";
2220
};
2321

@@ -34,6 +32,3 @@ index 7f2e5cbf3bbb..ded02bc39275 100644
3432
qfprom: efuse@a4000 {
3533
compatible = "qcom,ipq9574-qfprom", "qcom,qfprom";
3634
reg = <0x000a4000 0x5a1>;
37-
--
38-
2.45.2
39-

target/linux/qualcommbe/patches-6.6/004-01-v.610-clk-qcom-clk-rcg-introduce-support-for-multiple-conf.patch

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
3535
drivers/clk/qcom/clk-rcg.h | 23 ++++++++++++++++++++++-
3636
1 file changed, 22 insertions(+), 1 deletion(-)
3737

38-
diff --git a/drivers/clk/qcom/clk-rcg.h b/drivers/clk/qcom/clk-rcg.h
39-
index e6d84c8c7989..c50e6616d02c 100644
4038
--- a/drivers/clk/qcom/clk-rcg.h
4139
+++ b/drivers/clk/qcom/clk-rcg.h
4240
@@ -17,6 +17,23 @@ struct freq_tbl {
@@ -63,7 +61,7 @@ index e6d84c8c7989..c50e6616d02c 100644
6361
/**
6462
* struct mn - M/N:D counter
6563
* @mnctr_en_bit: bit to enable mn counter
66-
@@ -138,6 +155,7 @@ extern const struct clk_ops clk_dyn_rcg_ops;
64+
@@ -138,6 +155,7 @@ extern const struct clk_ops clk_dyn_rcg_
6765
* @safe_src_index: safe src index value
6866
* @parent_map: map from software's parent index to hardware's src_sel field
6967
* @freq_tbl: frequency table
@@ -83,6 +81,3 @@ index e6d84c8c7989..c50e6616d02c 100644
8381
struct clk_regmap clkr;
8482
u8 cfg_off;
8583
u32 parked_cfg;
86-
--
87-
2.45.2
88-

target/linux/qualcommbe/patches-6.6/004-02-v6.10-clk-qcom-clk-rcg2-add-support-for-rcg2-freq-multi-op.patch

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
3636
drivers/clk/qcom/common.h | 2 +
3737
4 files changed, 187 insertions(+)
3838

39-
diff --git a/drivers/clk/qcom/clk-rcg.h b/drivers/clk/qcom/clk-rcg.h
40-
index c50e6616d02c..d7414361e432 100644
4139
--- a/drivers/clk/qcom/clk-rcg.h
4240
+++ b/drivers/clk/qcom/clk-rcg.h
4341
@@ -190,6 +190,7 @@ struct clk_rcg2_gfx3d {
@@ -48,11 +46,9 @@ index c50e6616d02c..d7414361e432 100644
4846
extern const struct clk_ops clk_rcg2_mux_closest_ops;
4947
extern const struct clk_ops clk_edp_pixel_ops;
5048
extern const struct clk_ops clk_byte_ops;
51-
diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c
52-
index 5183c74b074f..9b3aaa7f20ac 100644
5349
--- a/drivers/clk/qcom/clk-rcg2.c
5450
+++ b/drivers/clk/qcom/clk-rcg2.c
55-
@@ -260,6 +260,115 @@ static int _freq_tbl_determine_rate(struct clk_hw *hw, const struct freq_tbl *f,
51+
@@ -260,6 +260,115 @@ static int _freq_tbl_determine_rate(stru
5652
return 0;
5753
}
5854

@@ -168,7 +164,7 @@ index 5183c74b074f..9b3aaa7f20ac 100644
168164
static int clk_rcg2_determine_rate(struct clk_hw *hw,
169165
struct clk_rate_request *req)
170166
{
171-
@@ -276,6 +385,14 @@ static int clk_rcg2_determine_floor_rate(struct clk_hw *hw,
167+
@@ -276,6 +385,14 @@ static int clk_rcg2_determine_floor_rate
172168
return _freq_tbl_determine_rate(hw, rcg->freq_tbl, req, FLOOR);
173169
}
174170

@@ -183,7 +179,7 @@ index 5183c74b074f..9b3aaa7f20ac 100644
183179
static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f,
184180
u32 *_cfg)
185181
{
186-
@@ -371,6 +488,30 @@ static int __clk_rcg2_set_rate(struct clk_hw *hw, unsigned long rate,
182+
@@ -371,6 +488,30 @@ static int __clk_rcg2_set_rate(struct cl
187183
return clk_rcg2_configure(rcg, f);
188184
}
189185

@@ -214,7 +210,7 @@ index 5183c74b074f..9b3aaa7f20ac 100644
214210
static int clk_rcg2_set_rate(struct clk_hw *hw, unsigned long rate,
215211
unsigned long parent_rate)
216212
{
217-
@@ -383,6 +524,12 @@ static int clk_rcg2_set_floor_rate(struct clk_hw *hw, unsigned long rate,
213+
@@ -383,6 +524,12 @@ static int clk_rcg2_set_floor_rate(struc
218214
return __clk_rcg2_set_rate(hw, rate, FLOOR);
219215
}
220216

@@ -227,7 +223,7 @@ index 5183c74b074f..9b3aaa7f20ac 100644
227223
static int clk_rcg2_set_rate_and_parent(struct clk_hw *hw,
228224
unsigned long rate, unsigned long parent_rate, u8 index)
229225
{
230-
@@ -395,6 +542,12 @@ static int clk_rcg2_set_floor_rate_and_parent(struct clk_hw *hw,
226+
@@ -395,6 +542,12 @@ static int clk_rcg2_set_floor_rate_and_p
231227
return __clk_rcg2_set_rate(hw, rate, FLOOR);
232228
}
233229

@@ -240,7 +236,7 @@ index 5183c74b074f..9b3aaa7f20ac 100644
240236
static int clk_rcg2_get_duty_cycle(struct clk_hw *hw, struct clk_duty *duty)
241237
{
242238
struct clk_rcg2 *rcg = to_clk_rcg2(hw);
243-
@@ -505,6 +658,19 @@ const struct clk_ops clk_rcg2_floor_ops = {
239+
@@ -505,6 +658,19 @@ const struct clk_ops clk_rcg2_floor_ops
244240
};
245241
EXPORT_SYMBOL_GPL(clk_rcg2_floor_ops);
246242

@@ -260,11 +256,9 @@ index 5183c74b074f..9b3aaa7f20ac 100644
260256
const struct clk_ops clk_rcg2_mux_closest_ops = {
261257
.determine_rate = __clk_mux_determine_rate_closest,
262258
.get_parent = clk_rcg2_get_parent,
263-
diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c
264-
index 75f09e6e057e..48f81e3a5e80 100644
265259
--- a/drivers/clk/qcom/common.c
266260
+++ b/drivers/clk/qcom/common.c
267-
@@ -41,6 +41,24 @@ struct freq_tbl *qcom_find_freq(const struct freq_tbl *f, unsigned long rate)
261+
@@ -41,6 +41,24 @@ struct freq_tbl *qcom_find_freq(const st
268262
}
269263
EXPORT_SYMBOL_GPL(qcom_find_freq);
270264

@@ -289,11 +283,9 @@ index 75f09e6e057e..48f81e3a5e80 100644
289283
const struct freq_tbl *qcom_find_freq_floor(const struct freq_tbl *f,
290284
unsigned long rate)
291285
{
292-
diff --git a/drivers/clk/qcom/common.h b/drivers/clk/qcom/common.h
293-
index 9c8f7b798d9f..2d4a8a837e6c 100644
294286
--- a/drivers/clk/qcom/common.h
295287
+++ b/drivers/clk/qcom/common.h
296-
@@ -45,6 +45,8 @@ extern const struct freq_tbl *qcom_find_freq(const struct freq_tbl *f,
288+
@@ -45,6 +45,8 @@ extern const struct freq_tbl *qcom_find_
297289
unsigned long rate);
298290
extern const struct freq_tbl *qcom_find_freq_floor(const struct freq_tbl *f,
299291
unsigned long rate);
@@ -302,6 +294,3 @@ index 9c8f7b798d9f..2d4a8a837e6c 100644
302294
extern void
303295
qcom_pll_set_fsm_mode(struct regmap *m, u32 reg, u8 bias_count, u8 lock_count);
304296
extern int qcom_find_src_index(struct clk_hw *hw, const struct parent_map *map,
305-
--
306-
2.45.2
307-

target/linux/qualcommbe/patches-6.6/005-v6.11-clk-qcom-branch-Add-clk_branch2_prepare_ops.patch

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
2020
drivers/clk/qcom/clk-branch.h | 1 +
2121
2 files changed, 8 insertions(+)
2222

23-
diff --git a/drivers/clk/qcom/clk-branch.c b/drivers/clk/qcom/clk-branch.c
24-
index c1dba33ac31a..229480c5b075 100644
2523
--- a/drivers/clk/qcom/clk-branch.c
2624
+++ b/drivers/clk/qcom/clk-branch.c
27-
@@ -191,3 +191,10 @@ const struct clk_ops clk_branch_simple_ops = {
25+
@@ -153,3 +153,10 @@ const struct clk_ops clk_branch_simple_o
2826
.is_enabled = clk_is_enabled_regmap,
2927
};
3028
EXPORT_SYMBOL_GPL(clk_branch_simple_ops);
@@ -35,18 +33,13 @@ index c1dba33ac31a..229480c5b075 100644
3533
+ .is_prepared = clk_is_enabled_regmap,
3634
+};
3735
+EXPORT_SYMBOL_GPL(clk_branch2_prepare_ops);
38-
diff --git a/drivers/clk/qcom/clk-branch.h b/drivers/clk/qcom/clk-branch.h
39-
index f1b3b635ff32..292756435f53 100644
4036
--- a/drivers/clk/qcom/clk-branch.h
4137
+++ b/drivers/clk/qcom/clk-branch.h
42-
@@ -109,6 +109,7 @@ extern const struct clk_ops clk_branch2_ops;
38+
@@ -85,6 +85,7 @@ extern const struct clk_ops clk_branch_o
39+
extern const struct clk_ops clk_branch2_ops;
4340
extern const struct clk_ops clk_branch_simple_ops;
4441
extern const struct clk_ops clk_branch2_aon_ops;
4542
+extern const struct clk_ops clk_branch2_prepare_ops;
4643

4744
#define to_clk_branch(_hw) \
4845
container_of(to_clk_regmap(_hw), struct clk_branch, clkr)
49-
50-
--
51-
2.45.2
52-

0 commit comments

Comments
 (0)