8 files changed, 623 insertions, 255 deletions

diff --git a/Documentation/devicetree/bindings/mfd/atmel-matrix.txt b/Documentation/devicetree/bindings/mfd/atmel-matrix.txt
new file mode 100644
index 000000000000..e3ef50ca02a5
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/atmel-matrix.txt
@@ -0,0 +1,24 @@
+* Device tree bindings for Atmel Bus Matrix
+
+The Bus Matrix registers are used to configure Atmel SoCs internal bus
+behavior (master/slave priorities, undefined burst length type, ...)
+
+Required properties:
+- compatible:           Should be one of the following
+                        "atmel,at91sam9260-matrix", "syscon"
+                        "atmel,at91sam9261-matrix", "syscon"
+                        "atmel,at91sam9263-matrix", "syscon"
+                        "atmel,at91sam9rl-matrix", "syscon"
+                        "atmel,at91sam9g45-matrix", "syscon"
+                        "atmel,at91sam9n12-matrix", "syscon"
+                        "atmel,at91sam9x5-matrix", "syscon"
+                        "atmel,sama5d3-matrix", "syscon"
+- reg:                  Contains offset/length value of the Bus Matrix
+                        memory region.
+
+Example:
+
+matrix: matrix@ffffec00 {
+        compatible = "atmel,sama5d3-matrix", "syscon";
+        reg = <0xffffec00 0x200>;
+};
diff --git a/Documentation/devicetree/bindings/mfd/atmel-smc.txt b/Documentation/devicetree/bindings/mfd/atmel-smc.txt
new file mode 100644
index 000000000000..26eeed373934
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/atmel-smc.txt
@@ -0,0 +1,19 @@
+* Device tree bindings for Atmel SMC (Static Memory Controller)
+
+The SMC registers are used to configure Atmel EBI (External Bus Interface)
+to interface with standard memory devices (NAND, NOR, SRAM or specialized
+devices like FPGAs).
+
+Required properties:
+- compatible:           Should be one of the following
+                        "atmel,at91sam9260-smc", "syscon"
+                        "atmel,sama5d3-smc", "syscon"
+- reg:                  Contains offset/length value of the SMC memory
+                        region.
+
+Example:
+
+smc: smc@ffffc000 {
+        compatible = "atmel,sama5d3-smc", "syscon";
+        reg = <0xffffc000 0x1000>;
+};
diff --git a/Documentation/devicetree/bindings/usb/atmel-usb.txt b/Documentation/devicetree/bindings/usb/atmel-usb.txt
index bc2222ca3f2a..54a81219caae 100644
--- a/Documentation/devicetree/bindings/usb/atmel-usb.txt
+++ b/Documentation/devicetree/bindings/usb/atmel-usb.txt
@@ -33,9 +33,17 @@ usb1: ehci@00800000 {
 AT91 USB device controller
 
 Required properties:
- - compatible: Should be "atmel,at91rm9200-udc"
+ - compatible: Should be one of the following
+               "atmel,at91rm9200-udc"
+               "atmel,at91sam9260-udc"
+               "atmel,at91sam9261-udc"
+               "atmel,at91sam9263-udc"
  - reg: Address and length of the register set for the device
  - interrupts: Should contain macb interrupt
+ - clocks: Should reference the peripheral and the AHB clocks
+ - clock-names: Should contains two strings
+                "pclk" for the peripheral clock
+                "hclk" for the AHB clock
 
 Optional properties:
  - atmel,vbus-gpio: If present, specifies a gpio that needs to be
diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig
index b8e213eb36cc..366e551aeff0 100644
--- a/drivers/usb/gadget/udc/Kconfig
+++ b/drivers/usb/gadget/udc/Kconfig
@@ -32,6 +32,7 @@ menu "USB Peripheral Controller"
 config USB_AT91
         tristate "Atmel AT91 USB Device Port"
         depends on ARCH_AT91
+        depends on OF || COMPILE_TEST
         help
            Many Atmel AT91 processors (such as the AT91RM2000) have a
            full speed USB Device Port with support for five configurable
diff --git a/drivers/usb/gadget/udc/at91_udc.c b/drivers/usb/gadget/udc/at91_udc.c
index c862656d18b8..6d285226ab94 100644
--- a/drivers/usb/gadget/udc/at91_udc.c
+++ b/drivers/usb/gadget/udc/at91_udc.c
@@ -31,16 +31,9 @@
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/platform_data/atmel.h>
-
-#include <asm/byteorder.h>
-#include <mach/hardware.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/gpio.h>
-
-#include <mach/cpu.h>
-#include <mach/at91sam9261_matrix.h>
-#include <mach/at91_matrix.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
+#include <linux/mfd/syscon/atmel-matrix.h>
 
 #include "at91_udc.h"
 
@@ -66,7 +59,15 @@
 #define DRIVER_VERSION  "3 May 2006"
 
 static const char driver_name [] = "at91_udc";
-static const char ep0name[] = "ep0";
+static const char * const ep_names[] = {
+        "ep0",
+        "ep1",
+        "ep2",
+        "ep3-int",
+        "ep4",
+        "ep5",
+};
+#define ep0name         ep_names[0]
 
 #define VBUS_POLL_TIMEOUT       msecs_to_jiffies(1000)
 
@@ -895,8 +896,6 @@ static void clk_on(struct at91_udc *udc)
                 return;
         udc->clocked = 1;
 
-        if (IS_ENABLED(CONFIG_COMMON_CLK))
-                clk_enable(udc->uclk);
         clk_enable(udc->iclk);
         clk_enable(udc->fclk);
 }
@@ -909,8 +908,6 @@ static void clk_off(struct at91_udc *udc)
         udc->gadget.speed = USB_SPEED_UNKNOWN;
         clk_disable(udc->fclk);
         clk_disable(udc->iclk);
-        if (IS_ENABLED(CONFIG_COMMON_CLK))
-                clk_disable(udc->uclk);
 }
 
 /*
@@ -919,8 +916,6 @@ static void clk_off(struct at91_udc *udc)
  */
 static void pullup(struct at91_udc *udc, int is_on)
 {
-        int     active = !udc->board.pullup_active_low;
-
         if (!udc->enabled || !udc->vbus)
                 is_on = 0;
         DBG("%sactive\n", is_on ? "" : "in");
@@ -929,40 +924,15 @@ static void pullup(struct at91_udc *udc, int is_on)
                 clk_on(udc);
                 at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_RXRSM);
                 at91_udp_write(udc, AT91_UDP_TXVC, 0);
-                if (cpu_is_at91rm9200())
-                        gpio_set_value(udc->board.pullup_pin, active);
-                else if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) {
-                        u32     txvc = at91_udp_read(udc, AT91_UDP_TXVC);
-
-                        txvc |= AT91_UDP_TXVC_PUON;
-                        at91_udp_write(udc, AT91_UDP_TXVC, txvc);
-                } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) {
-                        u32     usbpucr;
-
-                        usbpucr = at91_matrix_read(AT91_MATRIX_USBPUCR);
-                        usbpucr |= AT91_MATRIX_USBPUCR_PUON;
-                        at91_matrix_write(AT91_MATRIX_USBPUCR, usbpucr);