diff options
author | Tom Rini <trini@konsulko.com> | 2016-08-26 14:58:52 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-08-26 17:05:01 -0400 |
commit | c6b968da78ce3fa7224c0ddf15fe170c7c05b27e (patch) | |
tree | 42716ddc52ec9caecc19588a2d0c5ca9a94188dd /arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | |
parent | 1cfce74fe5a2301ee9b384d9395ba95db930c9d6 (diff) | |
parent | d5ac6eef91965b519d8f15f17febfa0ea2ee0adc (diff) | |
download | u-boot-imx-c6b968da78ce3fa7224c0ddf15fe170c7c05b27e.zip u-boot-imx-c6b968da78ce3fa7224c0ddf15fe170c7c05b27e.tar.gz u-boot-imx-c6b968da78ce3fa7224c0ddf15fe170c7c05b27e.tar.bz2 |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/include/asm/arch-sunxi/cpu_sun4i.h')
-rw-r--r-- | arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h index cd009d7..5f93830 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h @@ -76,8 +76,15 @@ #define SUNXI_INTC_BASE 0x01c20400 #define SUNXI_PIO_BASE 0x01c20800 #define SUNXI_TIMER_BASE 0x01c20c00 +#ifndef CONFIG_SUNXI_GEN_SUN6I +#define SUNXI_PWM_BASE 0x01c20e00 +#endif #define SUNXI_SPDIF_BASE 0x01c21000 +#ifdef CONFIG_SUNXI_GEN_SUN6I +#define SUNXI_PWM_BASE 0x01c21400 +#else #define SUNXI_AC97_BASE 0x01c21400 +#endif #define SUNXI_IR0_BASE 0x01c21800 #define SUNXI_IR1_BASE 0x01c21c00 |