Skip to content

Commit 7723866

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-for-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm Arm64 DeviceTree updates for v6.17 79b896e arm64: dts: qcom: msm8976-longcheer-l9360: Add initial device tree 6516961 arm64: dts: qcom: Add support for X1-based Asus Zenbook A14 The DB410c D3 camera mezzanine is converted to an overlay. On MSM8976 SDC2 pinctrl definitions are introduced and BLSP DMA controller is marked to be managed by another entity. Add camera subsystem on the QCM2290 platform. Add and enable remoteproc and related devices on QCS615. Add and enable Video encoder/decoder on QCS8300 and SA8775P. Also on SA8775P add CPU OPP tables for scaling DDR/L3 bandwidth based on CPU frequency, add L3 interconnect definitions, DSI and video encoder/decoder support. Enable the SLPI remoteproc on SDM850-based Lenovo Yoga C630. On SM6350, add the video clock controller, APR and some audio related services. Describe the camera subsystem on SM8550 and add Iris video encoder/decoder node for SM8650. On SM8750 introduce UFS and Soundwire support, enable these and describe the sound hardware on MTP and QRD. Add camera clock controller on SC8180X. On X Elite, for the Dell XPS13, add WiFi and Bluetooth pwrseq and enable the fingerprint sensor. For HP Omnibook X14 USB1 SS1 SBU mux and do some misc cleanup. Replace the thermal zones inherited from X Elite with X Plus-specific ones. Add missing interrupts and clean up unrelated clocks for PCIe controllers across a variety of platforms. * tag 'qcom-arm64-for-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (67 commits) arm64: dts: qcom: sm8150: Drop unrelated clocks from PCIe hosts arm64: dts: qcom: sc8180x: Drop unrelated clocks from PCIe hosts arm64: dts: qcom: x1-asus-zenbook: support sound arm64: dts: qcom: x1-asus-zenbook: fixup GPU nodes arm64: dts: qcom: sm6115: add debug UART pins arm64: dts: qcom: sm8650: add iris DT node arm64: dts: qcom: msm8976-longcheer-l9360: Add initial device tree arm64: dts: qcom: msm8976: Add sdc2 GPIOs dt-bindings: arm: qcom: Add MSM8976 BQ Aquaris X5 Plus arm64: dts: qcom: msm8976: Make blsp_dma controlled-remotely arm64: dts: qcom: sa8775p: Correct the interrupt for remoteproc arm64: dts: qcom: sm8550: Add support for camss arm64: dts: qcom: qcs615: disable the CTI device of the camera block arm64: dts: qcom: qcs615-ride: enable remoteprocs arm64: dts: qcom: qcs615: add ADSP and CDSP nodes arm64: dts: qcom: qcs615: Add IMEM and PIL info region arm64: dts: qcom: qcs615: Add mproc node for SEMP2P arm64: dts: qcom: Add support for X1-based Asus Zenbook A14 arm64: dts: qcom: sc7180: Expand IMEM region arm64: dts: qcom: sdm845: Expand IMEM region ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 1037b30 + 7de0d60 commit 7723866

Some content is hidden

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

47 files changed

+5758
-165
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,11 @@ properties:
231231
- const: qcom,msm8974pro
232232
- const: qcom,msm8974
233233

234+
- items:
235+
- enum:
236+
- longcheer,l9360
237+
- const: qcom,msm8976
238+
234239
- items:
235240
- enum:
236241
- acer,a1-724

‎Documentation/devicetree/bindings/clock/qcom,sc8180x-camcc.yaml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/qcom,sc8180x-camcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Camera Clock & Reset Controller on SC8180X
8+
9+
maintainers:
10+
- Satya Priya Kakitapalli <[email protected]>
11+
12+
description: |
13+
Qualcomm camera clock control module provides the clocks, resets and
14+
power domains on SC8180X.
15+
16+
See also: include/dt-bindings/clock/qcom,sc8180x-camcc.h
17+
18+
properties:
19+
compatible:
20+
const: qcom,sc8180x-camcc
21+
22+
clocks:
23+
items:
24+
- description: Camera AHB clock from GCC
25+
- description: Board XO source
26+
- description: Sleep clock source
27+
28+
power-domains:
29+
maxItems: 1
30+
description:
31+
A phandle and PM domain specifier for the MMCX power domain.
32+
33+
required-opps:
34+
maxItems: 1
35+
description:
36+
A phandle to an OPP node describing required MMCX performance point.
37+
38+
required:
39+
- compatible
40+
- clocks
41+
- power-domains
42+
- required-opps
43+
44+
allOf:
45+
- $ref: qcom,gcc.yaml#
46+
47+
unevaluatedProperties: false
48+
49+
examples:
50+
- |
51+
#include <dt-bindings/clock/qcom,gcc-sc8180x.h>
52+
#include <dt-bindings/clock/qcom,rpmh.h>
53+
#include <dt-bindings/power/qcom-rpmpd.h>
54+
clock-controller@ad00000 {
55+
compatible = "qcom,sc8180x-camcc";
56+
reg = <0x0ad00000 0x20000>;
57+
clocks = <&gcc GCC_CAMERA_AHB_CLK>,
58+
<&rpmhcc RPMH_CXO_CLK>,
59+
<&sleep_clk>;
60+
power-domains = <&rpmhpd SC8180X_MMCX>;
61+
required-opps = <&rpmhpd_opp_low_svs>;
62+
63+
#clock-cells = <1>;
64+
#reset-cells = <1>;
65+
#power-domain-cells = <1>;
66+
};
67+
...

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# SPDX-License-Identifier: GPL-2.0
22
dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb
33

4-
apq8016-sbc-usb-host-dtbs := apq8016-sbc.dtb apq8016-sbc-usb-host.dtbo
4+
apq8016-sbc-d3-camera-mezzanine-dtbs := apq8016-sbc.dtb apq8016-sbc-d3-camera-mezzanine.dtbo
5+
apq8016-sbc-usb-host-dtbs := apq8016-sbc.dtb apq8016-sbc-usb-host.dtbo
56

67
dtb-$(CONFIG_ARCH_QCOM) += sar2130p-qar2130p.dtb
78

8-
dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-usb-host.dtb
99
dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-d3-camera-mezzanine.dtb
10+
dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-usb-host.dtb
1011
dtb-$(CONFIG_ARCH_QCOM) += apq8016-schneider-hmibsc.dtb
1112
dtb-$(CONFIG_ARCH_QCOM) += apq8039-t2.dtb
1213
dtb-$(CONFIG_ARCH_QCOM) += apq8094-sony-xperia-kitakami-karin_windy.dtb
@@ -77,6 +78,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-tissot.dtb
7778
dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-vince.dtb
7879
dtb-$(CONFIG_ARCH_QCOM) += msm8956-sony-xperia-loire-kugo.dtb
7980
dtb-$(CONFIG_ARCH_QCOM) += msm8956-sony-xperia-loire-suzu.dtb
81+
dtb-$(CONFIG_ARCH_QCOM) += msm8976-longcheer-l9360.dtb
8082
dtb-$(CONFIG_ARCH_QCOM) += msm8992-lg-bullhead-rev-10.dtb
8183
dtb-$(CONFIG_ARCH_QCOM) += msm8992-lg-bullhead-rev-101.dtb
8284
dtb-$(CONFIG_ARCH_QCOM) += msm8992-lg-h815.dtb
@@ -309,6 +311,8 @@ x1e78100-lenovo-thinkpad-t14s-oled-el2-dtbs := x1e78100-lenovo-thinkpad-t14s-ole
309311
dtb-$(CONFIG_ARCH_QCOM) += x1e78100-lenovo-thinkpad-t14s-oled.dtb x1e78100-lenovo-thinkpad-t14s-oled-el2.dtb
310312
x1e80100-asus-vivobook-s15-el2-dtbs := x1e80100-asus-vivobook-s15.dtb x1-el2.dtbo
311313
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-asus-vivobook-s15.dtb x1e80100-asus-vivobook-s15-el2.dtb
314+
x1e80100-asus-zenbook-a14-el2-dtbs := x1e80100-asus-zenbook-a14.dtb x1-el2.dtbo
315+
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-asus-zenbook-a14.dtb x1e80100-asus-zenbook-a14-el2.dtb
312316
x1e80100-crd-el2-dtbs := x1e80100-crd.dtb x1-el2.dtbo
313317
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-crd.dtb x1e80100-crd-el2.dtb
314318
x1e80100-dell-xps13-9345-el2-dtbs := x1e80100-dell-xps13-9345.dtb x1-el2.dtbo
@@ -325,5 +329,7 @@ x1e80100-microsoft-romulus15-el2-dtbs := x1e80100-microsoft-romulus15.dtb x1-el2
325329
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-microsoft-romulus15.dtb x1e80100-microsoft-romulus15-el2.dtb
326330
x1e80100-qcp-el2-dtbs := x1e80100-qcp.dtb x1-el2.dtbo
327331
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-qcp.dtb x1e80100-qcp-el2.dtb
332+
x1p42100-asus-zenbook-a14-el2-dtbs := x1p42100-asus-zenbook-a14.dtb x1-el2.dtbo
333+
dtb-$(CONFIG_ARCH_QCOM) += x1p42100-asus-zenbook-a14.dtb x1p42100-asus-zenbook-a14-el2.dtb
328334
x1p42100-crd-el2-dtbs := x1p42100-crd.dtb x1-el2.dtbo
329335
dtb-$(CONFIG_ARCH_QCOM) += x1p42100-crd.dtb x1p42100-crd-el2.dtb

‎arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts renamed to ‎arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dtso

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
*/
66

77
/dts-v1/;
8+
/plugin/;
89

9-
#include "apq8016-sbc.dts"
10+
#include <dt-bindings/clock/qcom,gcc-msm8916.h>
11+
#include <dt-bindings/gpio/gpio.h>
1012

11-
/ {
13+
&{/} {
1214
camera_vdddo_1v8: regulator-camera-vdddo {
1315
compatible = "regulator-fixed";
1416
regulator-name = "camera_vdddo";
@@ -38,6 +40,9 @@
3840
status = "okay";
3941

4042
ports {
43+
#address-cells = <1>;
44+
#size-cells = <0>;
45+
4146
port@0 {
4247
reg = <0>;
4348
csiphy0_ep: endpoint {
@@ -53,6 +58,9 @@
5358
};
5459

5560
&cci_i2c0 {
61+
#address-cells = <1>;
62+
#size-cells = <0>;
63+
5664
camera@3b {
5765
compatible = "ovti,ov5640";
5866
reg = <0x3b>;

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,8 +885,24 @@
885885
ranges = <0x81000000 0x0 0x00000000 0x0 0x20200000 0x0 0x10000>,
886886
<0x82000000 0x0 0x20220000 0x0 0x20220000 0x0 0xfde0000>;
887887

888-
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
889-
interrupt-names = "msi";
888+
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>,
889+
<GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
890+
<GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
891+
<GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
892+
<GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
893+
<GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>,
894+
<GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
895+
<GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
896+
<GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
897+
interrupt-names = "msi0",
898+
"msi1",
899+
"msi2",
900+
"msi3",
901+
"msi4",
902+
"msi5",
903+
"msi6",
904+
"msi7",
905+
"global";
890906

891907
#interrupt-cells = <1>;
892908
interrupt-map-mask = <0 0 0 0x7>;

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

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,24 @@
847847
ranges = <0x81000000 0x0 0x00000000 0x10200000 0x0 0x10000>, /* I/O */
848848
<0x82000000 0x0 0x10220000 0x10220000 0x0 0xfde0000>; /* MEM */
849849

850-
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
851-
interrupt-names = "msi";
850+
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,
851+
<GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
852+
<GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>,
853+
<GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
854+
<GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>,
855+
<GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,
856+
<GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>,
857+
<GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>,
858+
<GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
859+
interrupt-names = "msi0",
860+
"msi1",
861+
"msi2",
862+
"msi3",
863+
"msi4",
864+
"msi5",
865+
"msi6",
866+
"msi7",
867+
"global";
852868
#interrupt-cells = <1>;
853869
interrupt-map-mask = <0 0 0 0x7>;
854870
interrupt-map = <0 0 0 1 &intc 0 0 142
@@ -919,8 +935,24 @@
919935
ranges = <0x81000000 0x0 0x00000000 0x20200000 0x0 0x10000>, /* I/O */
920936
<0x82000000 0x0 0x20220000 0x20220000 0x0 0xfde0000>; /* MEM */
921937

922-
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
923-
interrupt-names = "msi";
938+
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>,
939+
<GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
940+
<GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
941+
<GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
942+
<GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
943+
<GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>,
944+
<GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
945+
<GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
946+
<GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
947+
interrupt-names = "msi0",
948+
"msi1",
949+
"msi2",
950+
"msi3",
951+
"msi4",
952+
"msi5",
953+
"msi6",
954+
"msi7",
955+
"global";
924956
#interrupt-cells = <1>;
925957
interrupt-map-mask = <0 0 0 0x7>;
926958
interrupt-map = <0 0 0 1 &intc 0 0 75

0 commit comments

Comments
 (0)