public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qualcomm Arm32 DeviceTree updates for v6.17

Browse source 
Add aliases for MMC controllers on MSM8974, enable USB charging on the
 Sony Xperia Rhine platform and add new DeviceTree for the Sony Xperia Z
 Ultra device.
 
 Tidy up interrupts specifiers on MSM8960, by using macro constants.
 -----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCAAzFiEEBd4DzF816k8JZtUlCx85Pw2ZrcUFAmh1umoVHGFuZGVyc3Nv
 bkBrZXJuZWwub3JnAAoJEAsfOT8Nma3FFzAP/1Wk+B7CYhg17QefF23i5nMJrhdw
 PC8KOnMKaHOfEkbuD3hTdvDL2u0HZpQG8x6GSslC4Cq1FY3e3fH3hcnJjdGP1jBI
 /W3FNs55zUiKvQBqtmWkb+iYn6o/LGt5wE1g5zLBcAUS0S7WaBptfQSwjXm7rCdA
 KcuLqdjSm/iUqJUKCjPXu3iXq5yXK0mix2hSWLiZRvlklvpT2GxVIg9YyhUFuiBd
 JZKjNXu9rZMixjkpRmiFIYJWQeuZ/RgOs5pabbgEGExPlwog9GDlMFcABBDWUIuG
 bwMd6dRX7PpA0VeAnqAGMQEF4TEgTAeFiaQa3DoOz+TM01hyauLc2zf4uprnnKvw
 OhCXh2hXcAG0FkWu6oGGN0QRVAdPqWt0Rkl08E/cl6u+wMAQoyljc+6JoXvlz00l
 iKIHdAsTzHQrIia/qcJzUzS8WSMptWxHh80zMCJlwqAh9Zwb1SlwgBweEgUAu4HA
 2ganAjHMJ4slSR1c3lXrwm9T/nceTtcTThC4zfdOtnuKN++EX9aq+qEGSIdNydFH
 5uvrtutvFfu624AWOKR7qRrTx///wuZ+QO8aoqQIk2yUWC/CG//lHT2SeL1HPsR+
 WaGrIr6lUlwWG9Mx+JnBFM2RzNO5uy5LmL9lgmEBV6LE67PWnKsWaoGfEAUYmnyO
 1i+yH7/JTtUXP8E6
 =sBCM
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmh/6pMACgkQmmx57+YA
 GNlgYg//cxY2AUCmcmoleHRTRbj7wvqwoqbourbl6NgaddqTDCGltH9IGnxxrLDM
 jS9+gjR8iMW6xrONiMyBlNekwrFI16WKiC1iEWqw9InGbjM5Ad1VJXHEdv6aOmbh
 DcQ1xzDXAwmXwPbhxbVJHL2j8BGE6zdXhQ3aG6OHdIN6qBWvol/iHBxEgAfc6zva
 vq/D5jKZ377hZa35Se92dUqVV1jW5a873ppMau3VNuykrRsZ48ltRvV4xWKOVgMG
 LZyiQ5KUqfbKw0ZEeXbBvKRwuFVacAUnqNnSPkTqGBoQRHzVTVg/UJx/hOeCKuSk
 pzLWYLc2bJ12txQQQjDr5/ww7z8FnM16CeGp2U7R2xtiDqk44+qU+0FFIEIBrGGe
 Rl3gJje9pWzXe4z7HS5Qa3j0IaGePzE5pgtkbn/scka0Z2h50noKbq0uVirXLcYz
 QPY+QLQnx1mb9nFTDu6g2w6+VxCb3myn0zOOeDQ9x8GyoG2olzwxyn3z5CogUWLC
 p8QfU9x8e4yTHsvfpiSb1eHWtxN8pPCcC/I+NY6n4GF98JT2/lI6/fnSOHuVxw2q
 n5OV0x6lJSp5rnY18we8IvUg5JW9RXWAomkyrR3OuN4ady9Awv4mXGwCGnXOruJ2
 rupqtHayQ/Sc8zhDhcN2FpLvhJkJ9vL3EUUnUTKZ8oWnWNwJoHk=
 =0u7U
 -----END PGP SIGNATURE-----

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

Qualcomm Arm32 DeviceTree updates for v6.17

Add aliases for MMC controllers on MSM8974, enable USB charging on the
Sony Xperia Rhine platform and add new DeviceTree for the Sony Xperia Z
Ultra device.

Tidy up interrupts specifiers on MSM8960, by using macro constants.

* tag 'qcom-arm32-for-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: dts: qcom: msm8974-sony-xperia-rhine: Add alias for mmc0 & mmc1
  ARM: dts: qcom: msm8974-hammerhead: Add alias for mmc0
  ARM: dts: qcom: msm8974-oneplus-bacon: Add alias for mmc0
  ARM: dts: qcom: Add initial support for Sony Xperia Z Ultra (togari)
  dt-bindings: arm: qcom: Add Sony Xperia Z Ultra (togari)
  ARM: dts: qcom: msm8974-sony-xperia-rhine: Move camera buttons to amami & honami
  ARM: dts: qcom: msm8974-sony-xperia-rhine: Enable USB charging
  ARM: dts: qcom: msm8960: use macros for interrupts
  ARM: dts: qcom: Align wifi node name with bindings

Link: https://lore.kernel.org/r/20250715021838.14751-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-07-22 21:46:27 +02:00
commit 7824d9e7f9
9 changed files with 63 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Documentation/devicetree/bindings/arm/qcom.yaml
View file

@ -209,6 +209,7 @@ properties:
- samsung,hlte
- sony,xperia-amami
- sony,xperia-honami
- sony,xperia-togari
- const: qcom,msm8974
- items:

1
arch/arm/boot/dts/qcom/Makefile
View file

@ -47,6 +47,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-msm8974-samsung-hlte.dtb \
qcom-msm8974-sony-xperia-rhine-amami.dtb \
qcom-msm8974-sony-xperia-rhine-honami.dtb \
qcom-msm8974-sony-xperia-rhine-togari.dtb \
qcom-msm8974pro-fairphone-fp2.dtb \
qcom-msm8974pro-htc-m8.dtb \
qcom-msm8974pro-oneplus-bacon.dtb \

10
arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
View file

@ -18,7 +18,7 @@
cpus {
#address-cells = <1>;
#size-cells = <0>;
interrupts = <GIC_PPI 14 0x304>;
interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
cpu@0 {
compatible = "qcom,krait";
@ -96,7 +96,7 @@
cpu-pmu {
compatible = "qcom,krait-pmu";
interrupts = <GIC_PPI 10 0x304>;
interrupts = <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
qcom,no-pc-write;
};
@ -149,9 +149,9 @@
timer@200a000 {
compatible = "qcom,kpss-wdt-msm8960", "qcom,kpss-timer",
"qcom,msm-timer";
interrupts = <GIC_PPI 1 0x301>,
<GIC_PPI 2 0x301>,
<GIC_PPI 3 0x301>;
interrupts = <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>,
<GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>,
<GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>;
reg = <0x0200a000 0x100>;
clock-frequency = <27000000>;
clocks = <&sleep_clk>;

3
arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
View file

@ -12,6 +12,7 @@
chassis-type = "handset";
aliases {
mmc0 = &sdhc_1;
serial0 = &blsp1_uart1;
serial1 = &blsp2_uart4;
};
@ -598,7 +599,7 @@
pinctrl-0 = <&sdc2_on>;
pinctrl-1 = <&sdc2_off>;
bcrmf@1 {
wifi@1 {
compatible = "brcm,bcm4339-fmac", "brcm,bcm4329-fmac";
reg = <1>;

16
arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine-amami.dts
View file

@ -5,6 +5,22 @@
model = "Sony Xperia Z1 Compact";
compatible = "sony,xperia-amami", "qcom,msm8974";
chassis-type = "handset";
gpio-keys {
key-camera-snapshot {
label = "camera_snapshot";
gpios = <&pm8941_gpios 3 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
linux,code = <KEY_CAMERA>;
};
key-camera-focus {
label = "camera_focus";
gpios = <&pm8941_gpios 4 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
linux,code = <KEY_CAMERA_FOCUS>;
};
};
};
&smbb {

16
arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine-honami.dts
View file

@ -5,4 +5,20 @@
model = "Sony Xperia Z1";
compatible = "sony,xperia-honami", "qcom,msm8974";
chassis-type = "handset";
gpio-keys {
key-camera-snapshot {
label = "camera_snapshot";
gpios = <&pm8941_gpios 3 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
linux,code = <KEY_CAMERA>;
};
key-camera-focus {
label = "camera_focus";
gpios = <&pm8941_gpios 4 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
linux,code = <KEY_CAMERA_FOCUS>;
};
};
};

16
arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine-togari.dts Normal file
View file

@ -0,0 +1,16 @@
// SPDX-License-Identifier: GPL-2.0
#include "qcom-msm8974-sony-xperia-rhine.dtsi"
/* Togari uses a different touchscreen compared to other rhine devices */
/delete-node/ &touchscreen;
/ {
model = "Sony Xperia Z Ultra";
compatible = "sony,xperia-togari", "qcom,msm8974";
chassis-type = "handset";
};
&pm8941_l23 {
regulator-min-microvolt = <2600000>;
regulator-max-microvolt = <2600000>;
};

20
arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
View file

@ -8,6 +8,8 @@
/ {
aliases {
mmc0 = &sdhc_1;
mmc1 = &sdhc_2;
serial0 = &blsp1_uart2;
};
@ -28,20 +30,6 @@
linux,code = <KEY_VOLUMEDOWN>;
};
key-camera-snapshot {
label = "camera_snapshot";
gpios = <&pm8941_gpios 3 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
linux,code = <KEY_CAMERA>;
};
key-camera-focus {
label = "camera_focus";
gpios = <&pm8941_gpios 4 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
linux,code = <KEY_CAMERA_FOCUS>;
};
key-volume-up {
label = "volume_up";
gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>;
@ -98,7 +86,7 @@
status = "okay";
clock-frequency = <355000>;
synaptics@2c {
touchscreen: synaptics@2c {
compatible = "syna,rmi4-i2c";
reg = <0x2c>;
@ -446,6 +434,8 @@
};
&smbb {
usb-charge-current-limit = <1800000>;
qcom,fast-charge-safe-current = <1500000>;
qcom,fast-charge-current-limit = <1500000>;
qcom,dc-current-limit = <1800000>;

1
arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
View file

@ -13,6 +13,7 @@
qcom,board-id = <8 0>;
aliases {
mmc0 = &sdhc_1;
serial0 = &blsp1_uart2;
};