Skip to content

Commit 44b5814

Browse files
committed
Merge tag 'qcom-arm64-fixes-for-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes
Qualcomm ARM64 DeviceTree fixes for 6.4 Register scheme for SM8550 LLCC is corrected to avoid using the wrong register offsets. SDRAM frequency for misidentified SC7180-lite boards is handled. The datatype for Soundwire interval on SM8550 is corrected. The resource controller on SC8280XP is added to the CPU cluster power-domain to get notified to send cached sleep and wake votes before going entering the lower power states. SA8155P power-domains that differ from what's inherited from the SM8150 DeviceTree are adjusted to make the platform boot again. Remoteproc firmware paths are corrected for Sony Xperia 10 IV. Cache properties are adjusted across a range of platforms, to meet changes in the binding. Panel compatibles are corrected for Xiaomi Mi Pad 5 Pro, to match binding. Invalid dai-cells are dropped from SC7280 devices, to match binding. The incorrect removal of "input-enable" from the LPASS pinctrl node of SC8280XP was reverted, to get dmic pins in the correct state again. The incorrect input-enable property is dropped from a msm8974, mdm9615 and apq8026 to resolve a range of DT validation warnings, incorrectly picked up through the ARM64 tree. * tag 'qcom-arm64-fixes-for-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: dts: qcom: sm8550: Use the correct LLCC register scheme arm64: dts: qcom: sc7180-lite: Fix SDRAM freq for misidentified sc7180-lite boards arm64: dts: qcom: sm8550: use uint16 for Soundwire interval arm64: dts: qcom: Split out SA8155P and use correct RPMh power domains arm64: dts: qcom: sm6375-pdx225: Fix remoteproc firmware paths arm64: dts: qcom: add missing cache properties arm64: dts: qcom: use decimal for cache level arm64: dts: qcom: fix indentation ARM: dts: qcom: msm8974: remove superfluous "input-enable" ARM: dts: qcom: mdm9615: remove superfluous "input-enable" ARM: dts: qcom: apq8026: remove superfluous "input-enable" arm64: dts: qcom: sm8250-xiaomi-elish-csot: fix panel compatible arm64: dts: qcom: sm8250-xiaomi-elish-boe: fix panel compatible arm64: dts: qcom: sc7280-qcard: drop incorrect dai-cells from WCD938x SDW arm64: dts: qcom: sc7280-idp: drop incorrect dai-cells from WCD938x SDW arm64: dts: qcom: sc8280xp: Flush RSC sleep & wake votes arm64: dts: qcom: sc8280xp: Revert "arm64: dts: qcom: sc8280xp: remove superfluous "input-enable"" Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents be02e1f + 661a4f0 commit 44b5814

Some content is hidden

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

45 files changed

+322
-112
lines changed

arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,15 +268,13 @@
268268
function = "gpio";
269269
drive-strength = <8>;
270270
bias-disable;
271-
input-enable;
272271
};
273272

274273
wlan_hostwake_default_state: wlan-hostwake-default-state {
275274
pins = "gpio46";
276275
function = "gpio";
277276
drive-strength = <2>;
278277
bias-disable;
279-
input-enable;
280278
};
281279

282280
wlan_regulator_default_state: wlan-regulator-default-state {

arch/arm/boot/dts/qcom-apq8026-huawei-sturgeon.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,6 @@
352352
function = "gpio";
353353
drive-strength = <2>;
354354
bias-disable;
355-
input-enable;
356355
};
357356

358357
wlan_regulator_default_state: wlan-regulator-default-state {

arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@
307307
function = "gpio";
308308
drive-strength = <2>;
309309
bias-disable;
310-
input-enable;
311310
};
312311

313312
touch_pins: touch-state {
@@ -317,7 +316,6 @@
317316

318317
drive-strength = <8>;
319318
bias-pull-down;
320-
input-enable;
321319
};
322320

323321
reset-pins {
@@ -335,7 +333,6 @@
335333
function = "gpio";
336334
drive-strength = <2>;
337335
bias-disable;
338-
input-enable;
339336
};
340337

341338
wlan_regulator_default_state: wlan-regulator-default-state {

arch/arm/boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
gpioext1-pins {
5050
pins = "gpio2";
5151
function = "gpio";
52-
input-enable;
5352
bias-disable;
5453
};
5554
};

arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,6 @@
592592
pins = "gpio73";
593593
function = "gpio";
594594
bias-disable;
595-
input-enable;
596595
};
597596

598597
touch_pin: touch-state {
@@ -602,7 +601,6 @@
602601

603602
drive-strength = <2>;
604603
bias-disable;
605-
input-enable;
606604
};
607605

608606
reset-pins {

arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,6 @@
433433
function = "gpio";
434434
drive-strength = <2>;
435435
bias-disable;
436-
input-enable;
437436
};
438437

439438
sdc1_on: sdc1-on-state {

arch/arm/boot/dts/qcom-msm8974pro-oneplus-bacon.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,6 @@
461461
function = "gpio";
462462
drive-strength = <2>;
463463
bias-disable;
464-
input-enable;
465464
};
466465

467466
reset-pins {

arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,6 @@
704704
pins = "gpio75";
705705
function = "gpio";
706706
drive-strength = <16>;
707-
input-enable;
708707
};
709708

710709
devwake-pins {
@@ -760,14 +759,12 @@
760759
i2c_touchkey_pins: i2c-touchkey-state {
761760
pins = "gpio95", "gpio96";
762761
function = "gpio";
763-
input-enable;
764762
bias-pull-up;
765763
};
766764

767765
i2c_led_gpioex_pins: i2c-led-gpioex-state {
768766
pins = "gpio120", "gpio121";
769767
function = "gpio";
770-
input-enable;
771768
bias-pull-down;
772769
};
773770

@@ -781,7 +778,6 @@
781778
wifi_pin: wifi-state {
782779
pins = "gpio92";
783780
function = "gpio";
784-
input-enable;
785781
bias-pull-down;
786782
};
787783

arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,6 @@
631631
function = "gpio";
632632
drive-strength = <2>;
633633
bias-disable;
634-
input-enable;
635634
};
636635

637636
bt_host_wake_pin: bt-host-wake-state {

arch/arm64/boot/dts/qcom/ipq5332.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
L2_0: l2-cache {
7474
compatible = "cache";
7575
cache-level = <2>;
76+
cache-unified;
7677
};
7778
};
7879

0 commit comments

Comments
 (0)