Skip to content

Commit

Permalink
Merge tag 'qcom-arm64-for-6.11-2' of https://git.kernel.org/pub/scm/l…
Browse files Browse the repository at this point in the history
…inux/kernel/git/qcom/linux into soc/dt

A few more Arm64 DeviceTree updates for v6.11

This introduces support for Lenovo Thinkpad Yoga slim 7x, LG Leon LTE,
and LG K10 (K420n).

In addition to this, all Gen-1 platforms gets the DWC3 quirk to disable
"SuperSpeed in park mode", which resolves an instabliity issue seen in
host mode.

For Fairphone 4, PM6150L and PMK8003 thermal sensors are added and
thermal zones defined.

Two fastrpc contexts on SM6350 are marked as non-secure, to allow
non-secure usage.

The video clock controller on SM8150 is introduced. IPQ9574 GCC is
marked as a interconnect provider. The vibrator block in the PM6150 is
described.

On SC7280 the download mode register is defined for SCM, allowing it to
enable/disable the ramdump support during a system crash.

Lastly, add a mailmap entry for Luca Weiss.

* tag 'qcom-arm64-for-6.11-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (22 commits)
  mailmap: Update Luca Weiss's email address
  arm64: dts: qcom: msm8916-lg-c50: add initial dts for LG Leon LTE
  arm64: dts: qcom: msm8916-lg-m216: Add initial device tree
  dt-bindings: arm: qcom: Add msm8916 based LG devices
  arm64: dts: qcom: ipq9574: Add icc provider ability to gcc
  dt-bindings: interconnect: Add Qualcomm IPQ9574 support
  arm64: dts: qcom: sm8150: Add video clock controller node
  arm64: dts: qcom: pm6150: Add vibrator
  arm64: dts: qcom: sc7280: Enable download mode register write
  arm64: dts: qcom: sm7225-fairphone-fp4: Add PM6150L thermals
  arm64: dts: qcom: sm7225-fairphone-fp4: Add PMK8003 thermals
  arm64: dts: qcom: sm6350: Add missing qcom,non-secure-domain property
  arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB
  arm64: dts: qcom: msm8996: Disable SS instance in Parkmode for USB
  arm64: dts: qcom: sm6350: Disable SS instance in Parkmode for USB
  arm64: dts: qcom: sm6115: Disable SS instance in Parkmode for USB
  arm64: dts: qcom: sdm630: Disable SS instance in Parkmode for USB
  arm64: dts: qcom: msm8998: Disable SS instance in Parkmode for USB
  arm64: dts: qcom: ipq8074: Disable SS instance in Parkmode for USB
  arm64: dts: qcom: ipq6018: Disable SS instance in Parkmode for USB
  ...

Link: https://lore.kernel.org/r/20240709193406.3966-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
arndb committed Jul 9, 2024
2 parents 4b1a54b + 2881fcf commit 28323a7
Show file tree
Hide file tree
Showing 22 changed files with 1,640 additions and 0 deletions.
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
Lior David <quic_liord@quicinc.com> <liord@codeaurora.org>
Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com>
Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>
Luca Weiss <luca@lucaweiss.eu> <luca@z3ntu.xyz>
Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
Luo Jie <quic_luoj@quicinc.com> <luoj@codeaurora.org>
Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/arm/qcom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@ properties:
- asus,z00l
- gplus,fl8005a
- huawei,g7
- lg,c50
- lg,m216
- longcheer,l8910
- longcheer,l8150
- motorola,harpia
Expand Down Expand Up @@ -1039,6 +1041,7 @@ properties:
- items:
- enum:
- asus,vivobook-s15
- lenovo,yoga-slim7x
- qcom,x1e80100-crd
- qcom,x1e80100-qcp
- const: qcom,x1e80100
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/clock/qcom,ipq9574-gcc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ properties:
- description: PCIE30 PHY3 pipe clock source
- description: USB3 PHY pipe clock source

'#interconnect-cells':
const: 1

required:
- compatible
- clocks
Expand Down
3 changes: 3 additions & 0 deletions arch/arm64/boot/dts/qcom/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-gplus-fl8005a.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-lg-c50.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-lg-m216.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8150.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8910.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-motorola-harpia.dtb
Expand Down Expand Up @@ -261,4 +263,5 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8650-mtp.dtb
dtb-$(CONFIG_ARCH_QCOM) += sm8650-qrd.dtb
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-asus-vivobook-s15.dtb
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-crd.dtb
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-lenovo-yoga-slim7x.dtb
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-qcp.dtb
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/ipq6018.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,7 @@
clocks = <&xo>;
clock-names = "ref";
tx-fifo-resize;
snps,parkmode-disable-ss-quirk;
snps,is-utmi-l1-suspend;
snps,hird-threshold = /bits/ 8 <0x0>;
snps,dis_u2_susphy_quirk;
Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/qcom/ipq8074.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,7 @@
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
phys = <&qusb_phy_0>, <&ssphy_0>;
phy-names = "usb2-phy", "usb3-phy";
snps,parkmode-disable-ss-quirk;
snps,is-utmi-l1-suspend;
snps,hird-threshold = /bits/ 8 <0x0>;
snps,dis_u2_susphy_quirk;
Expand Down Expand Up @@ -715,6 +716,7 @@
interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
phys = <&qusb_phy_1>, <&ssphy_1>;
phy-names = "usb2-phy", "usb3-phy";
snps,parkmode-disable-ss-quirk;
snps,is-utmi-l1-suspend;
snps,hird-threshold = /bits/ 8 <0x0>;
snps,dis_u2_susphy_quirk;
Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/qcom/ipq9574.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include <dt-bindings/clock/qcom,apss-ipq.h>
#include <dt-bindings/clock/qcom,ipq9574-gcc.h>
#include <dt-bindings/interconnect/qcom,ipq9574.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/reset/qcom,ipq9574-gcc.h>
#include <dt-bindings/thermal/thermal.h>
Expand Down Expand Up @@ -315,6 +316,7 @@
<0>;
#clock-cells = <1>;
#reset-cells = <1>;
#interconnect-cells = <1>;
};

tcsr_mutex: hwlock@1905000 {
Expand Down
140 changes: 140 additions & 0 deletions arch/arm64/boot/dts/qcom/msm8916-lg-c50.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
// SPDX-License-Identifier: GPL-2.0-only

/dts-v1/;

#include "msm8916-pm8916.dtsi"

#include <dt-bindings/gpio/gpio.h>

/ {
model = "LG Leon LTE";
compatible = "lg,c50", "qcom,msm8916";
chassis-type = "handset";

aliases {
mmc0 = &sdhc_1; /* eMMC */
mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};

chosen {
stdout-path = "serial0";
};

gpio-keys {
compatible = "gpio-keys";

pinctrl-0 = <&gpio_keys_default>;
pinctrl-names = "default";

label = "GPIO Buttons";

volume-up-button {
label = "Volume Up";
gpios = <&tlmm 108 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};

volume-down-button {
label = "Volume Down";
gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
};
};

reg_sd_vmmc: regulator-sdcard-vmmc {
compatible = "regulator-fixed";
regulator-name = "sdcard-vmmc";
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;

gpio = <&tlmm 60 GPIO_ACTIVE_HIGH>;
enable-active-high;

startup-delay-us = <5000>;

pinctrl-0 = <&sd_vmmc_en_default>;
pinctrl-names = "default";
};
};

&blsp_uart2 {
status = "okay";
};

&pm8916_usbin {
status = "okay";
};

&pm8916_vib {
status = "okay";
};

&sdhc_1 {
status = "okay";
};

&sdhc_2 {
vmmc-supply = <&reg_sd_vmmc>;

pinctrl-0 = <&sdc2_default &sdc2_cd_default>;
pinctrl-1 = <&sdc2_sleep &sdc2_cd_default>;
pinctrl-names = "default", "sleep";

cd-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>;

status = "okay";
};

&usb {
dr_mode = "peripheral";
extcon = <&pm8916_usbin>;
status = "okay";
};

&usb_hs_phy {
extcon = <&pm8916_usbin>;
};

&venus {
status = "okay";
};

&venus_mem {
status = "okay";
};

&wcnss {
status = "okay";
};

&wcnss_iris {
compatible = "qcom,wcn3620";
};

&wcnss_mem {
status = "okay";
};

&tlmm {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107", "gpio108";
function = "gpio";
drive-strength = <2>;
bias-pull-up;
};

sd_vmmc_en_default: sd-vmmc-en-default-state {
pins = "gpio60";
function = "gpio";
drive-strength = <2>;
bias-disable;
};

sdc2_cd_default: sdc2-cd-default-state {
pins = "gpio38";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
};
};
Loading

0 comments on commit 28323a7

Please sign in to comment.