Skip to content

Commit d584cdc

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-for-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt
Qualcomm ARM64 DTS additional patches for v5.16 The RPM and RPMh sleep stats are introduced on a number of platforms, to aid the enablement of entering low power mode. The MSM8916 support receives some polishing touches, followed by introduction of the necessary pieces to use the DeviceTree on 32-bit variants of the MSM8916 platform, in particular to boot the secondary CPUs. Based on this support for the Samsung Galaxy S4 Mini Value Edition is introduced. The Asus Zenfone 2 Laser gained touchscreen, sensors and sdcard support. MSM8996 got support for the its crypto hardware and the Xiaomi Mi 5 gained a description of its LCD panel. The Trogdor device on SC7180 gained support for a second source eDP brigde, while SC7280 gains PCIe support and the newly introduced Herobrine device. Both MSM8916 and SDM845 has their standalong SMEM node dropped, in favour of the newly introduced support for specifying the compatible directly on the reserved-memory node. The SM7225 platform is introduced, as a derrivative of SM6350, initial support for the PM6350 PMIC and based on this the Fairphone 4 is introduced. The RB3 and RB5 devices gains msm-id and board-id, to allow the two DTBs to be baked into a single boot.img that can be booted on both devices. As the GDSC driver has been extended to properly describe the relationship between MMCX and MDSS_GDSC, the now deprecated mmcx regulator is removed from SM8250. SM8350 gained CPU topology, idle-states and fastrpc support. FastRPC was also added for SM8150 and the SA8155p ADP got a couple of remoteprocs enabled. Additionally a number of DT validation issues was corrected across the various platforms and devices. * tag 'qcom-arm64-for-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (77 commits) Revert "arm64: dts: qcom: msm8916-asus-z00l: Add sensors" arm64: dts: qcom: ipq6018: Remove unused 'iface_clk' property from dma-controller node arm64: dts: qcom: ipq6018: Remove unused 'qcom,config-pipe-trust-reg' property arm64: dts: qcom: sm8350: Add CPU topology and idle-states arm64: dts: qcom: Drop unneeded extra device-specific includes arm64: dts: qcom: msm8916: Drop standalone smem node arm64: dts: qcom: Fix node name of rpm-msg-ram device nodes arm64: dts: qcom: msm8916-asus-z00l: Add sensors arm64: dts: qcom: msm8916-asus-z00l: Add SDCard arm64: dts: qcom: msm8916-asus-z00l: Add touchscreen arm64: dts: qcom: sdm845-oneplus: remove devinfo-size from ramoops node arm64: dts: qcom: sdm845: Fix Qualcomm crypto engine bus clock arm64: dts: qcom: msm8996: Add device tree entries to support crypto engine arm64: dts: qcom: msm8996: move clock-frequency from PN547 NFC to I2C bus arm64: dts: qcom: msm8916-asus-z00l: Add sensors arm64: dts: qcom: sdm630: Add disabled Venus support arm64: dts: qcom: pm660l: Remove board-specific WLED configuration arm64: dts: qcom: Move WLED num-strings from pmi8994 to sony-xperia-tone arm64: dts: qcom: pmi8994: Remove hardcoded linear WLED enabled-strings arm64: dts: qcom: pmi8994: Fix "eternal"->"external" typo in WLED node ... Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 9271fcc + b34a82f commit d584cdc

File tree

121 files changed

+5812
-2256
lines changed

Some content is hidden

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

121 files changed

+5812
-2256
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ properties:
172172
- qcom,kryo468
173173
- qcom,kryo485
174174
- qcom,kryo560
175+
- qcom,kryo570
175176
- qcom,kryo685
176177
- qcom,scorpion
177178

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ description: |
4646
sdm845
4747
sdx55
4848
sdx65
49+
sm7225
4950
sm8150
5051
sm8250
5152
sm8350
@@ -234,6 +235,11 @@ properties:
234235
- qcom,sa8155p-adp
235236
- const: qcom,sa8155p
236237

238+
- items:
239+
- enum:
240+
- fairphone,fp4
241+
- const: qcom,sm7225
242+
237243
- items:
238244
- enum:
239245
- qcom,sm8150-mtp

‎arch/arm/boot/dts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
975975
qcom-ipq8064-rb3011.dtb \
976976
qcom-msm8226-samsung-s3ve3g.dtb \
977977
qcom-msm8660-surf.dtb \
978+
qcom-msm8916-samsung-serranove.dtb \
978979
qcom-msm8960-cdp.dtb \
979980
qcom-msm8974-fairphone-fp2.dtb \
980981
qcom-msm8974-lge-nexus5-hammerhead.dtb \

‎arch/arm/boot/dts/qcom-msm8916-samsung-serranove.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
#include "arm64/qcom/msm8916-samsung-serranove.dts"
3+
#include "qcom-msm8916-smp.dtsi"

‎arch/arm/boot/dts/qcom-msm8916-smp.dtsi

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
3+
/ {
4+
cpus {
5+
cpu@0 {
6+
enable-method = "qcom,msm8916-smp";
7+
};
8+
cpu@1 {
9+
enable-method = "qcom,msm8916-smp";
10+
};
11+
cpu@2 {
12+
enable-method = "qcom,msm8916-smp";
13+
};
14+
cpu@3 {
15+
enable-method = "qcom,msm8916-smp";
16+
};
17+
18+
idle-states {
19+
/delete-property/ entry-method;
20+
};
21+
};
22+
23+
psci {
24+
status = "disabled";
25+
};
26+
};
27+
28+
&CPU_SLEEP_0 {
29+
compatible = "qcom,idle-state-spc";
30+
};
31+
32+
&cpu0_acc {
33+
status = "okay";
34+
};
35+
36+
&cpu0_saw {
37+
status = "okay";
38+
};
39+
40+
&cpu1_acc {
41+
status = "okay";
42+
};
43+
44+
&cpu1_saw {
45+
status = "okay";
46+
};
47+
48+
&cpu2_acc {
49+
status = "okay";
50+
};
51+
52+
&cpu2_saw {
53+
status = "okay";
54+
};
55+
56+
&cpu3_acc {
57+
status = "okay";
58+
};
59+
60+
&cpu3_saw {
61+
status = "okay";
62+
};

‎arch/arm/mach-qcom/Kconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ config ARCH_MSM8X60
2121
bool "Enable support for MSM8X60"
2222
select CLKSRC_QCOM
2323

24+
config ARCH_MSM8916
25+
bool "Enable support for MSM8916"
26+
select HAVE_ARM_ARCH_TIMER
27+
help
28+
Enable support for the Qualcomm Snapdragon 410 (MSM8916/APQ8016).
29+
30+
Note that ARM64 is the main supported architecture for MSM8916.
31+
The ARM32 option is intended for a few devices with signed firmware
32+
that does not allow booting ARM64 kernels.
33+
2434
config ARCH_MSM8960
2535
bool "Enable support for MSM8960"
2636
select CLKSRC_QCOM

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8910.dtb
1515
dtb-$(CONFIG_ARCH_QCOM) += msm8916-mtp.dtb
1616
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a3u-eur.dtb
1717
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a5u-eur.dtb
18+
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-serranove.dtb
1819
dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb
1920
dtb-$(CONFIG_ARCH_QCOM) += msm8992-bullhead-rev-101.dtb
2021
dtb-$(CONFIG_ARCH_QCOM) += msm8992-msft-lumia-octagon-talkman.dtb
@@ -74,6 +75,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r3.dtb
7475
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r3-lte.dtb
7576
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1.dtb
7677
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1-lte.dtb
78+
dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine.dtb
7779
dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp.dtb
7880
dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp2.dtb
7981
dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-ganges-kirin.dtb
@@ -93,6 +95,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm845-xiaomi-beryllium.dtb
9395
dtb-$(CONFIG_ARCH_QCOM) += sdm850-lenovo-yoga-c630.dtb
9496
dtb-$(CONFIG_ARCH_QCOM) += sm6125-sony-xperia-seine-pdx201.dtb
9597
dtb-$(CONFIG_ARCH_QCOM) += sm6350-sony-xperia-lena-pdx213.dtb
98+
dtb-$(CONFIG_ARCH_QCOM) += sm7225-fairphone-fp4.dtb
9699
dtb-$(CONFIG_ARCH_QCOM) += sm8150-hdk.dtb
97100
dtb-$(CONFIG_ARCH_QCOM) += sm8150-microsoft-surface-duo.dtb
98101
dtb-$(CONFIG_ARCH_QCOM) += sm8150-mtp.dtb

0 commit comments

Comments
 (0)