forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'qcom-arm64-for-5.14-1' of https://git.kernel.org/pub/scm/l…
…inux/kernel/git/qcom/linux into arm/dt Additional Qualcomm ARM64 DT updates for v5.14 After a series of refactorings and additions to the SM8150 and SM8250 platform definitions, this adds new devicetree definitions for Sony Xperia 1, 5, 1II and 5II. It defines the Qualcomm SA8155p automotive platform as a derrivative of SM8150 and introduces the Automotive Deveopment Platform board. Lastly ipq8074 gains the definiton of an additiona I2C master and the SDHCI bus votes for sc7180 are tweaked. * tag 'qcom-arm64-for-5.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (25 commits) arm64: dts: ipq8074: Add QUP6 I2C node arm64: dts: qcom: sc7180: bus votes for eMMC and SD card arm64: dts: qcom: sm8250-edo: Add Samsung touchscreen arm64: dts: qcom: sm8250-edo: Enable GPI DMA arm64: dts: qcom: sm8250-edo: Enable ADSP/CDSP/SLPI arm64: dts: qcom: sm8250-edo: Enable PCIe arm64: dts: qcom: sm8250: Commonize PCIe pins arm64: dts: qcom: sm8250-edo: Add hardware keys arm64: dts: qcom: sa8155p-adp: Add base dts file arm64: dts: qcom: pmm8155au_2: Add base dts file arm64: dts: qcom: pmm8155au_1: Add base dts file arm64: dts: qcom: sm8250-edo: Fix up double "pinctrl-1" arm64: dts: qcom: sm8[12]50-pm8150: Move RESIN to pm8150 dtsi arm64: dts: qcom: sm8250: Add support for SONY Xperia 1 II / 5 II (Edo platform) arm64: dts: qcom: sm8250: Move gpio.h inclusion to SoC DTSI arm64: dts: qcom: sm8250: Add SDHCI2 sleep mode pinctrl arm64: dts: qcom: sm8150: Add support for SONY Xperia 1 / 5 (Kumano platform) arm64: dts: qcom: sm8150: Disable Adreno and modem by default arm64: dts: qcom: sm8250: Disable Adreno and Venus by default arm64: dts: qcom: sm8250: Add GPI DMA nodes ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
- Loading branch information
Showing
21 changed files
with
2,090 additions
and
139 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| // SPDX-License-Identifier: BSD-3-Clause | ||
| /* | ||
| * Copyright (c) 2021, Linaro Limited | ||
| */ | ||
|
|
||
| #include <dt-bindings/input/input.h> | ||
| #include <dt-bindings/interrupt-controller/irq.h> | ||
| #include <dt-bindings/spmi/spmi.h> | ||
| #include <dt-bindings/iio/qcom,spmi-vadc.h> | ||
|
|
||
| / { | ||
| thermal-zones { | ||
| pmm8155au-1-thermal { | ||
| polling-delay-passive = <100>; | ||
| polling-delay = <0>; | ||
|
|
||
| thermal-sensors = <&pmm8155au_1_temp>; | ||
|
|
||
| trips { | ||
| trip0 { | ||
| temperature = <95000>; | ||
| hysteresis = <0>; | ||
| type = "passive"; | ||
| }; | ||
|
|
||
| trip1 { | ||
| temperature = <115000>; | ||
| hysteresis = <0>; | ||
| type = "hot"; | ||
| }; | ||
|
|
||
| trip2 { | ||
| temperature = <145000>; | ||
| hysteresis = <0>; | ||
| type = "critical"; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &spmi_bus { | ||
| pmic@0 { | ||
| compatible = "qcom,pmm8155au", "qcom,spmi-pmic"; | ||
| reg = <0x0 SPMI_USID>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
|
|
||
| pon: power-on@800 { | ||
| compatible = "qcom,pm8916-pon"; | ||
| reg = <0x0800>; | ||
| pwrkey { | ||
| compatible = "qcom,pm8941-pwrkey"; | ||
| interrupts = <0x0 0x8 0x0 IRQ_TYPE_EDGE_BOTH>; | ||
| debounce = <15625>; | ||
| bias-pull-up; | ||
| linux,code = <KEY_POWER>; | ||
|
|
||
| status = "disabled"; | ||
| }; | ||
| }; | ||
|
|
||
| pmm8155au_1_temp: temp-alarm@2400 { | ||
| compatible = "qcom,spmi-temp-alarm"; | ||
| reg = <0x2400>; | ||
| interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_BOTH>; | ||
| io-channels = <&pmm8155au_1_adc ADC5_DIE_TEMP>; | ||
| io-channel-names = "thermal"; | ||
| #thermal-sensor-cells = <0>; | ||
| }; | ||
|
|
||
| pmm8155au_1_adc: adc@3100 { | ||
| compatible = "qcom,spmi-adc5"; | ||
| reg = <0x3100>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| #io-channel-cells = <1>; | ||
| interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>; | ||
|
|
||
| ref-gnd@0 { | ||
| reg = <ADC5_REF_GND>; | ||
| qcom,pre-scaling = <1 1>; | ||
| label = "ref_gnd"; | ||
| }; | ||
|
|
||
| vref-1p25@1 { | ||
| reg = <ADC5_1P25VREF>; | ||
| qcom,pre-scaling = <1 1>; | ||
| label = "vref_1p25"; | ||
| }; | ||
|
|
||
| die-temp@6 { | ||
| reg = <ADC5_DIE_TEMP>; | ||
| qcom,pre-scaling = <1 1>; | ||
| label = "die_temp"; | ||
| }; | ||
| }; | ||
|
|
||
| pmm8155au_1_adc_tm: adc-tm@3500 { | ||
| compatible = "qcom,spmi-adc-tm5"; | ||
| reg = <0x3500>; | ||
| interrupts = <0x0 0x35 0x0 IRQ_TYPE_EDGE_RISING>; | ||
| #thermal-sensor-cells = <1>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| pmm8155au_1_rtc: rtc@6000 { | ||
| compatible = "qcom,pm8941-rtc"; | ||
| reg = <0x6000>; | ||
| reg-names = "rtc", "alarm"; | ||
| interrupts = <0x0 0x61 0x1 IRQ_TYPE_NONE>; | ||
|
|
||
| status = "disabled"; | ||
| }; | ||
|
|
||
| pmm8155au_1_gpios: gpio@c000 { | ||
| compatible = "qcom,pmm8155au-gpio"; | ||
| reg = <0xc000>; | ||
| gpio-controller; | ||
| #gpio-cells = <2>; | ||
| gpio-ranges = <&pmm8155au_1_gpios 0 0 10>; | ||
| interrupt-controller; | ||
| #interrupt-cells = <2>; | ||
| }; | ||
| }; | ||
|
|
||
| pmic@1 { | ||
| compatible = "qcom,pmm8155au", "qcom,spmi-pmic"; | ||
| reg = <0x1 SPMI_USID>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| // SPDX-License-Identifier: BSD-3-Clause | ||
| /* | ||
| * Copyright (c) 2021, Linaro Limited | ||
| */ | ||
|
|
||
| #include <dt-bindings/input/input.h> | ||
| #include <dt-bindings/interrupt-controller/irq.h> | ||
| #include <dt-bindings/spmi/spmi.h> | ||
|
|
||
| / { | ||
| thermal-zones { | ||
| pmm8155au-2-thermal { | ||
| polling-delay-passive = <100>; | ||
| polling-delay = <0>; | ||
|
|
||
| thermal-sensors = <&pmm8155au_2_temp>; | ||
|
|
||
| trips { | ||
| trip0 { | ||
| temperature = <95000>; | ||
| hysteresis = <0>; | ||
| type = "passive"; | ||
| }; | ||
|
|
||
| trip1 { | ||
| temperature = <115000>; | ||
| hysteresis = <0>; | ||
| type = "hot"; | ||
| }; | ||
|
|
||
| trip2 { | ||
| temperature = <145000>; | ||
| hysteresis = <0>; | ||
| type = "critical"; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &spmi_bus { | ||
| pmic@4 { | ||
| compatible = "qcom,pmm8155au", "qcom,spmi-pmic"; | ||
| reg = <0x4 SPMI_USID>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
|
|
||
| power-on@800 { | ||
| compatible = "qcom,pm8916-pon"; | ||
| reg = <0x0800>; | ||
|
|
||
| status = "disabled"; | ||
| }; | ||
|
|
||
| pmm8155au_2_temp: temp-alarm@2400 { | ||
| compatible = "qcom,spmi-temp-alarm"; | ||
| reg = <0x2400>; | ||
| interrupts = <0x4 0x24 0x0 IRQ_TYPE_EDGE_BOTH>; | ||
| io-channels = <&pmm8155au_2_adc ADC5_DIE_TEMP>; | ||
| io-channel-names = "thermal"; | ||
| #thermal-sensor-cells = <0>; | ||
| }; | ||
|
|
||
| pmm8155au_2_adc: adc@3100 { | ||
| compatible = "qcom,spmi-adc5"; | ||
| reg = <0x3100>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| #io-channel-cells = <1>; | ||
| interrupts = <0x4 0x31 0x0 IRQ_TYPE_EDGE_RISING>; | ||
|
|
||
| ref-gnd@0 { | ||
| reg = <ADC5_REF_GND>; | ||
| qcom,pre-scaling = <1 1>; | ||
| label = "ref_gnd"; | ||
| }; | ||
|
|
||
| vref-1p25@1 { | ||
| reg = <ADC5_1P25VREF>; | ||
| qcom,pre-scaling = <1 1>; | ||
| label = "vref_1p25"; | ||
| }; | ||
|
|
||
| die-temp@6 { | ||
| reg = <ADC5_DIE_TEMP>; | ||
| qcom,pre-scaling = <1 1>; | ||
| label = "die_temp"; | ||
| }; | ||
| }; | ||
|
|
||
| pmm8155au_2_gpios: gpio@c000 { | ||
| compatible = "qcom,pmm8155au-gpio"; | ||
| reg = <0xc000>; | ||
| gpio-controller; | ||
| #gpio-cells = <2>; | ||
| gpio-ranges = <&pmm8155au_2_gpios 0 0 10>; | ||
| interrupt-controller; | ||
| #interrupt-cells = <2>; | ||
| }; | ||
| }; | ||
|
|
||
| pmic@5 { | ||
| compatible = "qcom,pmm8155au", "qcom,spmi-pmic"; | ||
| reg = <0x5 SPMI_USID>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| }; | ||
| }; |
Oops, something went wrong.