diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 16:38:12 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 16:38:12 +0200 |
| commit | 58eb042889ddc8035ddb68a9c9cbd2251d1b7feb (patch) | |
| tree | f1af7152bc8245e95a772ce67adc7ba7e970fdc3 /arch/arm/mach-omap2/io.c | |
| parent | 46a3b0aa93a99de341e0ee0d8ecede3843780835 (diff) | |
| parent | 7bcad170154f1302aeeced4f236588091a261fbf (diff) | |
| download | linux-58eb042889ddc8035ddb68a9c9cbd2251d1b7feb.tar.gz linux-58eb042889ddc8035ddb68a9c9cbd2251d1b7feb.tar.bz2 linux-58eb042889ddc8035ddb68a9c9cbd2251d1b7feb.zip | |
Merge tag 'omap-for-v3.11/soc-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
From Tony Lindgren:
Fix am43x minimal booting as I accidentally left out one
patch from the already merged omap-for-v3.11/soc-signed branch.
Also fixes for ti81x booting and revision check updates.
These are based on omap-for-v3.11/soc-signed because of the
am43x dependency to earlier patches.
* tag 'omap-for-v3.11/soc-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP3+: am33xx id: Add new am33xx specific function to check dev_feature
ARM: OMAP: TI816X: add powerdomains for TI816x
ARM: OMAP2: TI81XX: id: Add cpu id for TI816x ES2.0 and ES2.1
ARM: OMAP2+: AM43x: basic dt support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 8dec09a05ce7..dd0f23d0085b 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -576,7 +576,7 @@ void __init am33xx_init_early(void) omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE)); omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE), NULL); omap3xxx_check_revision(); - ti81xx_check_features(); + am33xx_check_features(); am33xx_voltagedomains_init(); am33xx_powerdomains_init(); am33xx_clockdomains_init(); |