diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-06-29 16:59:54 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-06-29 16:59:54 +0200 |
| commit | 6d599c8d35475ec47612e28ed8d9aa23b9caaf73 (patch) | |
| tree | 54bc1a7c7e4232004c8b03bee715ef891efeb2bb /Documentation | |
| parent | 2b29ca22ed8a79ef1942b6546ccab5953678028d (diff) | |
| parent | cd84aff1d981bc34ed3166f3071916ca9ceefadf (diff) | |
| download | linux-6d599c8d35475ec47612e28ed8d9aa23b9caaf73.tar.gz linux-6d599c8d35475ec47612e28ed8d9aa23b9caaf73.tar.bz2 linux-6d599c8d35475ec47612e28ed8d9aa23b9caaf73.zip | |
Merge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt64
Pull "Amlogic 64-bit DT changes for v4.13 (round 2)" from Kevin Hilman:
- support new SPI controller driver
- several more leaf clocks exposed to DT
- New board: S905x LibreTech CC board
* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
ARM64: dts: meson-gxl: Add Libre Technology CC support
dt-bindings: arm: amlogic: Add Libre Technology CC board
dt-bindings: add Libre Technology vendor prefix
ARM64: dts: meson-gx: Add SPICC nodes
clk: meson-gxbb: un-export the CPU clock
clk: meson-gxbb: expose UART clocks
clk: meson-gxbb: expose SPICC gate
clk: meson-gxbb: expose spdif master clock
clk: meson-gxbb: expose i2s master clock
clk: meson-gxbb: expose spdif clock gates
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/amlogic.txt | 1 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt index 5c01e65951fa..0fff40a6330d 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.txt +++ b/Documentation/devicetree/bindings/arm/amlogic.txt @@ -52,6 +52,7 @@ Board compatible values (alphabetically, grouped by SoC): - "amlogic,p212" (Meson gxl s905x) - "hwacom,amazetv" (Meson gxl s905x) - "khadas,vim" (Meson gxl s905x) + - "libretech,cc" (Meson gxl s905x) - "amlogic,p230" (Meson gxl s905d) - "amlogic,p231" (Meson gxl s905d) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index b10fe16cdaa1..6856b369c01c 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -173,6 +173,7 @@ lantiq Lantiq Semiconductor lego LEGO Systems A/S lenovo Lenovo Group Ltd. lg LG Corporation +libretech Shenzhen Libre Technology Co., Ltd licheepi Lichee Pi linaro Linaro Limited linux Linux-specific binding |