Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 21:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

A few more Qualcomm Arm64 DeviceTree updates for v6.10

Browse Source 
This corrects the obviously broken compatible of the USB VBUS regulator
 in PM6150.
 
 It clears the odd-looking default address on QCS404 EVB, with the
 expectation that a proper address is provides by other means.
 
 The newly added SM8650 GPU node is corrected with a missing memory
 region.
 
 The third DWC3 instance on SC8280XP is added, and enabled on Lenovo
 Thinkpad X13s to give working fingerprint sensor.
 -----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCAAzFiEEBd4DzF816k8JZtUlCx85Pw2ZrcUFAmY64NIVHGFuZGVyc3Nv
 bkBrZXJuZWwub3JnAAoJEAsfOT8Nma3Fjj8P/1p1uZmJtx2/kaZM3XKBd2QpEP3L
 NYbWxDdoHkeK+qRhLi+T/g822BVfTBEc28/lrF/nB+LvpIwKGLUywLXdsLRrVrTQ
 lhUqKsViJ35/lispBuZzCWyx5JwsrimERKj6XLnIkPLQUZs4HI4y275LA4KMGjnR
 ctoJR5zosBE9kOF9bgPNMfR/rWHVBYHCCMKsj1XpfRmCe+F/Yqzw9vw4utKjleGD
 l7ayPVaN/MvwsNCM4WmRQ5PfXPkYGn8zLSHAEqQrkWMBgA3kMboVwRF2SDchsM0q
 T4LV84B9WDLs9pn8xik5ZzSo6NVvGOxSPdUGiYATqRjBr/kYMNf3fyCUNy3WMsv5
 XS8Zf15gqfBFPiQV4AQOavXSZn6zpy3K6M4X6ru2G+joV5gd7E7B3mU0rPqsXTyr
 wy6gatiG8g10oCtb35LKQuXSPvYaCbyfpKPMZcUfFp8EhVSfHuVkV9g41VF+vJSI
 xQEa5tiNkoAj86rVy/AV2QreBPlEXzONfL5RFbivCgz9L9XblhJ3LnX7wvsW+UfM
 21jOLshBi69H0z2v3mMk3nLG9EDrgPnQQIkJPVKis8BJmYeKZZk1kJsyQOnXlJeW
 YkxX/wchZE+eEP7MUkGzdWUzWZX7f+8fveRkOAHdU1BIgPHFvqwoFZO0x+sHqXHf
 CBGUAap9EKoz4kn9
 =IC06
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmY7JF4ACgkQYKtH/8kJ
 Uic5txAA41jpjYMEkCZjPX8KVzWGBLB0OVkTY+tEZg05Eo/Vv01CoxgAwmQJnoj5
 6jPg/PlMoAjSFfvFVO6KI57EeaOPpvgapX8zNy7ezJfAoc+waSbB2SpxA5CFJS7h
 YjGN+wC7zSHM/dqz7s1SENOGvy4FYmVBUJq1dsqehm0uBs+6lP6h16dTSOVcvqzD
 5PgwUE1NToEOUF3tlbMUHwKzBzKIOUZmI+YD9JZoeHBv6QGVe4G6bQOpnGt18Udy
 lhpPykQ3gabRbo0c9gVfEpSfKbP7hSYa6qrVCrWIg/TL8CmewIg74u8XNM2MUhKT
 qiXMbCpYN3MVHHM9y4cC7EvhtAVkxzr72DTCJRw3zoUYzOO/aJ5e8ZLpSiAvbeUN
 8yszmlMl1KCzJlSo208E9bnbK13mfowR6x8ahgytsbSkgDQqnQmJleDC0Dun+An3
 V6TA90Xb1CufsaIGUXhpRt5nNmGbDgJ7MayG2WDiMu2iL3csRl5QtSnop6ZbIbk1
 5wV1LxCzNXlDnU2kOF0B4LEbHbKcmdL5bo0enrnC17g2TMbF8LVx9OZ6sgMVxdH8
 4xUdqGcxgEQxQxcUkca3Jw/dO4fiQSrWLAMROtdiy3ro3Mtjr+ZVmnwLu25ZoQM9
 2ZeGhsG6l1Gz2ty8JEybIo8JgaKLSx8phbubmtHOrtotsQ17Bak=
 =aKX7
 -----END PGP SIGNATURE-----

Merge tag 'qcom-arm64-for-6.10-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt

A few more Qualcomm Arm64 DeviceTree updates for v6.10

This corrects the obviously broken compatible of the USB VBUS regulator
in PM6150.

It clears the odd-looking default address on QCS404 EVB, with the
expectation that a proper address is provides by other means.

The newly added SM8650 GPU node is corrected with a missing memory
region.

The third DWC3 instance on SC8280XP is added, and enabled on Lenovo
Thinkpad X13s to give working fingerprint sensor.

* tag 'qcom-arm64-for-6.10-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: dts: qcom: pm6150: correct USB VBUS regulator compatible
  arm64: dts: qcom: qcs404: fix bluetooth device address
  arm64: dts: qcom: sc8280xp-x13s: enable USB MP and fingerprint reader
  arm64: dts: qcom: sc8280xp: Add USB DWC3 Multiport controller
  arm64: dts: qcom: sm8650: Fix GPU cx_mem size

Link: https://lore.kernel.org/r/20240508021820.206441-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-05-08 09:06:06 +02:00
commit 0cb7e0c617
5 changed files with 171 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/qcom/pm6150.dtsi
View File

@ -64,8 +64,8 @@
};
pm6150_vbus: usb-vbus-regulator@1100 {
compatible = "qcom,pm6150-vbus-reg,
qcom,pm8150b-vbus-reg";
compatible = "qcom,pm6150-vbus-reg",
"qcom,pm8150b-vbus-reg";
reg = <0x1100>;
status = "disabled";
};

2
arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
View File

@ -62,7 +62,7 @@
vddrf-supply = <&vreg_l1_1p3>;
vddch0-supply = <&vdd_ch0_3p3>;
local-bd-address = [ 02 00 00 00 5a ad ];
local-bd-address = [ 00 00 00 00 00 00 ];
max-speed = <3200000>;
};

85
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
View File

@ -416,6 +416,13 @@
regulator-always-on;
};
vreg_l1b: ldo1 {
regulator-name = "vreg_l1b";
regulator-min-microvolt = <912000>;
regulator-max-microvolt = <912000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
vreg_l3b: ldo3 {
regulator-name = "vreg_l3b";
regulator-min-microvolt = <1200000>;
@ -466,6 +473,13 @@
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
vreg_l8c: ldo8 {
regulator-name = "vreg_l8c";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
vreg_l12c: ldo12 {
regulator-name = "vreg_l12c";
regulator-min-microvolt = <1800000>;
@ -499,6 +513,13 @@
vdd-l6-l9-l10-supply = <&vreg_s12b>;
vdd-l8-supply = <&vreg_s12b>;
vreg_l2d: ldo2 {
regulator-name = "vreg_l2d";
regulator-min-microvolt = <3072000>;
regulator-max-microvolt = <3072000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
vreg_l3d: ldo3 {
regulator-name = "vreg_l3d";
regulator-min-microvolt = <1200000>;
@ -527,12 +548,26 @@
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
vreg_l8d: ldo8 {
regulator-name = "vreg_l8d";
regulator-min-microvolt = <912000>;
regulator-max-microvolt = <912000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
vreg_l9d: ldo9 {
regulator-name = "vreg_l9d";
regulator-min-microvolt = <912000>;
regulator-max-microvolt = <912000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
vreg_l10d: ldo10 {
regulator-name = "vreg_l10d";
regulator-min-microvolt = <912000>;
regulator-max-microvolt = <912000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
};
};
@ -1162,6 +1197,56 @@
remote-endpoint = <&pmic_glink_con1_hs>;
};
&usb_2 {
status = "okay";
};
&usb_2_hsphy0 {
vdda-pll-supply = <&vreg_l1b>;
vdda18-supply = <&vreg_l1c>;
vdda33-supply = <&vreg_l7d>;
status = "okay";
};
&usb_2_hsphy1 {
vdda-pll-supply = <&vreg_l8d>;
vdda18-supply = <&vreg_l1c>;
vdda33-supply = <&vreg_l7d>;
status = "okay";
};
&usb_2_hsphy2 {
vdda-pll-supply = <&vreg_l10d>;
vdda18-supply = <&vreg_l8c>;
vdda33-supply = <&vreg_l2d>;
status = "okay";
};
&usb_2_hsphy3 {
vdda-pll-supply = <&vreg_l10d>;
vdda18-supply = <&vreg_l8c>;
vdda33-supply = <&vreg_l2d>;
status = "okay";
};
&usb_2_qmpphy0 {
vdda-phy-supply = <&vreg_l1b>;
vdda-pll-supply = <&vreg_l4d>;
status = "okay";
};
&usb_2_qmpphy1 {
vdda-phy-supply = <&vreg_l8d>;
vdda-pll-supply = <&vreg_l4d>;
status = "okay";
};
&vamacro {
pinctrl-0 = <&dmic01_default>, <&dmic23_default>;
pinctrl-names = "default";

82
arch/arm64/boot/dts/qcom/sc8280xp.dtsi
View File

@ -3423,6 +3423,88 @@
interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
};
usb_2: usb@a4f8800 {
compatible = "qcom,sc8280xp-dwc3-mp", "qcom,dwc3";
reg = <0 0x0a4f8800 0 0x400>;
#address-cells = <2>;
#size-cells = <2>;
ranges;
clocks = <&gcc GCC_CFG_NOC_USB3_MP_AXI_CLK>,
<&gcc GCC_USB30_MP_MASTER_CLK>,
<&gcc GCC_AGGRE_USB3_MP_AXI_CLK>,
<&gcc GCC_USB30_MP_SLEEP_CLK>,
<&gcc GCC_USB30_MP_MOCK_UTMI_CLK>,
<&gcc GCC_AGGRE_USB_NOC_AXI_CLK>,
<&gcc GCC_AGGRE_USB_NOC_NORTH_AXI_CLK>,
<&gcc GCC_AGGRE_USB_NOC_SOUTH_AXI_CLK>,
<&gcc GCC_SYS_NOC_USB_AXI_CLK>;
clock-names = "cfg_noc", "core", "iface", "sleep", "mock_utmi",
"noc_aggr", "noc_aggr_north", "noc_aggr_south", "noc_sys";
assigned-clocks = <&gcc GCC_USB30_MP_MOCK_UTMI_CLK>,
<&gcc GCC_USB30_MP_MASTER_CLK>;
assigned-clock-rates = <19200000>, <200000000>;
interrupts-extended = <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
<&intc GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,
<&intc GIC_SPI 857 IRQ_TYPE_LEVEL_HIGH>,
<&intc GIC_SPI 856 IRQ_TYPE_LEVEL_HIGH>,
<&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
<&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
<&intc GIC_SPI 860 IRQ_TYPE_LEVEL_HIGH>,
<&intc GIC_SPI 859 IRQ_TYPE_LEVEL_HIGH>,
<&pdc 127 IRQ_TYPE_EDGE_BOTH>,
<&pdc 126 IRQ_TYPE_EDGE_BOTH>,
<&pdc 129 IRQ_TYPE_EDGE_BOTH>,
<&pdc 128 IRQ_TYPE_EDGE_BOTH>,
<&pdc 131 IRQ_TYPE_EDGE_BOTH>,
<&pdc 130 IRQ_TYPE_EDGE_BOTH>,
<&pdc 133 IRQ_TYPE_EDGE_BOTH>,
<&pdc 132 IRQ_TYPE_EDGE_BOTH>,
<&pdc 16 IRQ_TYPE_LEVEL_HIGH>,
<&pdc 17 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "pwr_event_1", "pwr_event_2",
"pwr_event_3", "pwr_event_4",
"hs_phy_1", "hs_phy_2",
"hs_phy_3", "hs_phy_4",
"dp_hs_phy_1", "dm_hs_phy_1",
"dp_hs_phy_2", "dm_hs_phy_2",
"dp_hs_phy_3", "dm_hs_phy_3",
"dp_hs_phy_4", "dm_hs_phy_4",
"ss_phy_1", "ss_phy_2";
power-domains = <&gcc USB30_MP_GDSC>;
required-opps = <&rpmhpd_opp_nom>;
resets = <&gcc GCC_USB30_MP_BCR>;
interconnects = <&aggre1_noc MASTER_USB3_MP 0 &mc_virt SLAVE_EBI1 0>,
<&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_MP 0>;
interconnect-names = "usb-ddr", "apps-usb";
wakeup-source;
status = "disabled";
usb_2_dwc3: usb@a400000 {
compatible = "snps,dwc3";
reg = <0 0x0a400000 0 0xcd00>;
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
iommus = <&apps_smmu 0x800 0x0>;
phys = <&usb_2_hsphy0>, <&usb_2_qmpphy0>,
<&usb_2_hsphy1>, <&usb_2_qmpphy1>,
<&usb_2_hsphy2>,
<&usb_2_hsphy3>;
phy-names = "usb2-0", "usb3-0",
"usb2-1", "usb3-1",
"usb2-2",
"usb2-3";
dr_mode = "host";
};
};
usb_0: usb@a6f8800 {
compatible = "qcom,sc8280xp-dwc3", "qcom,dwc3";
reg = <0 0x0a6f8800 0 0x400>;

2
arch/arm64/boot/dts/qcom/sm8650.dtsi
View File

@ -2614,7 +2614,7 @@
gpu: gpu@3d00000 {
compatible = "qcom,adreno-43051401", "qcom,adreno";
reg = <0x0 0x03d00000 0x0 0x40000>,
<0x0 0x03d9e000 0x0 0x1000>,
<0x0 0x03d9e000 0x0 0x2000>,
<0x0 0x03d61000 0x0 0x800>;
reg-names = "kgsl_3d0_reg_memory",
"cx_mem",