diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 00:28:13 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 00:38:58 +0200 |
| commit | 282e1cd16373d9b01dc64ff9f99c74d69df1812c (patch) | |
| tree | f7f49050a8f236420e967b4c95f44a5e119c1b7d /arch/arm/boot/dts/qcom-msm8974.dtsi | |
| parent | 2507514680f63f790b1567cf36704228b83dc3e6 (diff) | |
| parent | e8c4c6eeaacd0fbc18fe8954b262cfd97836a76f (diff) | |
| download | linux-282e1cd16373d9b01dc64ff9f99c74d69df1812c.tar.bz2 | |
Merge tag 'qcom-dts-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc
Pull "Qualcomm Device Tree Changes for v4.15" from Andy Gross:
* Add Support for MSM8974 based Fairphone 2 phone
* Add support for MSM8974 based Sony Xperia Z2 Tablet
* Add MSM8660 GSBI6/7 nodes
* Disable GSBI6 at APQ8064 platform level
* Fix phy cells on APQ8064
* tag 'qcom-dts-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
ARM: dts: msm8974-FP2: Add USB node
ARM: dts: msm8974-FP2: Add sdhci1 node
ARM: dts: msm8974-FP2: Add regulator nodes for FP2
ARM: dts: msm8974-FP2: Introduce gpio-keys nodes
ARM: dts: qcom: Add initial DTS file for Fairphone 2 phone
ARM: dts: qcom: add MSM8660 GSBI6 and GSBI7
ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet
ARM: dts: qcom-apq8064: disable gsbi6 i2c by default at soc dtsi
ARM: dts: qcom-apq8064: Fix dsi and hdmi phy cells
Diffstat (limited to 'arch/arm/boot/dts/qcom-msm8974.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/qcom-msm8974.dtsi | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index 0e3fffe30e57..76ae4be6e8aa 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -613,6 +613,20 @@ status = "disabled"; }; + sdhci@f9864900 { + compatible = "qcom,sdhci-msm-v4"; + reg = <0xf9864900 0x11c>, <0xf9864000 0x800>; + reg-names = "hc_mem", "core_mem"; + interrupts = <GIC_SPI 127 IRQ_TYPE_NONE>, + <GIC_SPI 224 IRQ_TYPE_NONE>; + interrupt-names = "hc_irq", "pwr_irq"; + clocks = <&gcc GCC_SDCC3_APPS_CLK>, + <&gcc GCC_SDCC3_AHB_CLK>, + <&xo_board>; + clock-names = "core", "iface", "xo"; + status = "disabled"; + }; + sdhci@f98a4900 { compatible = "qcom,sdhci-msm-v4"; reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>; |