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

Commit 6febf65b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'sh/for-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: ap325rxa: Revert ov772x support.
  serial: sh-sci: fix overrun error handling for SH7785 SCIF.
  sh: Storage class should be before const qualifier
parents 174eef11 08c2f5b4

arch/sh/boards/board-ap325rxa.c

+3 −50
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/gpio.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi_gpio.h>

#include <media/ov772x.h>

#include <media/soc_camera_platform.h>

#include <media/sh_mobile_ceu.h>

#include <video/sh_mobile_lcdc.h>
@@ -224,7 +223,6 @@ static void camera_power(int val) 
}



#ifdef CONFIG_I2C

/* support for the old ncm03j camera */

static unsigned char camera_ncm03j_magic[] =

{

	0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8,
@@ -245,23 +243,6 @@ static unsigned char camera_ncm03j_magic[] = 
	0x63, 0xD4, 0x64, 0xEA, 0xD6, 0x0F,

};



static int camera_probe(void)

{

	struct i2c_adapter *a = i2c_get_adapter(0);

	struct i2c_msg msg;

	int ret;



	camera_power(1);

	msg.addr = 0x6e;

	msg.buf = camera_ncm03j_magic;

	msg.len = 2;

	msg.flags = 0;

	ret = i2c_transfer(a, &msg, 1);

	camera_power(0);



	return ret;

}



static int camera_set_capture(struct soc_camera_platform_info *info,

			      int enable)

{
@@ -313,35 +294,8 @@ static struct platform_device camera_device = { 
		.platform_data	= &camera_info,

	},

};



static int __init camera_setup(void)

{

	if (camera_probe() > 0)

		platform_device_register(&camera_device);



	return 0;

}

late_initcall(camera_setup);



#endif /* CONFIG_I2C */



static int ov7725_power(struct device *dev, int mode)

{

	camera_power(0);

	if (mode)

		camera_power(1);



	return 0;

}



static struct ov772x_camera_info ov7725_info = {

	.buswidth  = SOCAM_DATAWIDTH_8,

	.flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,

	.link = {

		.power  = ov7725_power,

	},

};



static struct sh_mobile_ceu_info sh_mobile_ceu_info = {

	.flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |

	SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
@@ -392,6 +346,9 @@ static struct platform_device *ap325rxa_devices[] __initdata = { 
	&ap325rxa_nor_flash_device,

	&lcdc_device,

	&ceu_device,

#ifdef CONFIG_I2C

	&camera_device,

#endif

	&nand_flash_device,

	&sdcard_cn3_device,

};
@@ -400,10 +357,6 @@ static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = { 
	{

		I2C_BOARD_INFO("pcf8563", 0x51),

	},

	{

		I2C_BOARD_INFO("ov772x", 0x21),

		.platform_data = &ov7725_info,

	},

};



static struct spi_board_info ap325rxa_spi_devices[] = {

arch/sh/kernel/cpu/sh2a/clock-sh7201.c

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
#include <asm/freq.h>

#include <asm/io.h>



const static int pll1rate[]={1,2,3,4,6,8};

const static int pfc_divisors[]={1,2,3,4,6,8,12};

static const int pll1rate[]={1,2,3,4,6,8};

static const int pfc_divisors[]={1,2,3,4,6,8,12};

#define ifc_divisors pfc_divisors



#if (CONFIG_SH_CLK_MD == 0)

drivers/serial/sh-sci.h

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ 
# define SCSPTR3	0xffed0024	/* 16 bit SCIF */

# define SCSPTR4	0xffee0024	/* 16 bit SCIF */

# define SCSPTR5	0xffef0024	/* 16 bit SCIF */

# define SCIF_OPER	0x0001		/* Overrun error bit */

# define SCIF_ORER	0x0001		/* Overrun error bit */

# define SCSCR_INIT(port)	0x3a	/* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */

#elif defined(CONFIG_CPU_SUBTYPE_SH7201) || \

      defined(CONFIG_CPU_SUBTYPE_SH7203) || \