mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	Pull ARM updates from Russell King: - clang assembly fixes from Ard - optimisations and cleanups for Aurora L2 cache support - efficient L2 cache support for secure monitor API on Exynos SoCs - debug menu cleanup from Daniel Thompson to allow better behaviour for multiplatform kernels - StrongARM SA11x0 conversion to irq domains, and pxa_timer - kprobes updates for older ARM CPUs - move probes support out of arch/arm/kernel to arch/arm/probes - add inline asm support for the rbit (reverse bits) instruction - provide an ARM mode secondary CPU entry point (for Qualcomm CPUs) - remove the unused ARMv3 user access code - add driver_override support to AMBA Primecell bus * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (55 commits) ARM: 8256/1: driver coamba: add device binding path 'driver_override' ARM: 8301/1: qcom: Use secondary_startup_arm() ARM: 8302/1: Add a secondary_startup that assumes ARM mode ARM: 8300/1: teach __asmeq that r11 == fp and r12 == ip ARM: kprobes: Fix compilation error caused by superfluous '*' ARM: 8297/1: cache-l2x0: optimize aurora range operations ARM: 8296/1: cache-l2x0: clean up aurora cache handling ARM: 8284/1: sa1100: clear RCSR_SMR on resume ARM: 8283/1: sa1100: collie: clear PWER register on machine init ARM: 8282/1: sa1100: use handle_domain_irq ARM: 8281/1: sa1100: move GPIO-related IRQ code to gpio driver ARM: 8280/1: sa1100: switch to irq_domain_add_simple() ARM: 8279/1: sa1100: merge both GPIO irqdomains ARM: 8278/1: sa1100: split irq handling for low GPIOs ARM: 8291/1: replace magic number with PAGE_SHIFT macro in fixup_pv code ARM: 8290/1: decompressor: fix a wrong comment ARM: 8286/1: mm: Fix dma_contiguous_reserve comment ARM: 8248/1: pm: remove outdated comment ARM: 8274/1: Fix DEBUG_LL for multi-platform kernels (without PL01X) ARM: 8273/1: Seperate DEBUG_UART_PHYS from DEBUG_LL on EP93XX ...
		
			
				
	
	
		
			437 lines
		
	
	
	
		
			9.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			437 lines
		
	
	
	
		
			9.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * linux/arch/arm/mach-sa1100/collie.c
 | 
						|
 *
 | 
						|
 * May be copied or modified under the terms of the GNU General Public
 | 
						|
 * License.  See linux/COPYING for more information.
 | 
						|
 *
 | 
						|
 * This file contains all Collie-specific tweaks.
 | 
						|
 *
 | 
						|
 * 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.
 | 
						|
 *
 | 
						|
 * ChangeLog:
 | 
						|
 *  2006 Pavel Machek <pavel@ucw.cz>
 | 
						|
 *  03-06-2004 John Lenz <lenz@cs.wisc.edu>
 | 
						|
 *  06-04-2002 Chris Larson <kergoth@digitalnemesis.net>
 | 
						|
 *  04-16-2001 Lineo Japan,Inc. ...
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/kernel.h>
 | 
						|
#include <linux/tty.h>
 | 
						|
#include <linux/delay.h>
 | 
						|
#include <linux/platform_data/sa11x0-serial.h>
 | 
						|
#include <linux/platform_device.h>
 | 
						|
#include <linux/mfd/ucb1x00.h>
 | 
						|
#include <linux/mtd/mtd.h>
 | 
						|
#include <linux/mtd/partitions.h>
 | 
						|
#include <linux/timer.h>
 | 
						|
#include <linux/gpio_keys.h>
 | 
						|
#include <linux/input.h>
 | 
						|
#include <linux/gpio.h>
 | 
						|
#include <linux/power/gpio-charger.h>
 | 
						|
 | 
						|
#include <video/sa1100fb.h>
 | 
						|
 | 
						|
#include <mach/hardware.h>
 | 
						|
#include <asm/mach-types.h>
 | 
						|
#include <asm/page.h>
 | 
						|
#include <asm/setup.h>
 | 
						|
#include <mach/collie.h>
 | 
						|
 | 
						|
#include <asm/mach/arch.h>
 | 
						|
#include <asm/mach/flash.h>
 | 
						|
#include <asm/mach/map.h>
 | 
						|
#include <linux/platform_data/irda-sa11x0.h>
 | 
						|
 | 
						|
#include <asm/hardware/scoop.h>
 | 
						|
#include <asm/mach/sharpsl_param.h>
 | 
						|
#include <asm/hardware/locomo.h>
 | 
						|
#include <linux/platform_data/mfd-mcp-sa11x0.h>
 | 
						|
#include <mach/irqs.h>
 | 
						|
 | 
						|
#include "generic.h"
 | 
						|
 | 
						|
static struct resource collie_scoop_resources[] = {
 | 
						|
	[0] = DEFINE_RES_MEM(0x40800000, SZ_4K),
 | 
						|
};
 | 
						|
 | 
						|
static struct scoop_config collie_scoop_setup = {
 | 
						|
	.io_dir 	= COLLIE_SCOOP_IO_DIR,
 | 
						|
	.io_out		= COLLIE_SCOOP_IO_OUT,
 | 
						|
	.gpio_base	= COLLIE_SCOOP_GPIO_BASE,
 | 
						|
};
 | 
						|
 | 
						|
struct platform_device colliescoop_device = {
 | 
						|
	.name		= "sharp-scoop",
 | 
						|
	.id		= -1,
 | 
						|
	.dev		= {
 | 
						|
 		.platform_data	= &collie_scoop_setup,
 | 
						|
	},
 | 
						|
	.num_resources	= ARRAY_SIZE(collie_scoop_resources),
 | 
						|
	.resource	= collie_scoop_resources,
 | 
						|
};
 | 
						|
 | 
						|
static struct scoop_pcmcia_dev collie_pcmcia_scoop[] = {
 | 
						|
	{
 | 
						|
	.dev		= &colliescoop_device.dev,
 | 
						|
	.irq		= COLLIE_IRQ_GPIO_CF_IRQ,
 | 
						|
	.cd_irq		= COLLIE_IRQ_GPIO_CF_CD,
 | 
						|
	.cd_irq_str	= "PCMCIA0 CD",
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static struct scoop_pcmcia_config collie_pcmcia_config = {
 | 
						|
	.devs		= &collie_pcmcia_scoop[0],
 | 
						|
	.num_devs	= 1,
 | 
						|
};
 | 
						|
 | 
						|
static struct ucb1x00_plat_data collie_ucb1x00_data = {
 | 
						|
	.gpio_base	= COLLIE_TC35143_GPIO_BASE,
 | 
						|
};
 | 
						|
 | 
						|
static struct mcp_plat_data collie_mcp_data = {
 | 
						|
	.mccr0		= MCCR0_ADM | MCCR0_ExtClk,
 | 
						|
	.sclk_rate	= 9216000,
 | 
						|
	.codec_pdata	= &collie_ucb1x00_data,
 | 
						|
};
 | 
						|
 | 
						|
static int collie_ir_startup(struct device *dev)
 | 
						|
{
 | 
						|
	int rc = gpio_request(COLLIE_GPIO_IR_ON, "IrDA");
 | 
						|
	if (rc)
 | 
						|
		return rc;
 | 
						|
	rc = gpio_direction_output(COLLIE_GPIO_IR_ON, 1);
 | 
						|
 | 
						|
	if (!rc)
 | 
						|
		return 0;
 | 
						|
 | 
						|
	gpio_free(COLLIE_GPIO_IR_ON);
 | 
						|
	return rc;
 | 
						|
}
 | 
						|
 | 
						|
static void collie_ir_shutdown(struct device *dev)
 | 
						|
{
 | 
						|
	gpio_free(COLLIE_GPIO_IR_ON);
 | 
						|
}
 | 
						|
 | 
						|
static int collie_ir_set_power(struct device *dev, unsigned int state)
 | 
						|
{
 | 
						|
	gpio_set_value(COLLIE_GPIO_IR_ON, !state);
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static struct irda_platform_data collie_ir_data = {
 | 
						|
	.startup = collie_ir_startup,
 | 
						|
	.shutdown = collie_ir_shutdown,
 | 
						|
	.set_power = collie_ir_set_power,
 | 
						|
};
 | 
						|
 | 
						|
/*
 | 
						|
 * Collie AC IN
 | 
						|
 */
 | 
						|
static char *collie_ac_supplied_to[] = {
 | 
						|
	"main-battery",
 | 
						|
	"backup-battery",
 | 
						|
};
 | 
						|
 | 
						|
 | 
						|
static struct gpio_charger_platform_data collie_power_data = {
 | 
						|
	.name			= "charger",
 | 
						|
	.type			= POWER_SUPPLY_TYPE_MAINS,
 | 
						|
	.gpio			= COLLIE_GPIO_AC_IN,
 | 
						|
	.supplied_to		= collie_ac_supplied_to,
 | 
						|
	.num_supplicants	= ARRAY_SIZE(collie_ac_supplied_to),
 | 
						|
};
 | 
						|
 | 
						|
static struct platform_device collie_power_device = {
 | 
						|
	.name			= "gpio-charger",
 | 
						|
	.id			= -1,
 | 
						|
	.dev.platform_data	= &collie_power_data,
 | 
						|
};
 | 
						|
 | 
						|
#ifdef CONFIG_SHARP_LOCOMO
 | 
						|
/*
 | 
						|
 * low-level UART features.
 | 
						|
 */
 | 
						|
struct platform_device collie_locomo_device;
 | 
						|
 | 
						|
static void collie_uart_set_mctrl(struct uart_port *port, u_int mctrl)
 | 
						|
{
 | 
						|
	if (mctrl & TIOCM_RTS)
 | 
						|
		locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_RTS, 0);
 | 
						|
	else
 | 
						|
		locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_RTS, 1);
 | 
						|
 | 
						|
	if (mctrl & TIOCM_DTR)
 | 
						|
		locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_DTR, 0);
 | 
						|
	else
 | 
						|
		locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_DTR, 1);
 | 
						|
}
 | 
						|
 | 
						|
static u_int collie_uart_get_mctrl(struct uart_port *port)
 | 
						|
{
 | 
						|
	int ret = TIOCM_CD;
 | 
						|
	unsigned int r;
 | 
						|
 | 
						|
	r = locomo_gpio_read_output(&collie_locomo_device.dev, LOCOMO_GPIO_CTS & LOCOMO_GPIO_DSR);
 | 
						|
	if (r == -ENODEV)
 | 
						|
		return ret;
 | 
						|
	if (r & LOCOMO_GPIO_CTS)
 | 
						|
		ret |= TIOCM_CTS;
 | 
						|
	if (r & LOCOMO_GPIO_DSR)
 | 
						|
		ret |= TIOCM_DSR;
 | 
						|
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
 | 
						|
static struct sa1100_port_fns collie_port_fns __initdata = {
 | 
						|
	.set_mctrl	= collie_uart_set_mctrl,
 | 
						|
	.get_mctrl	= collie_uart_get_mctrl,
 | 
						|
};
 | 
						|
 | 
						|
static int collie_uart_probe(struct locomo_dev *dev)
 | 
						|
{
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int collie_uart_remove(struct locomo_dev *dev)
 | 
						|
{
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static struct locomo_driver collie_uart_driver = {
 | 
						|
	.drv = {
 | 
						|
		.name = "collie_uart",
 | 
						|
	},
 | 
						|
	.devid	= LOCOMO_DEVID_UART,
 | 
						|
	.probe	= collie_uart_probe,
 | 
						|
	.remove	= collie_uart_remove,
 | 
						|
};
 | 
						|
 | 
						|
static int __init collie_uart_init(void)
 | 
						|
{
 | 
						|
	return locomo_driver_register(&collie_uart_driver);
 | 
						|
}
 | 
						|
device_initcall(collie_uart_init);
 | 
						|
 | 
						|
#endif
 | 
						|
 | 
						|
 | 
						|
static struct resource locomo_resources[] = {
 | 
						|
	[0] = DEFINE_RES_MEM(0x40000000, SZ_8K),
 | 
						|
	[1] = DEFINE_RES_IRQ(IRQ_GPIO25),
 | 
						|
};
 | 
						|
 | 
						|
static struct locomo_platform_data locomo_info = {
 | 
						|
	.irq_base	= IRQ_BOARD_START,
 | 
						|
};
 | 
						|
 | 
						|
struct platform_device collie_locomo_device = {
 | 
						|
	.name		= "locomo",
 | 
						|
	.id		= 0,
 | 
						|
	.dev		= {
 | 
						|
		.platform_data	= &locomo_info,
 | 
						|
	},
 | 
						|
	.num_resources	= ARRAY_SIZE(locomo_resources),
 | 
						|
	.resource	= locomo_resources,
 | 
						|
};
 | 
						|
 | 
						|
static struct gpio_keys_button collie_gpio_keys[] = {
 | 
						|
	{
 | 
						|
		.type	= EV_PWR,
 | 
						|
		.code	= KEY_RESERVED,
 | 
						|
		.gpio	= COLLIE_GPIO_ON_KEY,
 | 
						|
		.desc	= "On key",
 | 
						|
		.wakeup	= 1,
 | 
						|
		.active_low = 1,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.type	= EV_PWR,
 | 
						|
		.code	= KEY_WAKEUP,
 | 
						|
		.gpio	= COLLIE_GPIO_WAKEUP,
 | 
						|
		.desc	= "Sync",
 | 
						|
		.wakeup = 1,
 | 
						|
		.active_low = 1,
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static struct gpio_keys_platform_data collie_gpio_keys_data = {
 | 
						|
	.buttons	= collie_gpio_keys,
 | 
						|
	.nbuttons	= ARRAY_SIZE(collie_gpio_keys),
 | 
						|
};
 | 
						|
 | 
						|
static struct platform_device collie_gpio_keys_device = {
 | 
						|
	.name	= "gpio-keys",
 | 
						|
	.id	= -1,
 | 
						|
	.dev	= {
 | 
						|
		.platform_data = &collie_gpio_keys_data,
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static struct platform_device *devices[] __initdata = {
 | 
						|
	&collie_locomo_device,
 | 
						|
	&colliescoop_device,
 | 
						|
	&collie_power_device,
 | 
						|
	&collie_gpio_keys_device,
 | 
						|
};
 | 
						|
 | 
						|
static struct mtd_partition collie_partitions[] = {
 | 
						|
	{
 | 
						|
		.name		= "bootloader",
 | 
						|
		.offset 	= 0,
 | 
						|
		.size		= 0x000C0000,
 | 
						|
		.mask_flags	= MTD_WRITEABLE
 | 
						|
	}, {
 | 
						|
		.name		= "kernel",
 | 
						|
		.offset 	= MTDPART_OFS_APPEND,
 | 
						|
		.size		= 0x00100000,
 | 
						|
	}, {
 | 
						|
		.name		= "rootfs",
 | 
						|
		.offset 	= MTDPART_OFS_APPEND,
 | 
						|
		.size		= 0x00e20000,
 | 
						|
	}, {
 | 
						|
		.name		= "bootblock",
 | 
						|
		.offset		= MTDPART_OFS_APPEND,
 | 
						|
		.size		= 0x00020000,
 | 
						|
		.mask_flags	= MTD_WRITEABLE
 | 
						|
	}
 | 
						|
};
 | 
						|
 | 
						|
static int collie_flash_init(void)
 | 
						|
{
 | 
						|
	int rc = gpio_request(COLLIE_GPIO_VPEN, "flash Vpp enable");
 | 
						|
	if (rc)
 | 
						|
		return rc;
 | 
						|
 | 
						|
	rc = gpio_direction_output(COLLIE_GPIO_VPEN, 1);
 | 
						|
	if (rc)
 | 
						|
		gpio_free(COLLIE_GPIO_VPEN);
 | 
						|
 | 
						|
	return rc;
 | 
						|
}
 | 
						|
 | 
						|
static void collie_set_vpp(int vpp)
 | 
						|
{
 | 
						|
	gpio_set_value(COLLIE_GPIO_VPEN, vpp);
 | 
						|
}
 | 
						|
 | 
						|
static void collie_flash_exit(void)
 | 
						|
{
 | 
						|
	gpio_free(COLLIE_GPIO_VPEN);
 | 
						|
}
 | 
						|
 | 
						|
static struct flash_platform_data collie_flash_data = {
 | 
						|
	.map_name	= "cfi_probe",
 | 
						|
	.init		= collie_flash_init,
 | 
						|
	.set_vpp	= collie_set_vpp,
 | 
						|
	.exit		= collie_flash_exit,
 | 
						|
	.parts		= collie_partitions,
 | 
						|
	.nr_parts	= ARRAY_SIZE(collie_partitions),
 | 
						|
};
 | 
						|
 | 
						|
static struct resource collie_flash_resources[] = {
 | 
						|
	DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M),
 | 
						|
};
 | 
						|
 | 
						|
static struct sa1100fb_mach_info collie_lcd_info = {
 | 
						|
	.pixclock	= 171521,	.bpp		= 16,
 | 
						|
	.xres		= 320,		.yres		= 240,
 | 
						|
 | 
						|
	.hsync_len	= 5,		.vsync_len	= 1,
 | 
						|
	.left_margin	= 11,		.upper_margin	= 2,
 | 
						|
	.right_margin	= 30,		.lower_margin	= 0,
 | 
						|
 | 
						|
	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
 | 
						|
 | 
						|
	.lccr0		= LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
 | 
						|
	.lccr3		= LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),
 | 
						|
 | 
						|
#ifdef CONFIG_BACKLIGHT_LOCOMO
 | 
						|
	.lcd_power	= locomolcd_power
 | 
						|
#endif
 | 
						|
};
 | 
						|
 | 
						|
static void __init collie_init(void)
 | 
						|
{
 | 
						|
	int ret = 0;
 | 
						|
 | 
						|
	/* cpu initialize */
 | 
						|
	GAFR = GPIO_SSP_TXD | GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SSP_CLK |
 | 
						|
		GPIO_MCP_CLK | GPIO_32_768kHz;
 | 
						|
 | 
						|
	GPDR = GPIO_LDD8 | GPIO_LDD9 | GPIO_LDD10 | GPIO_LDD11 | GPIO_LDD12 |
 | 
						|
		GPIO_LDD13 | GPIO_LDD14 | GPIO_LDD15 | GPIO_SSP_TXD |
 | 
						|
		GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SDLC_SCLK |
 | 
						|
		_COLLIE_GPIO_UCB1x00_RESET | _COLLIE_GPIO_nMIC_ON |
 | 
						|
		_COLLIE_GPIO_nREMOCON_ON | GPIO_32_768kHz;
 | 
						|
 | 
						|
	PPDR = PPC_LDD0 | PPC_LDD1 | PPC_LDD2 | PPC_LDD3 | PPC_LDD4 | PPC_LDD5 |
 | 
						|
		PPC_LDD6 | PPC_LDD7 | PPC_L_PCLK | PPC_L_LCLK | PPC_L_FCLK | PPC_L_BIAS |
 | 
						|
		PPC_TXD1 | PPC_TXD2 | PPC_TXD3 | PPC_TXD4 | PPC_SCLK | PPC_SFRM;
 | 
						|
 | 
						|
	PWER = 0;
 | 
						|
 | 
						|
	PGSR = _COLLIE_GPIO_nREMOCON_ON;
 | 
						|
 | 
						|
	PSDR = PPC_RXD1 | PPC_RXD2 | PPC_RXD3 | PPC_RXD4;
 | 
						|
 | 
						|
	PCFR = PCFR_OPDE;
 | 
						|
 | 
						|
	GPSR |= _COLLIE_GPIO_UCB1x00_RESET;
 | 
						|
 | 
						|
	sa11x0_ppc_configure_mcp();
 | 
						|
 | 
						|
 | 
						|
	platform_scoop_config = &collie_pcmcia_config;
 | 
						|
 | 
						|
	ret = platform_add_devices(devices, ARRAY_SIZE(devices));
 | 
						|
	if (ret) {
 | 
						|
		printk(KERN_WARNING "collie: Unable to register LoCoMo device\n");
 | 
						|
	}
 | 
						|
 | 
						|
	sa11x0_register_lcd(&collie_lcd_info);
 | 
						|
	sa11x0_register_mtd(&collie_flash_data, collie_flash_resources,
 | 
						|
			    ARRAY_SIZE(collie_flash_resources));
 | 
						|
	sa11x0_register_mcp(&collie_mcp_data);
 | 
						|
	sa11x0_register_irda(&collie_ir_data);
 | 
						|
 | 
						|
	sharpsl_save_param();
 | 
						|
}
 | 
						|
 | 
						|
static struct map_desc collie_io_desc[] __initdata = {
 | 
						|
	{	/* 32M main flash (cs0) */
 | 
						|
		.virtual	= 0xe8000000,
 | 
						|
		.pfn		= __phys_to_pfn(0x00000000),
 | 
						|
		.length		= 0x02000000,
 | 
						|
		.type		= MT_DEVICE
 | 
						|
	}, {	/* 32M boot flash (cs1) */
 | 
						|
		.virtual	= 0xea000000,
 | 
						|
		.pfn		= __phys_to_pfn(0x08000000),
 | 
						|
		.length		= 0x02000000,
 | 
						|
		.type		= MT_DEVICE
 | 
						|
	}
 | 
						|
};
 | 
						|
 | 
						|
static void __init collie_map_io(void)
 | 
						|
{
 | 
						|
	sa1100_map_io();
 | 
						|
	iotable_init(collie_io_desc, ARRAY_SIZE(collie_io_desc));
 | 
						|
 | 
						|
#ifdef CONFIG_SHARP_LOCOMO
 | 
						|
	sa1100_register_uart_fns(&collie_port_fns);
 | 
						|
#endif
 | 
						|
	sa1100_register_uart(0, 3);
 | 
						|
	sa1100_register_uart(1, 1);
 | 
						|
}
 | 
						|
 | 
						|
MACHINE_START(COLLIE, "Sharp-Collie")
 | 
						|
	.map_io		= collie_map_io,
 | 
						|
	.nr_irqs	= SA1100_NR_IRQS,
 | 
						|
	.init_irq	= sa1100_init_irq,
 | 
						|
	.init_time	= sa1100_timer_init,
 | 
						|
	.init_machine	= collie_init,
 | 
						|
	.init_late	= sa11x0_init_late,
 | 
						|
	.restart	= sa11x0_restart,
 | 
						|
MACHINE_END
 |