Commit 0a9061c3 authored by Arnd Bergmann's avatar Arnd Bergmann

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
parents aa5c86ce 3cada3a4
...@@ -8,3 +8,7 @@ Boards with the Amlogic Meson6 SoC shall have the following properties: ...@@ -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: Boards with the Amlogic Meson8 SoC shall have the following properties:
Required root node property: Required root node property:
compatible: "amlogic,meson8"; compatible: "amlogic,meson8";
Board compatible values:
- "geniatech,atv1200"
- "minix,neo-x8"
Geniatech platforms device tree bindings
-------------------------------------------
Geniatech ATV1200
- compatible = "geniatech,atv1200"
...@@ -112,6 +112,7 @@ merrii Merrii Technology Co., Ltd. ...@@ -112,6 +112,7 @@ merrii Merrii Technology Co., Ltd.
micrel Micrel Inc. micrel Micrel Inc.
microchip Microchip Technology Inc. microchip Microchip Technology Inc.
micron Micron Technology Inc. micron Micron Technology Inc.
minix MINIX Technology Ltd.
mitsubishi Mitsubishi Electric Corporation mitsubishi Mitsubishi Electric Corporation
mosaixtech Mosaix Technologies, Inc. mosaixtech Mosaix Technologies, Inc.
moxa Moxa moxa Moxa
......
menuconfig ARCH_MESON menuconfig ARCH_MESON
bool "Amlogic Meson SoCs" if ARCH_MULTI_V7 bool "Amlogic Meson SoCs" if ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select ARM_GIC select ARM_GIC
select CACHE_L2X0 select CACHE_L2X0
select PINCTRL
select PINCTRL_MESON
if ARCH_MESON if ARCH_MESON
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment