Skip to content

Commit b3c6f1f

Browse files
committed
Merge tag 'qcom-arm32-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm ARM32 DeviceTree changes for v6.9 Support for the Samsung Galaxy Tab 4 10.1 LTE is added. On MSM8226 CPU, SAW and ACC nodes are introduced to enable SMP support. Watchdog definition is also added, and all nodes are sorted and cleaned up. rmtfs memory is defined on HTC One Mini 2, vibrator support is addedto LG G Watch R, touch keycodes are defined for Samsung Galaxy Tab 4. The Samsung Galaxy Tab 4 DeviceTree is refactored to allow more variants to be introduced easily. The SAW nodes across APQ8064, IPQ8064, MSM8960 and MSM8974 are updated based on recent work on the binding and driver. On IPQ8064 SAW nodes are cleaned up, and unused reset-names is dropped from DWC3. On MSM8960 GSBI3 and the I2C bus therein is introduced, in order to introduce touchscreen support on the Samsung Galaxy Express SGH-I437. gpio-keys are introduced on the same. On MSM8974 the QFPROM register size is corrected. The order of the clocks in the SDX65 DWC3 node is corrected to match the binding. For a variety of platforms interrupt-related constants are replaced with defined. The mach-qcom Kconfig options are cleaned up, to avoid unnecessary per-platform options. * tag 'qcom-arm32-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (40 commits) ARM: dts: qcom: samsung-matisse-common: Add UART ARM: dts: qcom: Add support for Samsung Galaxy Tab 4 10.1 LTE (SM-T535) ARM: dts: qcom: samsung-matisse-common: Add initial common device tree ARM: dts: qcom: ipq8064: drop 'regulator' property from SAW2 devices ARM: dts: qcom: ipq4019: drop 'regulator' property from SAW2 devices ARM: dts: qcom: msm8974: drop 'regulator' property from SAW2 device ARM: dts: qcom: apq8084: drop 'regulator' property from SAW2 device ARM: dts: qcom: msm8960: declare SAW2 regulators ARM: dts: qcom: apq8064: declare SAW2 regulators ARM: dts: qcom: ipq8064: rename SAW nodes to power-manager ARM: dts: qcom: ipq4019: rename SAW nodes to power-manager ARM: dts: qcom: msm8974: rename SAW nodes to power-manager ARM: dts: qcom: msm8960: rename SAW nodes to power-manager ARM: dts: qcom: apq8084: rename SAW nodes to power-manager ARM: dts: qcom: apq8064: rename SAW nodes to power-manager ARM: dts: qcom: ipq8064: use SoC-specific compatibles for SAW2 devices ARM: dts: qcom: ipq4019: use SoC-specific compatibles for SAW2 devices ARM: dts: qcom: msm8960: use SoC-specific compatibles for SAW2 devices ARM: dts: qcom: msm8974: use new compat string for L2 SAW2 unit ARM: dts: qcom: apq8084: use new compat string for L2 SAW2 unit ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 73022d5 + 450e178 commit b3c6f1f

22 files changed

+1307
-986
lines changed

arch/arm/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,7 @@ textofs-$(CONFIG_ARCH_REALTEK) := 0x00108000
158158
ifeq ($(CONFIG_ARCH_SA1100),y)
159159
textofs-$(CONFIG_SA1111) := 0x00208000
160160
endif
161-
textofs-$(CONFIG_ARCH_IPQ40XX) := 0x00208000
162-
textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000
163-
textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
161+
textofs-$(CONFIG_ARCH_QCOM_RESERVE_SMEM) := 0x00208000
164162
textofs-$(CONFIG_ARCH_MESON) := 0x00208000
165163
textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
166164

arch/arm/boot/dts/qcom/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
3636
qcom-msm8926-microsoft-superman-lte.dtb \
3737
qcom-msm8926-microsoft-tesla.dtb \
3838
qcom-msm8926-motorola-peregrine.dtb \
39+
qcom-msm8926-samsung-matisselte.dtb \
3940
qcom-msm8960-cdp.dtb \
4041
qcom-msm8960-samsung-expressatt.dtb \
4142
qcom-msm8974-lge-nexus5-hammerhead.dtb \

arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include "qcom-msm8226.dtsi"
99
#include "pm8226.dtsi"
10+
#include <dt-bindings/clock/qcom,mmcc-msm8974.h>
1011

1112
/delete-node/ &adsp_region;
1213

@@ -56,6 +57,29 @@
5657
pinctrl-names = "default";
5758
pinctrl-0 = <&wlan_regulator_default_state>;
5859
};
60+
61+
pwm_vibrator: pwm {
62+
compatible = "clk-pwm";
63+
clocks = <&mmcc CAMSS_GP0_CLK>;
64+
65+
pinctrl-0 = <&vibrator_clk_default_state>;
66+
pinctrl-names = "default";
67+
68+
#pwm-cells = <2>;
69+
};
70+
71+
vibrator {
72+
compatible = "pwm-vibrator";
73+
74+
pwms = <&pwm_vibrator 0 10000>;
75+
pwm-names = "enable";
76+
77+
vcc-supply = <&pm8226_l28>;
78+
enable-gpios = <&tlmm 62 GPIO_ACTIVE_HIGH>;
79+
80+
pinctrl-0 = <&vibrator_en_default_state>;
81+
pinctrl-names = "default";
82+
};
5983
};
6084

6185
&adsp {
@@ -330,6 +354,20 @@
330354
};
331355
};
332356

357+
vibrator_clk_default_state: vibrator-clk-default-state {
358+
pins = "gpio33";
359+
function = "gp0_clk";
360+
drive-strength = <2>;
361+
bias-disable;
362+
};
363+
364+
vibrator_en_default_state: vibrator-en-default-state {
365+
pins = "gpio62";
366+
function = "gpio";
367+
drive-strength = <2>;
368+
bias-disable;
369+
};
370+
333371
wlan_hostwake_default_state: wlan-hostwake-default-state {
334372
pins = "gpio37";
335373
function = "gpio";

0 commit comments

Comments
 (0)