github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 13:37:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Qualcomm dts updates for v5.13

Browse Source 
This adds Bluetooth support on the Samsung Galaxy S5, corrects the mount
 matrix for the IMU on Nexus 5 and corrects the fuel gauge irq trigger
 for the two devices.
 -----BEGIN PGP SIGNATURE-----
 
 iQJPBAABCAA5FiEEBd4DzF816k8JZtUlCx85Pw2ZrcUFAmBwf4YbHGJqb3JuLmFu
 ZGVyc3NvbkBsaW5hcm8ub3JnAAoJEAsfOT8Nma3FzH8P/jA8KjKAaKKc2Hb/SxKc
 hYBPX0/kMX0K237JuQ6kqp5E3t6FVKihxI+RljhwAxviOW8DrvwF74qbtgl7PB4S
 1xq8CBn6bP5yUcxnCoBPjzcZjffe7BiXdBGLyf5w/KdfJe4Uea+0HlI6C5n/uwxS
 WgJsUGsUI3vS85I1fjPUhwXC6Q7s34r5ReYnLk3FwYXeWUjD77lafIsGtejScCh/
 2BCAIai2u8NOgb4cVwk93aK3wZ8lCCnlVt0ZSB3QhPmlq5A/I1KTpKQ6SMwNfQWV
 pY0JJZf9ELd5lPgCfhM2cW0oJhRYXrKT5+dGWlOtANLU7kegnQziqNEHFXf+gR+h
 2TyB/Z0x9v8HJejYqB/VNm2Vn+v5Z47iWzxPelBZETYTj/7Dozn1fbGDwwS0il9L
 sca/tSQai9nmWEjGSIbsTBSO85Tv15wKnrswt38LcuAKBz/VQD32mV4a3cIVjv4d
 /CI5YCyUQeggGzSPD4gUdD86U6hnuaba2hIvGYytiw5G91UtVRFGMUnHDWB55y2o
 iP2hV3uaKxuMTJUHSiN9/tB12sZRNfY9AAjyFe4R9irvHpBGn3RCYkXmpmO3AB+Q
 S7JR0Ieq7/nCY55E3WbLA4yhbzrDN3uGQVHypABixw1xLlhU2P4v1QoGxPBEw+n+
 BXjjihlfQNGU0yjoKNLrDW4M
 =M5GB
 -----END PGP SIGNATURE-----

Merge tag 'qcom-dts-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt

Qualcomm dts updates for v5.13

This adds Bluetooth support on the Samsung Galaxy S5, corrects the mount
matrix for the IMU on Nexus 5 and corrects the fuel gauge irq trigger
for the two devices.

* tag 'qcom-dts-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: dts: qcom: msm8974-klte: Add bluetooth support
  ARM: dts: qcom: msm8974: add blsp2_uart8
  ARM: dts: qcom: msm8974-samsung-klte: correct fuel gauge interrupt trigger level
  ARM: dts: qcom: msm8974-lge-nexus5: correct fuel gauge interrupt trigger level
  ARM: dts: qcom: msm8974-hammerhead: add mount matrix for IMU

Link: https://lore.kernel.org/r/20210409162359.776076-1-bjorn.andersson@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-04-09 21:40:30 +02:00
commit e8adf27e97
3 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
View File

@ -529,6 +529,10 @@ mpu6515@68 {
pinctrl-names = "default";
pinctrl-0 = <&mpu6515_pin>;
mount-matrix = "0", "-1", "0",
"-1", "0", "0",
"0", "0", "1";
i2c-gate {
#address-cells = <1>;
#size-cells = <0>;
@ -575,7 +579,7 @@ fuelgauge: max17048@36 {
maxim,rcomp = /bits/ 8 <0x4d>;
interrupt-parent = <&msmgpio>;
interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&fuelgauge_pin>;

52
arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts
View File

@ -322,6 +322,27 @@ serial@f991e000 {
status = "okay";
};
/* blsp2_uart8 */
serial@f995e000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&blsp2_uart8_pins_active>;
pinctrl-1 = <&blsp2_uart8_pins_sleep>;
bluetooth {
compatible = "brcm,bcm43540-bt";
max-speed = <3000000>;
pinctrl-names = "default";
pinctrl-0 = <&bt_pins>;
device-wakeup-gpios = <&msmgpio 91 GPIO_ACTIVE_HIGH>;
shutdown-gpios = <&gpio_expander 9 GPIO_ACTIVE_HIGH>;
interrupt-parent = <&msmgpio>;
interrupts = <75 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "host-wakeup";
};
};
gpio-keys {
compatible = "gpio-keys";
input-name = "gpio-keys";
@ -356,6 +377,35 @@ volume-up {
};
pinctrl@fd510000 {
blsp2_uart8_pins_active: blsp2-uart8-pins-active {
pins = "gpio45", "gpio46", "gpio47", "gpio48";
function = "blsp_uart8";
drive-strength = <8>;
bias-disable;
};
blsp2_uart8_pins_sleep: blsp2-uart8-pins-sleep {
pins = "gpio45", "gpio46", "gpio47", "gpio48";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
};
bt_pins: bt-pins {
hostwake {
pins = "gpio75";
function = "gpio";
drive-strength = <16>;
input-enable;
};
devwake {
pins = "gpio91";
function = "gpio";
drive-strength = <2>;
};
};
sdhc1_pin_a: sdhc1-pin-active {
clk {
pins = "sdc1_clk";
@ -717,7 +767,7 @@ fuelgauge@36 {
maxim,rcomp = /bits/ 8 <0x56>;
interrupt-parent = <&pma8084_gpios>;
interrupts = <21 IRQ_TYPE_EDGE_FALLING>;
interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&fuelgauge_pin>;

9
arch/arm/boot/dts/qcom-msm8974.dtsi
View File

@ -715,6 +715,15 @@ blsp1_uart2: serial@f991e000 {
status = "disabled";
};
blsp2_uart8: serial@f995e000 {
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
reg = <0xf995e000 0x1000>;
interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP2_UART2_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>;
clock-names = "core", "iface";
status = "disabled";
};
blsp2_uart10: serial@f9960000 {
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
reg = <0xf9960000 0x1000>;