Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14421383 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Don't allocate smaller sized mappings on every iteration
  sh: Try PMB mapping based on physical address, not mapping size
  sh: Plug PMB alloc memory leak
  sh: Sprinkle __uses_jump_to_uncached
  sh: enable sleep state LEDs on Ecovec24
  usb: r8a66597-udc unaligned fifo fix
  sh: mach-ecovec24: Document DS2 switch settings.
  sh: Build fix: export __movmem
  sh: Disable unaligned kernel access printks by default.
  sh: mach-ecovec24: modify 1st MTD area to read only
  sh: mach-ecovec24: Add TouchScreen support
  sh: magicpanelr2 and dreamcast can use the generic I/O base.
  sh: Don't enable interrupts in the page fault path
  sh: Set the default I/O port base to P2SEG.
  sh: Handle ioport_map() cases for >= P1SEG addresses.
parents 902ff186 a2767cfb

arch/sh/boards/board-magicpanelr2.c

+0 −2
Original line number Diff line number Diff line
@@ -205,8 +205,6 @@ static void __init setup_port_multiplexing(void) 


static void __init mpr2_setup(char **cmdline_p)

{

	__set_io_port_base(0xa0000000);



	/* set Pin Select Register A:

	 * /PCC_CD1, /PCC_CD2,  PCC_BVD1, PCC_BVD2,

	 * /IOIS16,  IRQ4,	IRQ5,	  USB1d_SUSPEND

arch/sh/boards/mach-dreamcast/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ static void __init dreamcast_setup(char **cmdline_p) 
	/* Acknowledge any previous events */

	/* XXX */



	__set_io_port_base(0xa0000000);



	/* Assign all virtual IRQs to the System ASIC int. handler */

	for (i = HW_EVENT_IRQ_BASE; i < HW_EVENT_IRQ_MAX; i++)

		set_irq_chip_and_handler(i, &systemasic_int,

arch/sh/boards/mach-ecovec24/setup.c

+62 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/delay.h>

#include <linux/usb/r8a66597.h>

#include <linux/i2c.h>

#include <linux/i2c/tsc2007.h>

#include <linux/input.h>

#include <video/sh_mobile_lcdc.h>

#include <media/sh_mobile_ceu.h>
@@ -38,6 +39,20 @@ 
 *  0x1800_0000  MFI              16bit

 */



/* SWITCH

 *------------------------------

 * DS2[1] = FlashROM write protect  ON     : write protect

 *                                  OFF    : No write protect

 * DS2[2] = RMII / TS, SCIF         ON     : RMII

 *                                  OFF    : TS, SCIF3

 * DS2[3] = Camera / Video          ON     : Camera

 *                                  OFF    : NTSC/PAL (IN)

 * DS2[5] = NTSC_OUT Clock          ON     : On board OSC

 *                                  OFF    : SH7724 DV_CLK

 * DS2[6-7] = MMC / SD              ON-OFF : SD

 *                                  OFF-ON : MMC

 */



/* Heartbeat */

static unsigned char led_pos[] = { 0, 1, 2, 3 };

static struct heartbeat_data heartbeat_data = {
@@ -70,7 +85,7 @@ static struct mtd_partition nor_flash_partitions[] = { 
		.name = "boot loader",

		.offset = 0,

		.size = (5 * 1024 * 1024),

		.mask_flags = MTD_CAP_ROM,

		.mask_flags = MTD_WRITEABLE,  /* force read-only */

	}, {

		.name = "free-area",

		.offset = MTDPART_OFS_APPEND,
@@ -376,6 +391,43 @@ static struct platform_device keysc_device = { 
	},

};



/* TouchScreen */

#define IRQ0 32

static int ts_get_pendown_state(void)

{

	int val = 0;

	gpio_free(GPIO_FN_INTC_IRQ0);

	gpio_request(GPIO_PTZ0, NULL);

	gpio_direction_input(GPIO_PTZ0);



	val = gpio_get_value(GPIO_PTZ0);



	gpio_free(GPIO_PTZ0);

	gpio_request(GPIO_FN_INTC_IRQ0, NULL);



	return val ? 0 : 1;

}



static int ts_init(void)

{

	gpio_request(GPIO_FN_INTC_IRQ0, NULL);

	return 0;

}



struct tsc2007_platform_data tsc2007_info = {

	.model			= 2007,

	.x_plate_ohms		= 180,

	.get_pendown_state	= ts_get_pendown_state,

	.init_platform_hw	= ts_init,

};



static struct i2c_board_info ts_i2c_clients = {

	I2C_BOARD_INFO("tsc2007", 0x48),

	.type		= "tsc2007",

	.platform_data	= &tsc2007_info,

	.irq		= IRQ0,

};



static struct platform_device *ecovec_devices[] __initdata = {

	&heartbeat_device,

	&nor_flash_device,
@@ -460,6 +512,11 @@ static void __init sh_eth_init(void) 
#define IODRIVEA  0xA405018A

static int __init arch_setup(void)

{

	/* enable STATUS0, STATUS2 and PDSTATUS */

	gpio_request(GPIO_FN_STATUS0, NULL);

	gpio_request(GPIO_FN_STATUS2, NULL);

	gpio_request(GPIO_FN_PDSTATUS, NULL);



	/* enable SCIFA0 */

	gpio_request(GPIO_FN_SCIF0_TXD, NULL);

	gpio_request(GPIO_FN_SCIF0_RXD, NULL);
@@ -590,6 +647,10 @@ static int __init arch_setup(void) 
		 */

		gpio_request(GPIO_PTF4, NULL);

		gpio_direction_output(GPIO_PTF4, 1);



		/* enable TouchScreen */

		i2c_register_board_info(0, &ts_i2c_clients, 1);

		set_irq_type(IRQ0, IRQ_TYPE_LEVEL_LOW);

	}



	/* enable CEU0 */

arch/sh/kernel/cpu/sh3/entry.S

+0 −2
Original line number Diff line number Diff line
@@ -152,8 +152,6 @@ call_do_page_fault: 
	mov.l	1f, r0

	mov.l	@r0, r6



	sti



	mov.l	3f, r0

	mov.l	4f, r1

	mov	r15, r4

arch/sh/kernel/io_generic.c

+3 −0
Original line number Diff line number Diff line
@@ -147,6 +147,9 @@ void generic_outsl(unsigned long port, const void *src, unsigned long count) 


void __iomem *generic_ioport_map(unsigned long addr, unsigned int size)

{

	if (PXSEG(addr) >= P1SEG)

		return (void __iomem *)addr;



	return (void __iomem *)(addr + generic_io_base);

}