summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-sunxi/cpu.h
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-01-07 15:08:43 +0100
committerHans de Goede <hdegoede@redhat.com>2015-01-14 14:56:40 +0100
commit0eccec4ef1431aafb8d67118c515703e6a7f7a3e (patch)
tree3b81363222e767536bb3062ff8bc8d834ab79b4d /arch/arm/include/asm/arch-sunxi/cpu.h
parent2abac6213d9d05c34fba7dcaa2934668774008a7 (diff)
downloadu-boot-imx-0eccec4ef1431aafb8d67118c515703e6a7f7a3e.zip
u-boot-imx-0eccec4ef1431aafb8d67118c515703e6a7f7a3e.tar.gz
u-boot-imx-0eccec4ef1431aafb8d67118c515703e6a7f7a3e.tar.bz2
sunxi: Move usb-controller init code out of ehci-sunxi.c for reuse for otg
Most of the usb-controller init code found in ehci-sunxi.c also is necessary to init the otg usb controller, so move it to a common place. While at it also update various #ifdefs / defines for sun8i support. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'arch/arm/include/asm/arch-sunxi/cpu.h')
-rw-r--r--arch/arm/include/asm/arch-sunxi/cpu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h b/arch/arm/include/asm/arch-sunxi/cpu.h
index bcfa00d..82b3d46 100644
--- a/arch/arm/include/asm/arch-sunxi/cpu.h
+++ b/arch/arm/include/asm/arch-sunxi/cpu.h
@@ -37,7 +37,7 @@
#define SUNXI_MMC1_BASE 0x01c10000
#define SUNXI_MMC2_BASE 0x01c11000
#define SUNXI_MMC3_BASE 0x01c12000
-#ifndef CONFIG_MACH_SUN6I
+#if !defined CONFIG_MACH_SUN6I && !defined CONFIG_MACH_SUN8I
#define SUNXI_USB0_BASE 0x01c13000
#define SUNXI_USB1_BASE 0x01c14000
#endif
@@ -45,7 +45,7 @@
#define SUNXI_HDMI_BASE 0x01c16000
#define SUNXI_SPI2_BASE 0x01c17000
#define SUNXI_SATA_BASE 0x01c18000
-#ifndef CONFIG_MACH_SUN6I
+#if !defined CONFIG_MACH_SUN6I && !defined CONFIG_MACH_SUN8I
#define SUNXI_PATA_BASE 0x01c19000
#define SUNXI_ACE_BASE 0x01c1a000
#define SUNXI_TVE1_BASE 0x01c1b000