diff options
author | Olof Johansson <olof@lixom.net> | 2017-06-18 20:56:42 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-06-18 20:56:42 -0700 |
commit | 010da09e267d1a2dd219385a3d12a8776d100399 (patch) | |
tree | dfa879d06061414cfd0be0cd185198a372e2d06a /arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | |
parent | 2003c78b3cfaf752d1301b8dd15a27803624ea86 (diff) | |
parent | 0cf6a8e2fb8413b581fc0d960f7831b0e7583406 (diff) |
Merge tag 'hisi-arm64-dt-for-4.13-v2' of git://github.com/hisilicon/linux-hisi into next/dt64
ARM64: DT: Hisilicon SoC DT updates for 4.13
- Add and update Hi3660-Hikey960 board, Hi3660 PCIe RC, Hi6421v530 MFD and
Hi3660 MMC binding
- Add and refine devices support for Hi3660-Hikey 960 including clock, reset,
I2C, GPIO, UART, Bluetooth, RTC, Power Key, LED, SPI, timer, PMIC, regulator,
sd/sdio and WiFi
- Add k3-dma and i2s/hdmi audio support based on audio-card-graph method for
Hikey board
* tag 'hisi-arm64-dt-for-4.13-v2' of git://github.com/hisilicon/linux-hisi: (21 commits)
arm64: dts: hi6220: Add k3-dma and i2s/hdmi audio support
arm64: dts: hi3660-hikey960: add nodes for WiFi
arm64: dts: hi3660: add sd/sdio device nodes
dt-bindings: mmc: dw_mmc-k3: add document of hi3660 mmc
arm64: dts: hikey960: add device node for pmic and regulators
dt-bindings: mfd: hi6421: Add hi6421v530 compatible string
arm64: dts: hisi: add kirin pcie node
dt-bindings: PCI: hisi: Add document for PCIe of Kirin SoCs
arm64: dts: hi3660: add sp804 timer node
arm64: dts: hi3660: add spi device nodes
arm64: dts: hikey960: add LED nodes
arm64: dts: hi3660: add power key dts node
arm64: dts: hi3660: Add pl031 rtc node
arm64: dts: hikey960: add WL1837 Bluetooth device node
arm64: dts: hi3660: Add uarts nodes
arm64: dts: hi3660: add gpio dtsi file for Hisilicon Hi3660 SOC
arm64: dts: Add I2C nodes for Hi3660
arm64: dts: hi3660: add resources for clock and reset
arm64: dts: hikey960: pinctrl: add more pinmux and pinconfig
arm64: dts: hisilicon: update compatible string for hikey960
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts')
-rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts index 49f6a6242cf9..afae4de6e53f 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -466,6 +466,11 @@ method = "smc"; }; }; + + sound_card { + compatible = "audio-graph-card"; + dais = <&i2s0_port0>; + }; }; &uart2 { @@ -506,10 +511,33 @@ interrupts = <1 2>; pd-gpio = <&gpio0 4 0>; adi,dsi-lanes = <4>; + #sound-dai-cells = <0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { + adv7533_in: endpoint { + remote-endpoint = <&dsi_out0>; + }; + }; + port@2 { + reg = <2>; + codec_endpoint: endpoint { + remote-endpoint = <&i2s0_cpu_endpoint>; + }; + }; + }; + }; +}; - port { - adv7533_in: endpoint { - remote-endpoint = <&dsi_out0>; +&i2s0 { + + ports { + i2s0_port0: port@0 { + i2s0_cpu_endpoint: endpoint { + remote-endpoint = <&codec_endpoint>; + dai-format = "i2s"; }; }; }; |