]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ARM: at91: Add armv7m support
authorSzemző András <sza@esh.hu>
Wed, 31 May 2017 01:06:21 +0000 (03:06 +0200)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Fri, 2 Jun 2017 08:11:38 +0000 (10:11 +0200)
Add Atmel SAME70/SAMS70/SAMV71 SoC support.

Signed-off-by: Szemző András <sza@esh.hu>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
arch/arm/mach-at91/Kconfig
arch/arm/mach-at91/Makefile
arch/arm/mach-at91/Makefile.boot [new file with mode: 0644]
arch/arm/mach-at91/samv7.c [new file with mode: 0644]

index 841e924143f90e089bae9269acacdff65ab597f9..2594b6a412f089be56c156f369e42dd3f0f8e564 100644 (file)
@@ -1,12 +1,20 @@
 menuconfig ARCH_AT91
        bool "Atmel SoCs"
-       depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7
+       depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M
        select COMMON_CLK_AT91
        select GPIOLIB
        select PINCTRL
        select SOC_BUS
 
 if ARCH_AT91
+config SOC_SAMV7
+       bool "SAM Cortex-M7 family" if ARM_SINGLE_ARMV7M
+       select COMMON_CLK_AT91
+       select PINCTRL_AT91
+       help
+         Select this if you are using an SoC from Atmel's SAME7, SAMS7 or SAMV7
+         families.
+
 config SOC_SAMA5D2
        bool "SAMA5D2 family"
        depends on ARCH_MULTI_V7
index cfd8f60a9268f85f30048e92949c0d13051e71d8..a189081dccc0602f3adb3dc0c8a3de9b50e41f72 100644 (file)
@@ -6,6 +6,7 @@
 obj-$(CONFIG_SOC_AT91RM9200)   += at91rm9200.o
 obj-$(CONFIG_SOC_AT91SAM9)     += at91sam9.o
 obj-$(CONFIG_SOC_SAMA5)                += sama5.o
+obj-$(CONFIG_SOC_SAMV7)                += samv7.o
 
 # Power Management
 obj-$(CONFIG_PM)               += pm.o
diff --git a/arch/arm/mach-at91/Makefile.boot b/arch/arm/mach-at91/Makefile.boot
new file mode 100644 (file)
index 0000000..eacfc3f
--- /dev/null
@@ -0,0 +1,3 @@
+# Empty file waiting for deletion once Makefile.boot isn't needed any more.
+# Patch waits for application at
+# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
diff --git a/arch/arm/mach-at91/samv7.c b/arch/arm/mach-at91/samv7.c
new file mode 100644 (file)
index 0000000..11386f1
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ *  Setup code for SAMv7x
+ *
+ *  Copyright (C) 2013 Atmel,
+ *                2016 Andras Szemzo <szemzo.andras@gmail.com>
+ *
+ * Licensed under GPLv2 or later.
+ */
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/of_address.h>
+#include <linux/slab.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/system_misc.h>
+#include "generic.h"
+
+static const char *const samv7_dt_board_compat[] __initconst = {
+       "atmel,samv7",
+       NULL
+};
+
+DT_MACHINE_START(samv7_dt, "Atmel SAMV7")
+       .dt_compat      = samv7_dt_board_compat,
+MACHINE_END