7 files changed, 25 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts
index 93d5e361533f..ac0dc0031dda 100644
--- a/arch/arm/boot/dts/at91sam9g25ek.dts
+++ b/arch/arm/boot/dts/at91sam9g25ek.dts
@@ -41,5 +41,9 @@
                                            &pioD 20 0
                                           >;
                 };
+
+                usb1: ehci@00700000 {
+                        status = "okay";
+                };
         };
 };
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 4ab8a2502697..3d0c32fb218f 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -224,6 +224,13 @@
                         interrupts = <22 4>;
                         status = "disabled";
                 };
+
+                usb1: ehci@00800000 {
+                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
+                        reg = <0x00800000 0x100000>;
+                        interrupts = <22 4>;
+                        status = "disabled";
+                };
         };
 
         i2c@0 {
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 0c101ada9d8f..c4c8ae4123d5 100644
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -76,6 +76,10 @@
                         atmel,vbus-gpio = <&pioD 1 0
                                            &pioD 3 0>;
                 };
+
+                usb1: ehci@00800000 {
+                        status = "okay";
+                };
         };
 
         leds {
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 1d8b6ac945f8..c111001f254e 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -214,6 +214,13 @@
                         interrupts = <22 4>;
                         status = "disabled";
                 };
+
+                usb1: ehci@00700000 {
+                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
+                        reg = <0x00700000 0x100000>;
+                        interrupts = <22 4>;
+                        status = "disabled";
+                };
         };
 
         i2c@0 {
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index f58775e76325..df3bceacc86c 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -233,6 +233,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("t0_clk", "fff7c000.timer", &tcb0_clk),
         CLKDEV_CON_DEV_ID("t0_clk", "fffd4000.timer", &tcb0_clk),
         CLKDEV_CON_DEV_ID("hclk", "700000.ohci", &uhphs_clk),
+        CLKDEV_CON_DEV_ID("ehci_clk", "800000.ehci", &uhphs_clk),
         /* fake hclk clock */
         CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk),
         CLKDEV_CON_ID("pioA", &pioA_clk),
diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
index ec65ef7abfc9..b6831eeb7b76 100644
--- a/arch/arm/mach-at91/at91sam9x5.c
+++ b/arch/arm/mach-at91/at91sam9x5.c
@@ -232,6 +232,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("hclk", "f8030000.ethernet", &macb1_clk),
         CLKDEV_CON_DEV_ID("hclk", "600000.ohci", &uhphs_clk),
         CLKDEV_CON_DEV_ID("ohci_clk", "600000.ohci", &uhphs_clk),
+        CLKDEV_CON_DEV_ID("ehci_clk", "700000.ehci", &uhphs_clk),
 };
 
 /*
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 75823a1abeb6..7fe4902d9e51 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -65,7 +65,7 @@ config USB_ARCH_HAS_EHCI
         default y if PPC_MPC512x
         default y if ARCH_IXP4XX
         default y if ARCH_W90X900
-        default y if ARCH_AT91SAM9G45
+        default y if ARCH_AT91
         default y if ARCH_MXC
         default y if ARCH_OMAP3
         default y if ARCH_CNS3XXX