From ec9c06831e7fcd01e0cef6f1a0038b1a0b86de28 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Sat, 17 Jan 2015 19:15:15 +0100 Subject: [PATCH 1/3] ARM: meson: select PINCTRL_MESON and ARCH_REQUIRE_GPIOLIB Make sure that the Meson pinctrl driver is built whenever Meson support is enabled. Signed-off-by: Beniamino Galvani Signed-off-by: Carlo Caione Acked-by: Linus Walleij --- arch/arm/mach-meson/Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index 18301dc9d2e7..0743e2059645 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -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 From 50746eb488d20b42f840f34b16ca98c1696d9c62 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 20 Jan 2015 00:22:57 +0100 Subject: [PATCH 2/3] of: Add vendor prefix for MINIX Add MINIX Technology Limited to the list of device tree vendor prefixes. The company manufactures digital media players and mini-ITX motherboards. Signed-off-by: Beniamino Galvani Signed-off-by: Carlo Caione --- Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 1 file changed, 1 insertion(+) 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 From 3cada3a4daeee52499751f0bf350b6b0655c32ef Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 20 Jan 2015 00:22:58 +0100 Subject: [PATCH 3/3] of: Define board compatible for MINIX NEO-X8 Document the board compatible property for MINIX NEO-X8, a Meson8-based digital media player. While at it, move the other existing Meson board compatible to amlogic.txt. Signed-off-by: Beniamino Galvani Signed-off-by: Carlo Caione --- Documentation/devicetree/bindings/arm/amlogic.txt | 4 ++++ Documentation/devicetree/bindings/arm/geniatech.txt | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/geniatech.txt 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"