From: Tony Lindgren Date: Mon, 16 Jan 2006 22:11:05 +0000 (-0800) Subject: Merge with /home/tmlind/src/kernel/linux-2.6 X-Git-Tag: v2.6.16-omap1~137 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ba1e20a87a214d9d3d81d863de4730ae80598820;p=linux-2.6-omap-h63xx.git Merge with /home/tmlind/src/kernel/linux-2.6 --- ba1e20a87a214d9d3d81d863de4730ae80598820 diff --cc arch/arm/Makefile index dd3f75c4ef2,fbfc14a56b9..80ccb869cc7 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@@ -54,10 -54,15 +54,15 @@@ tune-$(CONFIG_CPU_ARM926T) :=-mtune=arm tune-$(CONFIG_CPU_SA110) :=-mtune=strongarm110 tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100 tune-$(CONFIG_CPU_XSCALE) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale -tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) +tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136jf-s,-mtune=arm1136jfs) - # Need -Uarm for gcc < 3.x + ifeq ($(CONFIG_AEABI),y) + CFLAGS_ABI :=-mabi=aapcs -mno-thumb-interwork + else CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,) + endif + + # Need -Uarm for gcc < 3.x CFLAGS +=$(CFLAGS_ABI) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm AFLAGS +=$(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float diff --cc arch/arm/boot/compressed/Makefile index f9b05d80a08,35ffe0f4ece..60e306eff77 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@@ -50,12 -46,12 +46,16 @@@ ifeq ($(CONFIG_PXA_SHARPSL),y OBJS += head-sharpsl.o endif + ifeq ($(CONFIG_ARCH_AT91RM9200),y) + OBJS += head-at91rm9200.o + endif + ifeq ($(CONFIG_DEBUG_ICEDCC),y) -OBJS += ice-dcc.o +OBJS += ice-dcc.o +endif + +ifeq ($(CONFIG_MACH_OMAP_PERSEUS2),y) +OBJS += head-omap.o endif ifeq ($(CONFIG_CPU_BIG_ENDIAN),y) diff --cc arch/arm/mach-omap1/board-netstar.c index 00000000000,58f783930d4..0448fa7de8a mode 000000,100644..100644 --- a/arch/arm/mach-omap1/board-netstar.c +++ b/arch/arm/mach-omap1/board-netstar.c @@@ -1,0 -1,159 +1,160 @@@ + /* + * Modified from board-generic.c + * + * Copyright (C) 2004 2N Telekomunikace, Ladislav Michl + * + * Code for Netstar OMAP board. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + + #include + #include + #include + #include + #include + #include + #include + + #include + #include + #include + #include + + #include + #include + #include + #include + + extern void __init omap_init_time(void); + extern int omap_gpio_init(void); + + static struct resource netstar_smc91x_resources[] = { + [0] = { + .start = OMAP_CS1_PHYS + 0x300, + .end = OMAP_CS1_PHYS + 0x300 + 16, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = OMAP_GPIO_IRQ(8), + .end = OMAP_GPIO_IRQ(8), + .flags = IORESOURCE_IRQ, + }, + }; + + static struct platform_device netstar_smc91x_device = { + .name = "smc91x", + .id = 0, + .num_resources = ARRAY_SIZE(netstar_smc91x_resources), + .resource = netstar_smc91x_resources, + }; + + static struct platform_device *netstar_devices[] __initdata = { + &netstar_smc91x_device, + }; + + static struct omap_uart_config netstar_uart_config __initdata = { + .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), + }; + + static struct omap_board_config_kernel netstar_config[] = { + { OMAP_TAG_UART, &netstar_uart_config }, + }; + + static void __init netstar_init_irq(void) + { + omap_init_irq(); + omap_gpio_init(); + } + + static void __init netstar_init(void) + { + /* green LED */ + omap_request_gpio(4); + omap_set_gpio_direction(4, 0); + /* smc91x reset */ + omap_request_gpio(7); + omap_set_gpio_direction(7, 0); + omap_set_gpio_dataout(7, 1); + udelay(2); /* wait at least 100ns */ + omap_set_gpio_dataout(7, 0); + mdelay(50); /* 50ms until PHY ready */ + /* smc91x interrupt pin */ + omap_request_gpio(8); + + omap_request_gpio(12); + omap_request_gpio(13); + omap_request_gpio(14); + omap_request_gpio(15); + set_irq_type(OMAP_GPIO_IRQ(12), IRQT_FALLING); + set_irq_type(OMAP_GPIO_IRQ(13), IRQT_FALLING); + set_irq_type(OMAP_GPIO_IRQ(14), IRQT_FALLING); + set_irq_type(OMAP_GPIO_IRQ(15), IRQT_FALLING); + + platform_add_devices(netstar_devices, ARRAY_SIZE(netstar_devices)); + + /* Switch on green LED */ + omap_set_gpio_dataout(4, 0); + /* Switch off red LED */ + omap_writeb(0x00, OMAP_LPG1_PMR); /* Disable clock */ + omap_writeb(0x80, OMAP_LPG1_LCR); + + omap_board_config = netstar_config; + omap_board_config_size = ARRAY_SIZE(netstar_config); + omap_serial_init(); + } + + static void __init netstar_map_io(void) + { + omap_map_common_io(); + } + + #define MACHINE_PANICED 1 + #define MACHINE_REBOOTING 2 + #define MACHINE_REBOOT 4 + static unsigned long machine_state; + + static int panic_event(struct notifier_block *this, unsigned long event, + void *ptr) + { + if (test_and_set_bit(MACHINE_PANICED, &machine_state)) + return NOTIFY_DONE; + + /* Switch off green LED */ + omap_set_gpio_dataout(4, 1); + /* Flash red LED */ + omap_writeb(0x78, OMAP_LPG1_LCR); + omap_writeb(0x01, OMAP_LPG1_PMR); /* Enable clock */ + + return NOTIFY_DONE; + } + + static struct notifier_block panic_block = { + .notifier_call = panic_event, + }; + + static int __init netstar_late_init(void) + { + /* TODO: Setup front panel switch here */ + + /* Setup panic notifier */ + notifier_chain_register(&panic_notifier_list, &panic_block); + + return 0; + } + + postcore_initcall(netstar_late_init); + + MACHINE_START(NETSTAR, "NetStar OMAP5910") + /* Maintainer: Ladislav Michl */ ++ .phys_ram = 0x10000000, + .phys_io = 0xfff00000, + .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, + .boot_params = 0x10000100, + .map_io = netstar_map_io, + .init_irq = netstar_init_irq, + .init_machine = netstar_init, + .timer = &omap_timer, + MACHINE_END diff --cc arch/arm/mach-omap2/clock.c index 74786a45ede,5407b954915..72eb4bf571a --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@@ -25,12 -26,10 +26,11 @@@ #include - #include #include #include -#include +#include "prcm-regs.h" +#include "memory.h" #include "clock.h" //#define DOWN_VARIABLE_DPLL 1 /* Experimental */ diff --cc drivers/media/video/Kconfig index 5614835a6a3,d82c8a30ba4..f33a35d207a --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@@ -342,8 -351,6 +351,8 @@@ config VIDEO_DECODE depends on VIDEO_DEV && I2C && EXPERIMENTAL ---help--- Say Y here to compile drivers for SAA7115, SAA7127 and CX25840 - video decoders. + video decoders. +source drivers/media/video/omap/Kconfig + endmenu diff --cc drivers/net/irda/Makefile index 494b0f85753,72cbfdc9cfc..df619ebdc49 --- a/drivers/net/irda/Makefile +++ b/drivers/net/irda/Makefile @@@ -43,8 -43,6 +43,8 @@@ obj-$(CONFIG_OLD_BELKIN_DONGLE) += old_ obj-$(CONFIG_MCP2120_DONGLE) += mcp2120-sir.o obj-$(CONFIG_ACT200L_DONGLE) += act200l-sir.o obj-$(CONFIG_MA600_DONGLE) += ma600-sir.o +obj-$(CONFIG_OMAP_IR) += omap-ir.o + # The SIR helper module - sir-dev-objs := sir_core.o sir_dev.o sir_dongle.o sir_kthread.o + sir-dev-objs := sir_dev.o sir_dongle.o sir_kthread.o diff --cc drivers/net/smc91x.h index 5d630b7e9b2,e0efd1964e7..a91a8a03ddc --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h @@@ -185,12 -185,11 +185,12 @@@ SMC_outw(u16 val, void __iomem *ioaddr #include #include - #define SMC_IRQ_TRIGGER_TYPE (( \ + #define SMC_IRQ_FLAGS (( \ machine_is_omap_h2() \ || machine_is_omap_h3() \ + || machine_is_omap_h4() \ || (machine_is_omap_innovator() && !cpu_is_omap1510()) \ - ) ? IRQT_FALLING : IRQT_RISING) + ) ? SA_TRIGGER_FALLING : SA_TRIGGER_RISING) #elif defined(CONFIG_SH_SH4202_MICRODEV) diff --cc include/asm-arm/arch-omap/system.h index 2e2a76deef8,6724a81bd10..67970d1a202 --- a/include/asm-arm/arch-omap/system.h +++ b/include/asm-arm/arch-omap/system.h @@@ -5,8 -5,11 +5,10 @@@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H #include + #include + #include #include -#include #ifndef CONFIG_MACH_VOICEBLUE #define voiceblue_reset() do {} while (0)