diff options
author | Olof Johansson <olof@lixom.net> | 2016-11-19 03:50:59 +0300 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-11-19 03:50:59 +0300 |
commit | adc8f25f630fd63dce97064df6e04d5d5c12bb77 (patch) | |
tree | 75ccf1c2f3c2ad2a086335e26f7609b8c2608f21 /Documentation/devicetree/bindings/vendor-prefixes.txt | |
parent | 4f23683cedfd232ba6117468555315039785de79 (diff) | |
parent | ab5b24fdd2d551ea729e8e19e47811a646260331 (diff) | |
download | linux-adc8f25f630fd63dce97064df6e04d5d5c12bb77.tar.xz |
Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt64
Amlogic DT changes for 64-bit platforms for v4.10
Support for new drivers:
- USB
- i2c
- SPI
- mailbox/MHU
- PWM
- ethernet MAC, PHY
- secure monitor
- IR
- watchdog
* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (27 commits)
ARM64: dts: meson-gxbb-vega-s95: Add SD/SDIO/MMC and PWM nodes
ARM64: dts: meson-gxl-s905x: Enable internal ethernet PHY
ARM64: dts: meson-gxl-p23x: Enable ethernet
ARM64: dts: meson-gxl: Add ethernet nodes with internal PHY
ARM64: dts: amlogic: Reorder copyrights for meson-gx
ARM64: dts: meson-gxl-p23x: Enable IR receiver
ARM64: dts: meson-gxl-p23x: Add SD/SDIO/MMC and PWM nodes
ARM64: dts: meson-gxl-p23x: Add uart pinctrl
ARM64: dts: meson-gxl: Add MMC/SD/SDIO nodes
ARM64: dts: meson-gxl: Add i2c nodes
ARM64: dts: meson-gxl: Add clock nodes
ARM64: dts: meson-gxl: Add pinctrl nodes
ARM64: dts: meson-gxbb: Move common nodes to meson-gx
ARM64: dts: meson-gxbb: Add SCPI with cpufreq & sensors Nodes
ARM64: dts: meson-gxbb: Add SRAM node
ARM64: dts: meson-gxbb: Add MMC nodes to Nexbox A95x
ARM64: dts: meson-gxbb: Add P20x Wifi SDIO support
ARM64: dts: meson-gxbb: Add Wifi 32K clock for p20x boards
ARM64: dts: meson-gxbb: add MMC support
ARM64: dts: meson-gxbb-odroidc2: Enable USB Nodes
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.txt')
-rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 6edd2fe46275..7de215da9f55 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -186,6 +186,7 @@ neonode Neonode Inc. netgear NETGEAR netlogic Broadcom Corporation (formerly NetLogic Microsystems) netxeon Shenzhen Netxeon Technology CO., LTD +nexbox Nexbox newhaven Newhaven Display International nintendo Nintendo nokia Nokia |