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
This commit is contained in:
Arnd Bergmann 2015-03-04 23:06:49 +01:00
commit 0a9061c330
4 changed files with 8 additions and 5 deletions

View File

@ -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"

View File

@ -1,5 +0,0 @@
Geniatech platforms device tree bindings
-------------------------------------------
Geniatech ATV1200
- compatible = "geniatech,atv1200"

View File

@ -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

View File

@ -1,8 +1,11 @@
menuconfig ARCH_MESON
bool "Amlogic Meson SoCs" if ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB
select GENERIC_IRQ_CHIP
select ARM_GIC
select CACHE_L2X0
select PINCTRL
select PINCTRL_MESON
if ARCH_MESON