diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-03-04 23:06:49 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-04 23:06:49 +0100 |
| commit | 0a9061c3304bd74f74409e2bb49f70872afad2d8 (patch) | |
| tree | a44829f9b297e95d038a78b572a788932ff0b2b6 /Documentation | |
| parent | Merge tag 'renesas-soc-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | of: Define board compatible for MINIX NEO-X8 (diff) | |
| download | linux-0a9061c3304bd74f74409e2bb49f70872afad2d8.tar.xz linux-0a9061c3304bd74f74409e2bb49f70872afad2d8.zip | |
Merge tag 'for-v4.0-rc/meson-soc' of https://github.com/carlocaione/linux-meson into next/soc
Pull "meson SoC changes" from Carlo Caione:
- Add some forgotten documentation
- Kconfig changes to enable PINCTRL
* tag 'for-v4.0-rc/meson-soc' of https://github.com/carlocaione/linux-meson:
of: Define board compatible for MINIX NEO-X8
of: Add vendor prefix for MINIX
ARM: meson: select PINCTRL_MESON and ARCH_REQUIRE_GPIOLIB
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/amlogic.txt | 4 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/arm/geniatech.txt | 5 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt index 8fe815046140..973884a1bacf 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.txt +++ b/Documentation/devicetree/bindings/arm/amlogic.txt @@ -8,3 +8,7 @@ Boards with the Amlogic Meson6 SoC shall have the following properties: Boards with the Amlogic Meson8 SoC shall have the following properties: Required root node property: compatible: "amlogic,meson8"; + +Board compatible values: + - "geniatech,atv1200" + - "minix,neo-x8" diff --git a/Documentation/devicetree/bindings/arm/geniatech.txt b/Documentation/devicetree/bindings/arm/geniatech.txt deleted file mode 100644 index 74ccba40b73b..000000000000 --- a/Documentation/devicetree/bindings/arm/geniatech.txt +++ /dev/null @@ -1,5 +0,0 @@ -Geniatech platforms device tree bindings -------------------------------------------- - -Geniatech ATV1200 - - compatible = "geniatech,atv1200" diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 389ca1347a77..aeb5bb5b7791 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -112,6 +112,7 @@ merrii Merrii Technology Co., Ltd. micrel Micrel Inc. microchip Microchip Technology Inc. micron Micron Technology Inc. +minix MINIX Technology Ltd. mitsubishi Mitsubishi Electric Corporation mosaixtech Mosaix Technologies, Inc. moxa Moxa |