diff options
| author | Stephen Warren <swarren@wwwdotorg.org> | 2015-02-16 12:16:14 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-21 08:27:48 -0500 |
| commit | db75356f14646a4bca7b712f2128435e97f55c17 (patch) | |
| tree | d1a0f66497e2ad50fe336665f561ad5778bb028f /arch/arm/include/asm/arch-bcm2835/wdog.h | |
| parent | a033171b2ece1f3575ab7277e7b862e7f611b3f6 (diff) | |
| download | u-boot-imx-db75356f14646a4bca7b712f2128435e97f55c17.zip u-boot-imx-db75356f14646a4bca7b712f2128435e97f55c17.tar.gz u-boot-imx-db75356f14646a4bca7b712f2128435e97f55c17.tar.bz2 | |
bcm2836 SoC support (used in Raspberry Pi 2 model B)
The bcm2835 and bcm2836 are essentially identical, except:
- The CPU is an ARM1176 v.s. a quad-core Cortex-A7.
- The physical address of many IO controllers has moved.
Rather than introducing a whole new bcm2836 value for $(SOC) or $(ARCH),
update the existing bcm2835 code to handle the minor differences, and
plumb it into the ARMv7 CPU architecture.
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'arch/arm/include/asm/arch-bcm2835/wdog.h')
| -rw-r--r-- | arch/arm/include/asm/arch-bcm2835/wdog.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-bcm2835/wdog.h b/arch/arm/include/asm/arch-bcm2835/wdog.h index f369ab5..beb6a08 100644 --- a/arch/arm/include/asm/arch-bcm2835/wdog.h +++ b/arch/arm/include/asm/arch-bcm2835/wdog.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2012 Stephen Warren + * (C) Copyright 2012,2015 Stephen Warren * * SPDX-License-Identifier: GPL-2.0 */ @@ -7,7 +7,11 @@ #ifndef _BCM2835_TIMER_H #define _BCM2835_TIMER_H +#ifdef CONFIG_BCM2836 +#define BCM2835_WDOG_PHYSADDR 0x3f100000 +#else #define BCM2835_WDOG_PHYSADDR 0x20100000 +#endif struct bcm2835_wdog_regs { u32 unknown0[7]; |