Skip to content

Commit 1d3454f

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-for-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm Arm64 DeviceTree updates for v6.10 Support for Sony Xperia 1V, on the SM8550 platform, is added. On IPQ8074, UART6 is described and unused gpios from QPIC are removed. Backlight and touchscreen are described on Samsung Grand Prime devices. RGB LED is added to Sony Xperia "Yoshino" devices, on which the volume-up key definition is corrected as well. Light Pulse Generator node is added to PM6150L PMIC, and blocks related to USB Type-C on PM6150 are added. On QCS6490 Rb3Gen2 UFS storage, USB Type-C management, a couple of remoteprocs and both USB Type-C and native DisplayPort are enabled. For the related IDP display is enabled, and the PMIC volume and power buttons are described. The inline crypto engine is added for SC7280, and an additional turbo frequency is added to the MDP. USB Type-C port management is introduce for the QRB2210 RB1. WiFi firmware-name qualifier is added to both RB1 and RB2 boards. The LMH node is added for the QCM2290, to configure the thresholds as well as provide thermal pressure input. The regulator range is adjusted for SD-card IO on SA8155P ADP, to allow UHS modes. The unused DCC is disabled on SC7180, and unused PMIC gpio block is disabled on Trogdor. For Lenovo Flex 5G, on SC8180X, the GPU firmware path is aligned with agreed upon firmware structure. The frequency of the I2C bus for touchpad is brought up to mitigate missing events. A number of additional cleanups are introduced. For SC8280XP GICv3 ITS is wired up for PCIe. EAS properties ad introduced. A PS_HOLD-based restart node is introduced and acts as a fallback if other mechanisms are unavailable to restart the board. QFPROM is described, missing LMH interrupts for thermal pressure are added. The TCSR download mode register is added, to allow configuring if download mode should be entered on a crash. USB Type-C handling is introduce for Fairphone FP3 as well. On SM6350 crypto engine and DisplayPort controllers are introduced. WiFi is enabled on the SM8150 Hardware Development Kit (HDK) USB PD properties are added on Xiaomi Mi Pad 5 Pro devices. Interconnect paths are added for UFS on SM8350, to ensure the bus is voted for when the controller is operating. On SM8550 the DMA coherency properties are corrected for SMMU and a few consumers. Missing DWC3 quirks are added and the SNPS PHY parameters are adjusted. Fastrpc banks are marked non-secure as needed. The GPU description is introduced on SM8650, and enabled on the QRD. A missing reserved-memory node is added, as is a few missing fastrpc compute banks, and the non-secure-domain flag for other banks. On X1 Elite SPMI support is added, together with PMIC definitons. The link properties for DP3 are corrected, and audio-related resets are introduced. SoundWire properties are corrected. Nodes describing the PCIe bridge under the host controller is added for a bunch of platforms. The GPIO carrying orientation information for USB Type-C is added across Fairphone 5, Lenovo Flex 5G, Lenovo Thinkpad X13s, SM8350 and SM845 HDKs. A few dtbTool-specific compatibles for msm8916 is dropped from the bindings. A number of DeviceTree binding validation issues are corrected. * tag 'qcom-arm64-for-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (110 commits) dt-bindings: arm: qcom: Add Samsung Galaxy S5 China (kltechn) arm64: dts: qcom: qrb4210-rb1: add firmware-name qualifier to WiFi node arm64: dts: qcom: qrb2210-rb1: add firmware-name qualifier to WiFi node arm64: dts: qcom: ipq6018: Add PCIe bridge node arm64: dts: qcom: ipq8074: Add PCIe bridge node arm64: dts: qcom: msm8996: Add PCIe bridge node arm64: dts: qcom: sc8180x: Add PCIe bridge node arm64: dts: qcom: qcs404: Add PCIe bridge node arm64: dts: qcom: sc7280: Add PCIe bridge node arm64: dts: qcom: msm8998: Add PCIe bridge node arm64: dts: qcom: sc8280xp: Add PCIe bridge node arm64: dts: qcom: sa8775p: Add PCIe bridge node arm64: dts: qcom: sm8650: Add PCIe bridge node arm64: dts: qcom: sm8550: Add PCIe bridge node arm64: dts: qcom: sm8450: Add PCIe bridge node arm64: dts: qcom: sm8350: Add PCIe bridge node arm64: dts: qcom: sm8150: Add PCIe bridge node arm64: dts: qcom: sdm845: Add PCIe bridge node arm64: dts: qcom: sm8250: Add PCIe bridge node arm64: dts: qcom: sdm845-db845c: make pcie0_3p3v_dual always-on ... Link: https://lore.kernel.org/r/20240427175951.1439887-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 80a02b1 + 873d845 commit 1d3454f

60 files changed

Lines changed: 2720 additions & 148 deletions

Some content is hidden

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

‎Documentation/devicetree/bindings/arm/qcom.yaml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,16 @@ properties:
185185
- oneplus,bacon
186186
- samsung,klte
187187
- sony,xperia-castor
188+
- sony,xperia-leo
188189
- const: qcom,msm8974pro
189190
- const: qcom,msm8974
190191

191192
- items:
192-
- const: qcom,msm8916-mtp
193-
- const: qcom,msm8916-mtp/1
194-
- const: qcom,msm8916
193+
- enum:
194+
- samsung,kltechn
195+
- const: samsung,klte
196+
- const: qcom,msm8974pro
197+
- const: qcom,msm8974
195198

196199
- items:
197200
- enum:
@@ -201,6 +204,8 @@ properties:
201204
- gplus,fl8005a
202205
- huawei,g7
203206
- longcheer,l8910
207+
- longcheer,l8150
208+
- qcom,msm8916-mtp
204209
- samsung,a3u-eur
205210
- samsung,a5u-eur
206211
- samsung,e5
@@ -221,11 +226,6 @@ properties:
221226
- yiming,uz801-v3
222227
- const: qcom,msm8916
223228

224-
- items:
225-
- const: longcheer,l8150
226-
- const: qcom,msm8916-v1-qrd/9-v1
227-
- const: qcom,msm8916
228-
229229
- items:
230230
- enum:
231231
- motorola,potter
@@ -1004,6 +1004,7 @@ properties:
10041004
- qcom,sm8550-hdk
10051005
- qcom,sm8550-mtp
10061006
- qcom,sm8550-qrd
1007+
- sony,pdx234
10071008
- const: qcom,sm8550
10081009

10091010
- items:

‎Documentation/devicetree/bindings/soc/qcom/qcom,pmic-glink.yaml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,6 @@ patternProperties:
5858
required:
5959
- compatible
6060

61-
allOf:
62-
- if:
63-
not:
64-
properties:
65-
compatible:
66-
contains:
67-
enum:
68-
- qcom,sm8450-pmic-glink
69-
- qcom,sm8550-pmic-glink
70-
- qcom,x1e80100-pmic-glink
71-
then:
72-
properties:
73-
orientation-gpios: false
74-
7561
additionalProperties: false
7662

7763
examples:

‎arch/arm64/boot/dts/qcom/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8450-sony-xperia-nagara-pdx224.dtb
241241
dtb-$(CONFIG_ARCH_QCOM) += sm8550-hdk.dtb
242242
dtb-$(CONFIG_ARCH_QCOM) += sm8550-mtp.dtb
243243
dtb-$(CONFIG_ARCH_QCOM) += sm8550-qrd.dtb
244+
dtb-$(CONFIG_ARCH_QCOM) += sm8550-sony-xperia-yodo-pdx234.dtb
244245
dtb-$(CONFIG_ARCH_QCOM) += sm8650-mtp.dtb
245246
dtb-$(CONFIG_ARCH_QCOM) += sm8650-qrd.dtb
246247
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-crd.dtb

‎arch/arm64/boot/dts/qcom/apq8016-sbc.dts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191

9292
compatible = "gpio-leds";
9393

94-
led@1 {
94+
led-1 {
9595
label = "apq8016-sbc:green:user1";
9696
function = LED_FUNCTION_HEARTBEAT;
9797
color = <LED_COLOR_ID_GREEN>;
@@ -100,7 +100,7 @@
100100
default-state = "off";
101101
};
102102

103-
led@2 {
103+
led-2 {
104104
label = "apq8016-sbc:green:user2";
105105
function = LED_FUNCTION_DISK_ACTIVITY;
106106
color = <LED_COLOR_ID_GREEN>;
@@ -109,7 +109,7 @@
109109
default-state = "off";
110110
};
111111

112-
led@3 {
112+
led-3 {
113113
label = "apq8016-sbc:green:user3";
114114
function = LED_FUNCTION_DISK_ACTIVITY;
115115
color = <LED_COLOR_ID_GREEN>;
@@ -118,7 +118,7 @@
118118
default-state = "off";
119119
};
120120

121-
led@4 {
121+
led-4 {
122122
label = "apq8016-sbc:green:user4";
123123
color = <LED_COLOR_ID_GREEN>;
124124
gpios = <&pm8916_gpios 2 GPIO_ACTIVE_HIGH>;
@@ -127,7 +127,7 @@
127127
default-state = "off";
128128
};
129129

130-
led@5 {
130+
led-5 {
131131
label = "apq8016-sbc:yellow:wlan";
132132
function = LED_FUNCTION_WLAN;
133133
color = <LED_COLOR_ID_YELLOW>;
@@ -136,7 +136,7 @@
136136
default-state = "off";
137137
};
138138

139-
led@6 {
139+
led-6 {
140140
label = "apq8016-sbc:blue:bt";
141141
function = LED_FUNCTION_BLUETOOTH;
142142
color = <LED_COLOR_ID_BLUE>;

‎arch/arm64/boot/dts/qcom/ipq6018.dtsi‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,16 @@
907907
"axi_s_sticky";
908908

909909
status = "disabled";
910+
911+
pcie@0 {
912+
device_type = "pci";
913+
reg = <0x0 0x0 0x0 0x0 0x0>;
914+
bus-range = <0x01 0xff>;
915+
916+
#address-cells = <3>;
917+
#size-cells = <2>;
918+
ranges;
919+
};
910920
};
911921
};
912922

‎arch/arm64/boot/dts/qcom/ipq8074.dtsi‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,13 @@
323323
bias-disable;
324324
};
325325

326+
serial_5_pins: serial5-state {
327+
pins = "gpio9", "gpio16";
328+
function = "blsp5_uart";
329+
drive-strength = <8>;
330+
bias-disable;
331+
};
332+
326333
i2c_0_pins: i2c-0-state {
327334
pins = "gpio42", "gpio43";
328335
function = "blsp1_i2c";
@@ -349,7 +356,7 @@
349356
"gpio5", "gpio6", "gpio7",
350357
"gpio8", "gpio10", "gpio11",
351358
"gpio12", "gpio13", "gpio14",
352-
"gpio15", "gpio16", "gpio17";
359+
"gpio15", "gpio17";
353360
function = "qpic";
354361
drive-strength = <8>;
355362
bias-disable;
@@ -471,6 +478,18 @@
471478
status = "disabled";
472479
};
473480

481+
blsp1_uart6: serial@78b4000 {
482+
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
483+
reg = <0x078b4000 0x200>;
484+
interrupts = <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>;
485+
clocks = <&gcc GCC_BLSP1_UART6_APPS_CLK>,
486+
<&gcc GCC_BLSP1_AHB_CLK>;
487+
clock-names = "core", "iface";
488+
pinctrl-0 = <&serial_5_pins>;
489+
pinctrl-names = "default";
490+
status = "disabled";
491+
};
492+
474493
blsp1_spi1: spi@78b5000 {
475494
compatible = "qcom,spi-qup-v2.2.1";
476495
#address-cells = <1>;
@@ -864,6 +883,16 @@
864883
"ahb",
865884
"axi_m_sticky";
866885
status = "disabled";
886+
887+
pcie@0 {
888+
device_type = "pci";
889+
reg = <0x0 0x0 0x0 0x0 0x0>;
890+
bus-range = <0x01 0xff>;
891+
892+
#address-cells = <3>;
893+
#size-cells = <2>;
894+
ranges;
895+
};
867896
};
868897

869898
pcie0: pcie@20000000 {
@@ -929,6 +958,16 @@
929958
"axi_m_sticky",
930959
"axi_s_sticky";
931960
status = "disabled";
961+
962+
pcie@0 {
963+
device_type = "pci";
964+
reg = <0x0 0x0 0x0 0x0 0x0>;
965+
bus-range = <0x01 0xff>;
966+
967+
#address-cells = <3>;
968+
#size-cells = <2>;
969+
ranges;
970+
};
932971
};
933972
};
934973

‎arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
/ {
1414
model = "Longcheer L8150";
15-
compatible = "longcheer,l8150", "qcom,msm8916-v1-qrd/9-v1", "qcom,msm8916";
15+
compatible = "longcheer,l8150", "qcom,msm8916";
1616
chassis-type = "handset";
1717

1818
aliases {

‎arch/arm64/boot/dts/qcom/msm8916-mtp.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
/ {
1111
model = "Qualcomm Technologies, Inc. MSM 8916 MTP";
12-
compatible = "qcom,msm8916-mtp", "qcom,msm8916-mtp/1", "qcom,msm8916";
12+
compatible = "qcom,msm8916-mtp", "qcom,msm8916";
1313
chassis-type = "handset";
1414

1515
aliases {

‎arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,12 @@
128128

129129
pinctrl-names = "default";
130130
pinctrl-0 = <&muic_int_default>;
131+
132+
usb_con: connector {
133+
compatible = "usb-b-connector";
134+
label = "micro-USB";
135+
type = "micro";
136+
};
131137
};
132138
};
133139

‎arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323

2424
pinctrl-names = "default";
2525
pinctrl-0 = <&muic_int_default>;
26+
27+
usb_con: connector {
28+
compatible = "usb-b-connector";
29+
label = "micro-USB";
30+
type = "micro";
31+
};
2632
};
2733
};
2834

0 commit comments

Comments
 (0)