diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-19 05:56:42 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-19 05:56:42 +0200 |
| commit | 010da09e267d1a2dd219385a3d12a8776d100399 (patch) | |
| tree | dfa879d06061414cfd0be0cd185198a372e2d06a /arch/arm64/boot/dts/hisilicon/hi6220.dtsi | |
| parent | Merge tag 'juno-updates-4.13' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | arm64: dts: hi6220: Add k3-dma and i2s/hdmi audio support (diff) | |
| download | linux-010da09e267d1a2dd219385a3d12a8776d100399.tar.xz linux-010da09e267d1a2dd219385a3d12a8776d100399.zip | |
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.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index 5013e4b2ea71..f2e218cc71a4 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -332,6 +332,19 @@ status = "disabled"; }; + dma0: dma@f7370000 { + compatible = "hisilicon,k3-dma-1.0"; + reg = <0x0 0xf7370000 0x0 0x1000>; + #dma-cells = <1>; + dma-channels = <15>; + dma-requests = <32>; + interrupts = <0 84 4>; + clocks = <&sys_ctrl HI6220_EDMAC_ACLK>; + dma-no-cci; + dma-type = "hi6220_dma"; + status = "ok"; + }; + dual_timer0: timer@f8008000 { compatible = "arm,sp804", "arm,primecell"; reg = <0x0 0xf8008000 0x0 0x1000>; @@ -805,6 +818,19 @@ #thermal-sensor-cells = <1>; }; + i2s0: i2s@f7118000{ + compatible = "hisilicon,hi6210-i2s"; + reg = <0x0 0xf7118000 0x0 0x8000>; /* i2s unit */ + interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>; /* 155 "DigACodec_intr"-32 */ + clocks = <&sys_ctrl HI6220_DACODEC_PCLK>, + <&sys_ctrl HI6220_BBPPLL0_DIV>; + clock-names = "dacodec", "i2s-base"; + dmas = <&dma0 15 &dma0 14>; + dma-names = "rx", "tx"; + hisilicon,sysctrl-syscon = <&sys_ctrl>; + #sound-dai-cells = <1>; + }; + thermal-zones { cls0: cls0 { |