diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-19 06:56:42 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-19 06:56:42 +0300 |
| commit | 010da09e267d1a2dd219385a3d12a8776d100399 (patch) | |
| tree | dfa879d06061414cfd0be0cd185198a372e2d06a /Documentation/devicetree/bindings/mfd | |
| parent | 2003c78b3cfaf752d1301b8dd15a27803624ea86 (diff) | |
| parent | 0cf6a8e2fb8413b581fc0d960f7831b0e7583406 (diff) | |
| download | linux-010da09e267d1a2dd219385a3d12a8776d100399.tar.xz | |
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 'Documentation/devicetree/bindings/mfd')
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/hi6421.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mfd/hi6421.txt b/Documentation/devicetree/bindings/mfd/hi6421.txt index 0d5a4466a494..22da96d344a7 100644 --- a/Documentation/devicetree/bindings/mfd/hi6421.txt +++ b/Documentation/devicetree/bindings/mfd/hi6421.txt @@ -1,7 +1,9 @@ * HI6421 Multi-Functional Device (MFD), by HiSilicon Ltd. Required parent device properties: -- compatible : contains "hisilicon,hi6421-pmic"; +- compatible : One of the following chip-specific strings: + "hisilicon,hi6421-pmic"; + "hisilicon,hi6421v530-pmic"; - reg : register range space of hi6421; Supported Hi6421 sub-devices include: |