diff options
author | Olof Johansson <olof@lixom.net> | 2012-10-01 21:15:02 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-10-01 21:15:02 (GMT) |
commit | ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8 (patch) | |
tree | 3ca115b6580b70b20d21da179f004b14f54edc8e /arch/arm/mach-omap2/am33xx.h | |
parent | 17a505edb09495510ac8998450980472c412455b (diff) | |
parent | 9cf1c871526cf6bfec2a653e1e068ee72592542c (diff) | |
download | linux-fsl-qoriq-ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8.tar.xz |
Merge branch 'next/cleanup' into HEAD
Conflicts:
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/w1/masters/omap_hdq.c
Diffstat (limited to 'arch/arm/mach-omap2/am33xx.h')
-rw-r--r-- | arch/arm/mach-omap2/am33xx.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/am33xx.h b/arch/arm/mach-omap2/am33xx.h new file mode 100644 index 0000000..06c19bb --- /dev/null +++ b/arch/arm/mach-omap2/am33xx.h @@ -0,0 +1,25 @@ +/* + * This file contains the address info for various AM33XX modules. + * + * Copyright (C) 2011 Texas Instruments, Inc. - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation version 2. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __ASM_ARCH_AM33XX_H +#define __ASM_ARCH_AM33XX_H + +#define L4_SLOW_AM33XX_BASE 0x48000000 + +#define AM33XX_SCM_BASE 0x44E10000 +#define AM33XX_CTRL_BASE AM33XX_SCM_BASE +#define AM33XX_PRCM_BASE 0x44E00000 + +#endif /* __ASM_ARCH_AM33XX_H */ |