diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-10-26 19:14:34 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-10-26 19:14:34 +0300 |
| commit | 9271fccb001d80f26d690dd1752d6f11eb61b2e2 (patch) | |
| tree | 827158ea8c4593a9db76ca7c30cc442b00fb2f5b /arch/arm/boot/dts/qcom-msm8660.dtsi | |
| parent | f253fb365e1ab89b45db8adef7648c21d7bfd89c (diff) | |
| parent | 036e6c9f0336f50532ad6bedfaebf01856168a1d (diff) | |
| download | linux-9271fccb001d80f26d690dd1752d6f11eb61b2e2.tar.xz | |
Merge tag 'qcom-dts-for-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt
Qualcomm DTS more changes for v5.16
The multi-purpose-pin (MPP) driver is finally migrated to use
hierarchical IRQ domains, so this bring the associated changes.
The remainder of the changes are correcting binding issues, primarily
found through DT validation.
* tag 'qcom-dts-for-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (26 commits)
ARM: dts: qcom: fix typo in IPQ8064 thermal-sensor node
ARM: dts: qcom: fix thermal zones naming
ARM: dts: qcom: fix flash node naming for RB3011
ARM: dts: qcom: correct mmc node naming
ARM: dts: qcom: fix memory and mdio nodes naming for RB3011
dt-bindings: arm: qcom: Fix Nexus 4 vendor prefix
ARM: dts: ipq4019-ap.dk01.1-c1: add device compatible in the dts
dt-bindings: arm: qcom-ipq4019: add missing device compatible
ARM: dts: qcom: apq8026-lg-lenok: rename board vendor
dt-bindings: arm: qcom: rename vendor of apq8026-lenok
ARM: dts: qcom: sdx55: Drop '#clock-cells' from QMP PHY node
ARM: dts: qcom: mdm9615: fix memory node for Sierra Wireless WP8548
ARM: dts: qcom-pma8084: add interrupt controller properties
ARM: dts: qcom-pm8941: add interrupt controller properties
ARM: dts: qcom-pm8841: add interrupt controller properties
ARM: dts: qcom-msm8660: add interrupt controller properties
ARM: dts: qcom-mdm9615: add interrupt controller properties
ARM: dts: qcom-apq8064: add interrupt controller properties
ARM: dts: qcom-apq8060-dragonboard: fix mpps state names
ARM: dts: qcom-mdm9615: add gpio-ranges to mpps node, fix its name
...
Link: https://lore.kernel.org/r/20211026135855.1205262-1-bjorn.andersson@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/qcom-msm8660.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/qcom-msm8660.dtsi | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi index 480fc08cbe8e..1e8aab357f9c 100644 --- a/arch/arm/boot/dts/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom-msm8660.dtsi @@ -307,20 +307,9 @@ reg = <0x50>; gpio-controller; #gpio-cells = <2>; - interrupt-parent = <&pm8058>; - interrupts = - <128 IRQ_TYPE_NONE>, - <129 IRQ_TYPE_NONE>, - <130 IRQ_TYPE_NONE>, - <131 IRQ_TYPE_NONE>, - <132 IRQ_TYPE_NONE>, - <133 IRQ_TYPE_NONE>, - <134 IRQ_TYPE_NONE>, - <135 IRQ_TYPE_NONE>, - <136 IRQ_TYPE_NONE>, - <137 IRQ_TYPE_NONE>, - <138 IRQ_TYPE_NONE>, - <139 IRQ_TYPE_NONE>; + gpio-ranges = <&pm8058_mpps 0 0 12>; + interrupt-controller; + #interrupt-cells = <2>; }; pwrkey@1c { @@ -494,7 +483,7 @@ #address-cells = <1>; #size-cells = <1>; ranges; - sdcc1: sdcc@12400000 { + sdcc1: mmc@12400000 { status = "disabled"; compatible = "arm,pl18x", "arm,primecell"; arm,primecell-periphid = <0x00051180>; @@ -510,7 +499,7 @@ cap-mmc-highspeed; }; - sdcc2: sdcc@12140000 { + sdcc2: mmc@12140000 { status = "disabled"; compatible = "arm,pl18x", "arm,primecell"; arm,primecell-periphid = <0x00051180>; @@ -525,7 +514,7 @@ cap-mmc-highspeed; }; - sdcc3: sdcc@12180000 { + sdcc3: mmc@12180000 { compatible = "arm,pl18x", "arm,primecell"; arm,primecell-periphid = <0x00051180>; status = "disabled"; @@ -541,7 +530,7 @@ no-1-8-v; }; - sdcc4: sdcc@121c0000 { + sdcc4: mmc@121c0000 { compatible = "arm,pl18x", "arm,primecell"; arm,primecell-periphid = <0x00051180>; status = "disabled"; @@ -556,7 +545,7 @@ cap-mmc-highspeed; }; - sdcc5: sdcc@12200000 { + sdcc5: mmc@12200000 { compatible = "arm,pl18x", "arm,primecell"; arm,primecell-periphid = <0x00051180>; status = "disabled"; |