Skip to content

Commit 7dbdc16

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt
More Qualcomm ARM64 DT updates for 6.3 The new Qualcomm QDU1000 and QRU1000 platforms, and the IDP device on these are introduced. New support for a couple of USB modem sticks from THWC are introduced, so is support for Xiaomi Mi Pad 5 Pro and the Pro SKU of the Herobrine device. The Core Bus Fabric (CBF) is introduced on MSM8996. Interconnect paths for UFS are also described. A few fixes related to the power-grid of herobrine, on SC7280, are introduced. QFPROM is introduced on IPQ8074 and Interconnect providers are added for SDM670. On SDM845 the duplicated wcd9340 audio coded description is moved from devices to a common file, audio devices are added to the OnePlus 6 and 6T. On SM6115 debug UART, SMP2P, watchdog nodes are introduced, and the platform is switched to use #address/size-cells of 2, in line with most other platforms. Camera control interface and clock controllers are added for SM6350, and the CCI interface is enabled on the Fairphone FP4. On SM8350 the interconnect reference of SDHCI controller is corrected, DSI1 PHY clocks are properly described as sources for the Display clock controller and DSI1 is wired up to the display controller. The firmware paths are corrected for the Sony Xperia Nagara platform. The GPR bus, audio servic3es and LPASS pinctrl nodes are added for the SM8550 platform. Additionally a few small typos/errors are corrected. gpio-ranges are corrected across MSM8953, SM6115 and SC8280XP and a range of DT validation issues are corrected. * tag 'qcom-arm64-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (81 commits) arm64: dts: qcom: sc7280: Power herobrine's 3.3 eDP/TS rail more properly arm64: dts: qcom: pmk8550: fix PON compatible arm64: dts: qcom: sm8550: fix DSI controller compatible arm64: dts: qcom: sc7280: Hook up the touchscreen IO rail on evoker arm64: dts: qcom: sc7280: Hook up the touchscreen IO rail on villager arm64: dts: qcom: sc7280: Add 3ms ramp to herobrine's pp3300_left_in_mlb arm64: dts: qcom: sc7280: On QCard, regulator L3C should be 1.8V arm64: dts: qcom: sc8280xp: correct LPASS GPIO gpio-ranges arm64: dts: qcom: msm8992-lg-bullhead: Enable regulators arm64: dts: qcom: sm6115: correct TLMM gpio-ranges arm64: dts: qcom: msm8953: correct TLMM gpio-ranges arm64: dts: qcom: msm8992-lg-bullhead: Correct memory overlaps with the SMEM and MPSS memory regions arm64: dts: qcom: sm8350-hdk: correct LT9611 pin function arm64: dts: qcom: sm8350-hdk: align pin config node names with bindings arm64: dts: qcom: sm6350: Use specific qmpphy compatible arm64: dts: qcom: sm6115: Add smp2p nodes arm64: dts: qcom: sm7225-fairphone-fp4: Enable CCI busses arm64: dts: qcom: sm6350: Add CCI nodes arm64: dts: qcom: sm6350: Add camera clock controller dt-bindings: clock: add QCOM SM6350 camera clock bindings ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents fc54e13 + f069ede commit 7dbdc16

File tree

80 files changed

+6086
-461
lines changed

Some content is hidden

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

80 files changed

+6086
-461
lines changed

‎Documentation/devicetree/bindings/clock/qcom,qdu1000-gcc.yaml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
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,qdu1000-gcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Global Clock & Reset Controller for QDU1000 and QRU1000
8+
9+
maintainers:
10+
- Melody Olvera <[email protected]>
11+
12+
description: |
13+
Qualcomm global clock control module which supports the clocks, resets and
14+
power domains on QDU1000 and QRU1000
15+
16+
See also:: include/dt-bindings/clock/qcom,qdu1000-gcc.h
17+
18+
properties:
19+
compatible:
20+
const: qcom,qdu1000-gcc
21+
22+
clocks:
23+
items:
24+
- description: Board XO source
25+
- description: Sleep clock source
26+
- description: PCIE 0 Pipe clock source
27+
- description: PCIE 0 Phy Auxiliary clock source
28+
- description: USB3 Phy wrapper pipe clock source
29+
30+
required:
31+
- compatible
32+
- clocks
33+
34+
allOf:
35+
- $ref: qcom,gcc.yaml#
36+
37+
unevaluatedProperties: false
38+
39+
examples:
40+
- |
41+
#include <dt-bindings/clock/qcom,rpmh.h>
42+
clock-controller@100000 {
43+
compatible = "qcom,qdu1000-gcc";
44+
reg = <0x00100000 0x001f4200>;
45+
clocks = <&rpmhcc RPMH_CXO_CLK>, <&sleep_clk>,
46+
<&pcie_0_pipe_clk>, <&pcie_0_phy_aux_clk>,
47+
<&usb3_phy_wrapper_pipe_clk>;
48+
#clock-cells = <1>;
49+
#reset-cells = <1>;
50+
#power-domain-cells = <1>;
51+
};

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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,sm6350-camcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Camera Clock & Reset Controller on SM6350
8+
9+
maintainers:
10+
- Konrad Dybcio <[email protected]>
11+
12+
description: |
13+
Qualcomm camera clock control module provides the clocks, resets and power
14+
domains on SM6350.
15+
16+
See also:: include/dt-bindings/clock/qcom,sm6350-camcc.h
17+
18+
properties:
19+
compatible:
20+
const: qcom,sm6350-camcc
21+
22+
clocks:
23+
items:
24+
- description: Board XO source
25+
26+
reg:
27+
maxItems: 1
28+
29+
required:
30+
- compatible
31+
- clocks
32+
33+
allOf:
34+
- $ref: qcom,gcc.yaml#
35+
36+
unevaluatedProperties: false
37+
38+
examples:
39+
- |
40+
#include <dt-bindings/clock/qcom,rpmh.h>
41+
clock-controller@ad00000 {
42+
compatible = "qcom,sm6350-camcc";
43+
reg = <0x0ad00000 0x16000>;
44+
clocks = <&rpmhcc RPMH_CXO_CLK>;
45+
#clock-cells = <1>;
46+
#reset-cells = <1>;
47+
#power-domain-cells = <1>;
48+
};
49+
...

‎Documentation/devicetree/bindings/interconnect/qcom,qdu1000-rpmh.yaml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/interconnect/qcom,qdu1000-rpmh.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm RPMh Network-On-Chip Interconnect on QDU1000
8+
9+
maintainers:
10+
- Georgi Djakov <[email protected]>
11+
- Odelu Kukatla <[email protected]>
12+
13+
description: |
14+
RPMh interconnect providers support system bandwidth requirements through
15+
RPMh hardware accelerators known as Bus Clock Manager (BCM). The provider is
16+
able to communicate with the BCM through the Resource State Coordinator (RSC)
17+
associated with each execution environment. Provider nodes must point to at
18+
least one RPMh device child node pertaining to their RSC and each provider
19+
can map to multiple RPMh resources.
20+
21+
properties:
22+
compatible:
23+
enum:
24+
- qcom,qdu1000-clk-virt
25+
- qcom,qdu1000-gem-noc
26+
- qcom,qdu1000-mc-virt
27+
- qcom,qdu1000-system-noc
28+
29+
'#interconnect-cells': true
30+
31+
reg:
32+
maxItems: 1
33+
34+
allOf:
35+
- $ref: qcom,rpmh-common.yaml#
36+
- if:
37+
properties:
38+
compatible:
39+
contains:
40+
enum:
41+
- qcom,qdu1000-clk-virt
42+
- qcom,qdu1000-mc-virt
43+
then:
44+
properties:
45+
reg: false
46+
else:
47+
required:
48+
- reg
49+
50+
required:
51+
- compatible
52+
53+
unevaluatedProperties: false
54+
55+
examples:
56+
- |
57+
#include <dt-bindings/interconnect/qcom,qdu1000-rpmh.h>
58+
59+
system_noc: interconnect@1640000 {
60+
compatible = "qcom,qdu1000-system-noc";
61+
reg = <0x1640000 0x45080>;
62+
#interconnect-cells = <2>;
63+
qcom,bcm-voters = <&apps_bcm_voter>;
64+
};
65+
66+
clk_virt: interconnect-0 {
67+
compatible = "qcom,qdu1000-clk-virt";
68+
#interconnect-cells = <2>;
69+
qcom,bcm-voters = <&apps_bcm_voter>;
70+
};

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-gt58.dtb
2525
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j5.dtb
2626
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j5x.dtb
2727
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-serranove.dtb
28+
dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-uf896.dtb
29+
dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-ufi001c.dtb
2830
dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb
2931
dtb-$(CONFIG_ARCH_QCOM) += msm8953-motorola-potter.dtb
3032
dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-daisy.dtb
@@ -66,8 +68,10 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-poplar.dtb
6668
dtb-$(CONFIG_ARCH_QCOM) += msm8998-xiaomi-sagit.dtb
6769
dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb
6870
dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb
71+
dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb
6972
dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5.dtb
7073
dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5-vision-mezzanine.dtb
74+
dtb-$(CONFIG_ARCH_QCOM) += qru1000-idp.dtb
7175
dtb-$(CONFIG_ARCH_QCOM) += sa8155p-adp.dtb
7276
dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb
7377
dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb
@@ -123,6 +127,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dtb
123127
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1.dtb
124128
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1-lte.dtb
125129
dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-crd.dtb
130+
dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-crd-pro.dtb
126131
dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker.dtb
127132
dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker-lte.dtb
128133
dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-herobrine-r1.dtb
@@ -184,6 +189,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8250-hdk.dtb
184189
dtb-$(CONFIG_ARCH_QCOM) += sm8250-mtp.dtb
185190
dtb-$(CONFIG_ARCH_QCOM) += sm8250-sony-xperia-edo-pdx203.dtb
186191
dtb-$(CONFIG_ARCH_QCOM) += sm8250-sony-xperia-edo-pdx206.dtb
192+
dtb-$(CONFIG_ARCH_QCOM) += sm8250-xiaomi-elish.dtb
187193
dtb-$(CONFIG_ARCH_QCOM) += sm8350-hdk.dtb
188194
dtb-$(CONFIG_ARCH_QCOM) += sm8350-microsoft-surface-duo2.dtb
189195
dtb-$(CONFIG_ARCH_QCOM) += sm8350-mtp.dtb

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,13 @@
266266
status = "disabled";
267267
};
268268

269+
qfprom: efuse@a4000 {
270+
compatible = "qcom,ipq8074-qfprom", "qcom,qfprom";
271+
reg = <0x000a4000 0x2000>;
272+
#address-cells = <1>;
273+
#size-cells = <1>;
274+
};
275+
269276
prng: rng@e3000 {
270277
compatible = "qcom,prng-ee";
271278
reg = <0x000e3000 0x1000>;

‎arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
3+
/dts-v1/;
4+
5+
#include "msm8916-ufi.dtsi"
6+
7+
/ {
8+
model = "uf896 4G Modem Stick";
9+
compatible = "thwc,uf896", "qcom,msm8916";
10+
};
11+
12+
&button_restart {
13+
gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>;
14+
};
15+
16+
&led_r {
17+
gpios = <&msmgpio 82 GPIO_ACTIVE_HIGH>;
18+
};
19+
20+
&led_g {
21+
gpios = <&msmgpio 83 GPIO_ACTIVE_HIGH>;
22+
};
23+
24+
&led_b {
25+
gpios = <&msmgpio 81 GPIO_ACTIVE_HIGH>;
26+
};
27+
28+
&button_default {
29+
pins = "gpio35";
30+
bias-pull-up;
31+
};
32+
33+
&gpio_leds_default {
34+
pins = "gpio81", "gpio82", "gpio83";
35+
};
36+
37+
&sim_ctrl_default {
38+
pins = "gpio1", "gpio2";
39+
};

‎arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
3+
/dts-v1/;
4+
5+
#include "msm8916-ufi.dtsi"
6+
7+
/ {
8+
model = "ufi-001c/ufi-001b 4G Modem Stick";
9+
compatible = "thwc,ufi001c", "qcom,msm8916";
10+
};
11+
12+
&button_restart {
13+
gpios = <&msmgpio 37 GPIO_ACTIVE_HIGH>;
14+
};
15+
16+
&led_r {
17+
gpios = <&msmgpio 22 GPIO_ACTIVE_HIGH>;
18+
};
19+
20+
&led_g {
21+
gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>;
22+
};
23+
24+
&led_b {
25+
gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>;
26+
};
27+
28+
&button_default {
29+
pins = "gpio37";
30+
bias-pull-down;
31+
};
32+
33+
&gpio_leds_default {
34+
pins = "gpio20", "gpio21", "gpio22";
35+
};
36+
37+
&sim_ctrl_default {
38+
pins = "gpio1", "gpio2";
39+
};

0 commit comments

Comments
 (0)