diff options
| author | Tom Rini <trini@ti.com> | 2014-11-13 10:35:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-13 10:35:13 -0500 |
| commit | 0d485b9095328cdc81b2ee94ff59b988c69b9127 (patch) | |
| tree | 93406f5dfe78b0b5670272a9de3f3eb3ee419785 /include/configs | |
| parent | 3ad207a2bf1399a689233a97978e306f71729f77 (diff) | |
| parent | 64a97599b79e277600bc6f1b22cf48aa04ee9bd0 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/sun4i.h | 7 | ||||
| -rw-r--r-- | include/configs/sun6i.h | 6 | ||||
| -rw-r--r-- | include/configs/sun7i.h | 7 |
3 files changed, 6 insertions, 14 deletions
diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index e0ec52dcde..7b857405e9 100644 --- a/include/configs/sun4i.h +++ b/include/configs/sun4i.h @@ -18,14 +18,7 @@ #ifdef CONFIG_USB_EHCI #define CONFIG_USB_EHCI_SUNXI - #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#ifndef CONFIG_SUNXI_USB_VBUS0_GPIO -#define CONFIG_SUNXI_USB_VBUS0_GPIO SUNXI_GPH(6) -#endif -#ifndef CONFIG_SUNXI_USB_VBUS1_GPIO -#define CONFIG_SUNXI_USB_VBUS1_GPIO SUNXI_GPH(3) -#endif #endif /* diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h index b7144745c9..1b73852799 100644 --- a/include/configs/sun6i.h +++ b/include/configs/sun6i.h @@ -14,9 +14,15 @@ /* * A31 specific configuration */ +#define CONFIG_CLK_FULL_SPEED 1008000000 #define CONFIG_SYS_PROMPT "sun6i# " +#ifdef CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_SUNXI +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 +#endif + /* * Include common sunxi configuration where most the settings are */ diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index 0193826a9d..ea40790322 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -19,14 +19,7 @@ #ifdef CONFIG_USB_EHCI #define CONFIG_USB_EHCI_SUNXI - #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#ifndef CONFIG_SUNXI_USB_VBUS0_GPIO -#define CONFIG_SUNXI_USB_VBUS0_GPIO SUNXI_GPH(6) -#endif -#ifndef CONFIG_SUNXI_USB_VBUS1_GPIO -#define CONFIG_SUNXI_USB_VBUS1_GPIO SUNXI_GPH(3) -#endif #endif #define CONFIG_ARMV7_VIRT 1 |