Converting more ARM platforms to multiplatform support. This time, OMAP gets converted, which is a major step since this is by far the largest platform in terms of code size. The same thing happens to the vt8500 platform. Conflicts include: * Two mach/uncompress.h files are removed, the changes made to them elsewhere can be discarded now. * Moving the OMAP4 irq_match array has context clashes with turning omap4_sar_ram_init into an omap_early_initcall() -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUSUyOmCrR//JCVInAQI2zRAAnDUA3ufvANykRxNIII67D0u8XAgokzx6 hwq0ywwcQknd2aetN1khs2rY3sQ+T73CcsFzOR448YHjbWg1RCZlCzL89uUH6SdR Bir/NC2jYkB1vSVB7krWhZzpeHNsFfWW1bCzwJzJfNmAZp64js3sOR1kRKjMpA2z RGLktrFQ1JRKF/az+xnIsrleSnS2cQguPKIs5hYxPztzN/HdvbD7ZST0ttW7wqzg C2AA5dnWs+C++pNXyfKlN+nL1CnyLWGXbuZUejUvAxYxgtyd/gC4/aTfNi8S9RNh eiFTmVwl8lsWqPWx7yzyHk+p19x7ypfBgydLU/z4yC3asUJoN5jyCF6GSqzetHJB jpDqTp3lQzIlJPgLryq07Xe38vUeVIKvV4e8ySOsSBlKr6aRl5684HJSCAZR9SFa qzHavusA5JZJKf+94UbDCPNzSqzMQYnILA039M8ekvrMZhFG89St0+NLDaxVQfO/ OrTEnwth/TJBKvOUPIuamjZzHH/RiGkumWiKrEGKOlpwHPGtdglQeziJFo8pNkwR hjtnwn4RPPK8FIl59fERFI1hRvhUlwuhYcA2R/WTjcZw2d+jwZPzhhun37dLMVlw fk5lhz0GBaRUmua4xFqJTkpOwHf2l/9wbzhEpmL4c/ZSrtjYwfeL/tY6aT9e8MZK INaMr7X2QTw= =nl4h -----END PGP SIGNATURE----- Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC multiplatform support from Arnd Bergmann: "Converting more ARM platforms to multiplatform support. This time, OMAP gets converted, which is a major step since this is by far the largest platform in terms of code size. The same thing happens to the vt8500 platform." * tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: net: cwdavinci_cpdma: export symbols for cpsw remoteproc: omap: depend on OMAP_MBOX_FWK [media] davinci: do not include mach/hardware.h ARM: OMAP2+: Make sure files with omap initcalls include soc.h ARM: OMAP2+: Include soc.h to drm.c to fix compiling ARM: OMAP2+: Fix warning for hwspinlock omap_postcore_initcall ARM: multi_v7_defconfig: add ARCH_ZYNQ ARM: multi_v7_defconfig: remove unnecessary CONFIG_GPIOLIB arm: vt8500: Remove remaining mach includes arm: vt8500: Convert debug-macro.S to be multiplatform friendly arm: vt8500: Remove single platform Kconfig options ARM: OMAP2+: Remove now obsolete uncompress.h and debug-macro.S ARM: OMAP2+: Add minimal support for booting vexpress ARM: OMAP2+: Enable ARCH_MULTIPLATFORM support ARM: OMAP2+: Disable code that currently does not work with multiplaform ARM: OMAP2+: Add multiplatform debug_ll support ARM: OMAP: Fix dmaengine init for multiplatform ARM: OMAP: Fix i2c cmdline initcall for multiplatform ARM: OMAP2+: Use omap initcalls ARM: OMAP2+: Limit omap initcalls to omap only on multiplatform kernelstirimbino
Linus Torvalds
12 years ago
commit
3298a3511f
@ -1,171 +0,0 @@ |
||||
/*
|
||||
* arch/arm/plat-omap/include/mach/uncompress.h |
||||
* |
||||
* Serial port stubs for kernel decompress status messages |
||||
* |
||||
* Initially based on: |
||||
* linux-2.4.15-rmk1-dsplinux1.6/arch/arm/plat-omap/include/mach1510/uncompress.h |
||||
* Copyright (C) 2000 RidgeRun, Inc. |
||||
* Author: Greg Lonnon <glonnon@ridgerun.com> |
||||
* |
||||
* Rewritten by: |
||||
* Author: <source@mvista.com> |
||||
* 2004 (c) MontaVista Software, Inc. |
||||
* |
||||
* This file is licensed under the terms of the GNU General Public License |
||||
* version 2. This program is licensed "as is" without any warranty of any |
||||
* kind, whether express or implied. |
||||
*/ |
||||
|
||||
#include <linux/types.h> |
||||
#include <linux/serial_reg.h> |
||||
|
||||
#include <asm/memory.h> |
||||
#include <asm/mach-types.h> |
||||
|
||||
#include <mach/serial.h> |
||||
|
||||
#define MDR1_MODE_MASK 0x07 |
||||
|
||||
volatile u8 *uart_base; |
||||
int uart_shift; |
||||
|
||||
/*
|
||||
* Store the DEBUG_LL uart number into memory. |
||||
* See also debug-macro.S, and serial.c for related code. |
||||
*/ |
||||
static void set_omap_uart_info(unsigned char port) |
||||
{ |
||||
/*
|
||||
* Get address of some.bss variable and round it down |
||||
* a la CONFIG_AUTO_ZRELADDR. |
||||
*/ |
||||
u32 ram_start = (u32)&uart_shift & 0xf8000000; |
||||
u32 *uart_info = (u32 *)(ram_start + OMAP_UART_INFO_OFS); |
||||
*uart_info = port; |
||||
} |
||||
|
||||
static void putc(int c) |
||||
{ |
||||
if (!uart_base) |
||||
return; |
||||
|
||||
/* Check for UART 16x mode */ |
||||
if ((uart_base[UART_OMAP_MDR1 << uart_shift] & MDR1_MODE_MASK) != 0) |
||||
return; |
||||
|
||||
while (!(uart_base[UART_LSR << uart_shift] & UART_LSR_THRE)) |
||||
barrier(); |
||||
uart_base[UART_TX << uart_shift] = c; |
||||
} |
||||
|
||||
static inline void flush(void) |
||||
{ |
||||
} |
||||
|
||||
/*
|
||||
* Macros to configure UART1 and debug UART |
||||
*/ |
||||
#define _DEBUG_LL_ENTRY(mach, dbg_uart, dbg_shft, dbg_id) \ |
||||
if (machine_is_##mach()) { \
|
||||
uart_base = (volatile u8 *)(dbg_uart); \
|
||||
uart_shift = (dbg_shft); \
|
||||
port = (dbg_id); \
|
||||
set_omap_uart_info(port); \
|
||||
break; \
|
||||
} |
||||
|
||||
#define DEBUG_LL_OMAP2(p, mach) \ |
||||
_DEBUG_LL_ENTRY(mach, OMAP2_UART##p##_BASE, OMAP_PORT_SHIFT, \
|
||||
OMAP2UART##p) |
||||
|
||||
#define DEBUG_LL_OMAP3(p, mach) \ |
||||
_DEBUG_LL_ENTRY(mach, OMAP3_UART##p##_BASE, OMAP_PORT_SHIFT, \
|
||||
OMAP3UART##p) |
||||
|
||||
#define DEBUG_LL_OMAP4(p, mach) \ |
||||
_DEBUG_LL_ENTRY(mach, OMAP4_UART##p##_BASE, OMAP_PORT_SHIFT, \
|
||||
OMAP4UART##p) |
||||
|
||||
#define DEBUG_LL_OMAP5(p, mach) \ |
||||
_DEBUG_LL_ENTRY(mach, OMAP5_UART##p##_BASE, OMAP_PORT_SHIFT, \
|
||||
OMAP5UART##p) |
||||
/* Zoom2/3 shift is different for UART1 and external port */ |
||||
#define DEBUG_LL_ZOOM(mach) \ |
||||
_DEBUG_LL_ENTRY(mach, ZOOM_UART_BASE, ZOOM_PORT_SHIFT, ZOOM_UART) |
||||
|
||||
#define DEBUG_LL_TI81XX(p, mach) \ |
||||
_DEBUG_LL_ENTRY(mach, TI81XX_UART##p##_BASE, OMAP_PORT_SHIFT, \
|
||||
TI81XXUART##p) |
||||
|
||||
#define DEBUG_LL_AM33XX(p, mach) \ |
||||
_DEBUG_LL_ENTRY(mach, AM33XX_UART##p##_BASE, OMAP_PORT_SHIFT, \
|
||||
AM33XXUART##p) |
||||
|
||||
static inline void arch_decomp_setup(void) |
||||
{ |
||||
int port = 0; |
||||
|
||||
/*
|
||||
* Initialize the port based on the machine ID from the bootloader. |
||||
* Note that we're using macros here instead of switch statement |
||||
* as machine_is functions are optimized out for the boards that |
||||
* are not selected. |
||||
*/ |
||||
do { |
||||
/* omap2 based boards using UART1 */ |
||||
DEBUG_LL_OMAP2(1, omap_2430sdp); |
||||
DEBUG_LL_OMAP2(1, omap_apollon); |
||||
DEBUG_LL_OMAP2(1, omap_h4); |
||||
|
||||
/* omap2 based boards using UART3 */ |
||||
DEBUG_LL_OMAP2(3, nokia_n800); |
||||
DEBUG_LL_OMAP2(3, nokia_n810); |
||||
DEBUG_LL_OMAP2(3, nokia_n810_wimax); |
||||
|
||||
/* omap3 based boards using UART1 */ |
||||
DEBUG_LL_OMAP2(1, omap3evm); |
||||
DEBUG_LL_OMAP3(1, omap_3430sdp); |
||||
DEBUG_LL_OMAP3(1, omap_3630sdp); |
||||
DEBUG_LL_OMAP3(1, omap3530_lv_som); |
||||
DEBUG_LL_OMAP3(1, omap3_torpedo); |
||||
|
||||
/* omap3 based boards using UART3 */ |
||||
DEBUG_LL_OMAP3(3, cm_t35); |
||||
DEBUG_LL_OMAP3(3, cm_t3517); |
||||
DEBUG_LL_OMAP3(3, cm_t3730); |
||||
DEBUG_LL_OMAP3(3, craneboard); |
||||
DEBUG_LL_OMAP3(3, devkit8000); |
||||
DEBUG_LL_OMAP3(3, igep0020); |
||||
DEBUG_LL_OMAP3(3, igep0030); |
||||
DEBUG_LL_OMAP3(3, nokia_rm680); |
||||
DEBUG_LL_OMAP3(3, nokia_rm696); |
||||
DEBUG_LL_OMAP3(3, nokia_rx51); |
||||
DEBUG_LL_OMAP3(3, omap3517evm); |
||||
DEBUG_LL_OMAP3(3, omap3_beagle); |
||||
DEBUG_LL_OMAP3(3, omap3_pandora); |
||||
DEBUG_LL_OMAP3(3, omap_ldp); |
||||
DEBUG_LL_OMAP3(3, overo); |
||||
DEBUG_LL_OMAP3(3, touchbook); |
||||
|
||||
/* omap4 based boards using UART3 */ |
||||
DEBUG_LL_OMAP4(3, omap_4430sdp); |
||||
DEBUG_LL_OMAP4(3, omap4_panda); |
||||
|
||||
/* omap5 based boards using UART3 */ |
||||
DEBUG_LL_OMAP5(3, omap5_sevm); |
||||
|
||||
/* zoom2/3 external uart */ |
||||
DEBUG_LL_ZOOM(omap_zoom2); |
||||
DEBUG_LL_ZOOM(omap_zoom3); |
||||
|
||||
/* TI8168 base boards using UART3 */ |
||||
DEBUG_LL_TI81XX(3, ti8168evm); |
||||
|
||||
/* TI8148 base boards using UART1 */ |
||||
DEBUG_LL_TI81XX(1, ti8148evm); |
||||
|
||||
/* AM33XX base boards using UART1 */ |
||||
DEBUG_LL_AM33XX(1, am335xevm); |
||||
} while (0); |
||||
} |
||||
@ -1,13 +1,18 @@ |
||||
config ARCH_VT8500 |
||||
bool "VIA/WonderMedia 85xx" if ARCH_MULTI_V5 |
||||
default ARCH_VT8500_SINGLE |
||||
bool |
||||
select ARCH_HAS_CPUFREQ |
||||
select ARCH_REQUIRE_GPIOLIB |
||||
select CLKDEV_LOOKUP |
||||
select CLKSRC_OF |
||||
select CPU_ARM926T |
||||
select GENERIC_CLOCKEVENTS |
||||
select HAVE_CLK |
||||
select VT8500_TIMER |
||||
help |
||||
Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. |
||||
|
||||
config ARCH_WM8505 |
||||
bool "VIA/Wondermedia 85xx and WM8650" |
||||
depends on ARCH_MULTI_V5 |
||||
select ARCH_VT8500 |
||||
select CPU_ARM926T |
||||
help |
||||
|
||||
@ -1,26 +0,0 @@ |
||||
/*
|
||||
* arch/arm/mach-vt8500/include/mach/timex.h |
||||
* |
||||
* Copyright (C) 2010 Alexey Charkov <alchark@gmail.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; either version 2 of the License, or |
||||
* (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program; if not, write to the Free Software |
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
||||
*/ |
||||
|
||||
#ifndef MACH_TIMEX_H |
||||
#define MACH_TIMEX_H |
||||
|
||||
#define CLOCK_TICK_RATE (3000000) |
||||
|
||||
#endif /* MACH_TIMEX_H */ |
||||
@ -1,36 +0,0 @@ |
||||
/* arch/arm/mach-vt8500/include/mach/uncompress.h
|
||||
* |
||||
* Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> |
||||
* |
||||
* Based on arch/arm/mach-dove/include/mach/uncompress.h |
||||
* |
||||
* This software is licensed under the terms of the GNU General Public |
||||
* License version 2, as published by the Free Software Foundation, and |
||||
* may be copied, distributed, and modified under those terms. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
* |
||||
*/ |
||||
|
||||
#define UART0_PHYS 0xd8200000 |
||||
#define UART0_ADDR(x) *(volatile unsigned char *)(UART0_PHYS + x) |
||||
|
||||
static void putc(const char c) |
||||
{ |
||||
while (UART0_ADDR(0x1c) & 0x2) |
||||
/* Tx busy, wait and poll */; |
||||
|
||||
UART0_ADDR(0) = c; |
||||
} |
||||
|
||||
static void flush(void) |
||||
{ |
||||
} |
||||
|
||||
/*
|
||||
* nothing to do |
||||
*/ |
||||
#define arch_decomp_setup() |
||||
Loading…
Reference in new issue