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

Commit 09cd5b8f 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: Fix up T-bit error handling in SH-4A mutex fastpath.
  sh: Fix up spurious syscall restarting.
  sh: fcnvds fix with denormalized numbers on SH-4 FPU.
  sh: Only reserve memory under CONFIG_ZERO_PAGE_OFFSET when it != 0.
  sh: Handle calling csum_partial with misaligned data
  sh: ap325rxa: Enable ov772x in defconfig.
  sh: ap325rxa: Add ov772x support.
  sh: ap325rxa: control camera power toggling.
  sh: mach-migor: Enable ov772x and tw9910 in defconfig.
parents cc5724ce c20f326a

arch/sh/boards/board-ap325rxa.c

+59 −4
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#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>
@@ -216,7 +217,14 @@ static struct platform_device lcdc_device = { 
	},

};



static void camera_power(int val)

{

	gpio_set_value(GPIO_PTZ5, val); /* RST_CAM/RSTB */

	mdelay(10);

}



#ifdef CONFIG_I2C

/* support for the old ncm03j camera */

static unsigned char camera_ncm03j_magic[] =

{

	0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8,
@@ -237,6 +245,23 @@ 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)

{
@@ -245,9 +270,11 @@ static int camera_set_capture(struct soc_camera_platform_info *info, 
	int ret = 0;

	int i;



	camera_power(0);

	if (!enable)

		return 0; /* no disable for now */



	camera_power(1);

	for (i = 0; i < ARRAY_SIZE(camera_ncm03j_magic); i += 2) {

		u_int8_t buf[8];
@@ -286,8 +313,35 @@ 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,
@@ -338,9 +392,6 @@ 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,

};
@@ -349,6 +400,10 @@ 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[] = {
@@ -426,7 +481,7 @@ static int __init ap325rxa_devices_setup(void) 
	gpio_request(GPIO_PTZ6, NULL);

	gpio_direction_output(GPIO_PTZ6, 0); /* STBY_CAM */

	gpio_request(GPIO_PTZ5, NULL);

	gpio_direction_output(GPIO_PTZ5, 1); /* RST_CAM */

	gpio_direction_output(GPIO_PTZ5, 0); /* RST_CAM */

	gpio_request(GPIO_PTZ4, NULL);

	gpio_direction_output(GPIO_PTZ4, 0); /* SADDR */

arch/sh/configs/ap325rxa_defconfig

+20 −7
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.28

# Fri Jan  9 16:54:19 2009

# Linux kernel version: 2.6.29-rc2

# Tue Jan 27 11:45:08 2009

#

CONFIG_SUPERH=y

CONFIG_SUPERH32=y
@@ -45,12 +45,12 @@ CONFIG_BSD_PROCESS_ACCT=y 
# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

CONFIG_GROUP_SCHED=y

CONFIG_FAIR_GROUP_SCHED=y

# CONFIG_RT_GROUP_SCHED is not set

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

# CONFIG_CGROUPS is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_RELAY is not set
@@ -378,6 +378,7 @@ CONFIG_WIRELESS=y 
# CONFIG_WIRELESS_EXT is not set

# CONFIG_LIB80211 is not set

# CONFIG_MAC80211 is not set

# CONFIG_WIMAX is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set
@@ -400,6 +401,7 @@ CONFIG_MTD=y 
# CONFIG_MTD_DEBUG is not set

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

# CONFIG_MTD_TESTS is not set

# CONFIG_MTD_REDBOOT_PARTS is not set

CONFIG_MTD_CMDLINE_PARTS=y

# CONFIG_MTD_AR7_PARTS is not set
@@ -447,9 +449,7 @@ CONFIG_MTD_CFI_UTIL=y 
#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PHYSMAP_START=0xffffffff

CONFIG_MTD_PHYSMAP_LEN=0

CONFIG_MTD_PHYSMAP_BANKWIDTH=0

# CONFIG_MTD_PHYSMAP_COMPAT is not set

# CONFIG_MTD_PLATRAM is not set



#
@@ -479,6 +479,12 @@ CONFIG_MTD_NAND_IDS=y 
CONFIG_MTD_NAND_SH_FLCTL=y

# CONFIG_MTD_ONENAND is not set



#

# LPDDR flash memory drivers

#

# CONFIG_MTD_LPDDR is not set

# CONFIG_MTD_QINFO_PROBE is not set



#

# UBI - Unsorted block images

#
@@ -607,6 +613,10 @@ CONFIG_SMSC911X=y 
# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_IWLWIFI_LEDS is not set



#

# Enable WiMAX (Networking options) to see the WiMAX drivers

#

# CONFIG_WAN is not set

# CONFIG_PPP is not set

# CONFIG_SLIP is not set
@@ -790,6 +800,7 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_PMIC_DA903X is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_PCF50633 is not set

# CONFIG_REGULATOR is not set



#
@@ -837,7 +848,7 @@ CONFIG_SOC_CAMERA=y 
# CONFIG_SOC_CAMERA_MT9V022 is not set

# CONFIG_SOC_CAMERA_TW9910 is not set

CONFIG_SOC_CAMERA_PLATFORM=y

# CONFIG_SOC_CAMERA_OV772X is not set

CONFIG_SOC_CAMERA_OV772X=y

CONFIG_VIDEO_SH_MOBILE_CEU=y

# CONFIG_RADIO_ADAPTERS is not set

# CONFIG_DAB is not set
@@ -1012,6 +1023,7 @@ CONFIG_FS_POSIX_ACL=y 
CONFIG_FILE_LOCKING=y

# CONFIG_XFS_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y
@@ -1060,6 +1072,7 @@ CONFIG_MISC_FILESYSTEMS=y 
# CONFIG_JFFS2_FS is not set

# CONFIG_UBIFS_FS is not set

# CONFIG_CRAMFS is not set

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_OMFS_FS is not set

arch/sh/configs/migor_defconfig

+33 −9
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.28

# Fri Jan  9 17:09:35 2009

# Linux kernel version: 2.6.29-rc1

# Thu Jan 22 09:16:16 2009

#

CONFIG_SUPERH=y

CONFIG_SUPERH32=y
@@ -45,8 +45,12 @@ CONFIG_SYSVIPC_SYSCTL=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

# CONFIG_GROUP_SCHED is not set



#

# Control Group support

#

# CONFIG_CGROUPS is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_RELAY is not set
@@ -389,6 +393,7 @@ CONFIG_WIRELESS_EXT=y 
CONFIG_WIRELESS_EXT_SYSFS=y

# CONFIG_LIB80211 is not set

# CONFIG_MAC80211 is not set

# CONFIG_WIMAX is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set
@@ -411,6 +416,7 @@ CONFIG_MTD=y 
# CONFIG_MTD_DEBUG is not set

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

# CONFIG_MTD_TESTS is not set

# CONFIG_MTD_REDBOOT_PARTS is not set

CONFIG_MTD_CMDLINE_PARTS=y

# CONFIG_MTD_AR7_PARTS is not set
@@ -458,9 +464,7 @@ CONFIG_MTD_CFI_UTIL=y 
#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PHYSMAP_START=0xffffffff

CONFIG_MTD_PHYSMAP_LEN=0

CONFIG_MTD_PHYSMAP_BANKWIDTH=0

# CONFIG_MTD_PHYSMAP_COMPAT is not set

# CONFIG_MTD_PLATRAM is not set



#
@@ -487,6 +491,12 @@ CONFIG_MTD_NAND_IDS=y 
CONFIG_MTD_NAND_PLATFORM=y

# CONFIG_MTD_ONENAND is not set



#

# LPDDR flash memory drivers

#

# CONFIG_MTD_LPDDR is not set

# CONFIG_MTD_QINFO_PROBE is not set



#

# UBI - Unsorted block images

#
@@ -587,6 +597,10 @@ CONFIG_SMC91X=y 
# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_IWLWIFI_LEDS is not set



#

# Enable WiMAX (Networking options) to see the WiMAX drivers

#

# CONFIG_WAN is not set

# CONFIG_PPP is not set

# CONFIG_SLIP is not set
@@ -761,6 +775,7 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_PMIC_DA903X is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_PCF50633 is not set

# CONFIG_REGULATOR is not set



#
@@ -806,9 +821,9 @@ CONFIG_SOC_CAMERA=y 
# CONFIG_SOC_CAMERA_MT9M111 is not set

# CONFIG_SOC_CAMERA_MT9T031 is not set

# CONFIG_SOC_CAMERA_MT9V022 is not set

# CONFIG_SOC_CAMERA_TW9910 is not set

CONFIG_SOC_CAMERA_PLATFORM=y

# CONFIG_SOC_CAMERA_OV772X is not set

CONFIG_SOC_CAMERA_TW9910=y

# CONFIG_SOC_CAMERA_PLATFORM is not set

CONFIG_SOC_CAMERA_OV772X=y

CONFIG_VIDEO_SH_MOBILE_CEU=y

# CONFIG_RADIO_ADAPTERS is not set

# CONFIG_DAB is not set
@@ -866,11 +881,13 @@ CONFIG_USB_GADGET_SELECTED=y 
# CONFIG_USB_GADGET_PXA25X is not set

# CONFIG_USB_GADGET_PXA27X is not set

# CONFIG_USB_GADGET_S3C2410 is not set

# CONFIG_USB_GADGET_IMX is not set

CONFIG_USB_GADGET_M66592=y

CONFIG_USB_M66592=y

CONFIG_SUPERH_BUILT_IN_M66592=y

# CONFIG_USB_GADGET_AMD5536UDC is not set

# CONFIG_USB_GADGET_FSL_QE is not set

# CONFIG_USB_GADGET_CI13XXX is not set

# CONFIG_USB_GADGET_NET2280 is not set

# CONFIG_USB_GADGET_GOKU is not set

# CONFIG_USB_GADGET_DUMMY_HCD is not set
@@ -883,6 +900,11 @@ CONFIG_USB_G_SERIAL=y 
# CONFIG_USB_MIDI_GADGET is not set

# CONFIG_USB_G_PRINTER is not set

# CONFIG_USB_CDC_COMPOSITE is not set



#

# OTG and related infrastructure

#

# CONFIG_USB_GPIO_VBUS is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set
@@ -961,6 +983,7 @@ CONFIG_UIO_PDRV_GENIRQ=y 
CONFIG_FILE_LOCKING=y

# CONFIG_XFS_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY is not set

# CONFIG_QUOTA is not set
@@ -1004,6 +1027,7 @@ CONFIG_MISC_FILESYSTEMS=y 
# CONFIG_EFS_FS is not set

# CONFIG_JFFS2_FS is not set

# CONFIG_CRAMFS is not set

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_OMFS_FS is not set

arch/sh/include/asm/mutex-llsc.h

+9 −12
Original line number Diff line number Diff line
@@ -21,38 +21,36 @@ 
static inline void

__mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *))

{

	int __ex_flag, __res;

	int __done, __res;



	__asm__ __volatile__ (

		"movli.l	@%2, %0	\n"

		"add		#-1, %0	\n"

		"movco.l	%0, @%2	\n"

		"movt		%1	\n"

		: "=&z" (__res), "=&r" (__ex_flag)

		: "=&z" (__res), "=&r" (__done)

		: "r" (&(count)->counter)

		: "t");



	__res |= !__ex_flag;

	if (unlikely(__res != 0))

	if (unlikely(!__done || __res != 0))

		fail_fn(count);

}



static inline int

__mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *))

{

	int __ex_flag, __res;

	int __done, __res;



	__asm__ __volatile__ (

		"movli.l	@%2, %0	\n"

		"add		#-1, %0	\n"

		"movco.l	%0, @%2	\n"

		"movt		%1	\n"

		: "=&z" (__res), "=&r" (__ex_flag)

		: "=&z" (__res), "=&r" (__done)

		: "r" (&(count)->counter)

		: "t");



	__res |= !__ex_flag;

	if (unlikely(__res != 0))

	if (unlikely(!__done || __res != 0))

		__res = fail_fn(count);



	return __res;
@@ -61,19 +59,18 @@ __mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *)) 
static inline void

__mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *))

{

	int __ex_flag, __res;

	int __done, __res;



	__asm__ __volatile__ (

		"movli.l	@%2, %0	\n\t"

		"add		#1, %0	\n\t"

		"movco.l	%0, @%2 \n\t"

		"movt		%1	\n\t"

		: "=&z" (__res), "=&r" (__ex_flag)

		: "=&z" (__res), "=&r" (__done)

		: "r" (&(count)->counter)

		: "t");



	__res |= !__ex_flag;

	if (unlikely(__res <= 0))

	if (unlikely(!__done || __res <= 0))

		fail_fn(count);

}

arch/sh/include/asm/syscall_32.h

+3 −19
Original line number Diff line number Diff line
@@ -21,23 +21,10 @@ static inline void syscall_rollback(struct task_struct *task, 
	 */

}



static inline bool syscall_has_error(struct pt_regs *regs)

{

	return (regs->sr & 0x1) ? true : false;

}

static inline void syscall_set_error(struct pt_regs *regs)

{

	regs->sr |= 0x1;

}

static inline void syscall_clear_error(struct pt_regs *regs)

{

	regs->sr &= ~0x1;

}



static inline long syscall_get_error(struct task_struct *task,

				     struct pt_regs *regs)

{

	return syscall_has_error(regs) ? regs->regs[0] : 0;

	return IS_ERR_VALUE(regs->regs[0]) ? regs->regs[0] : 0;

}



static inline long syscall_get_return_value(struct task_struct *task,
@@ -50,14 +37,11 @@ static inline void syscall_set_return_value(struct task_struct *task, 
					    struct pt_regs *regs,

					    int error, long val)

{

	if (error) {

		syscall_set_error(regs);

	if (error)

		regs->regs[0] = -error;

	} else {

		syscall_clear_error(regs);

	else

		regs->regs[0] = val;

}

}



static inline void syscall_get_arguments(struct task_struct *task,

					 struct pt_regs *regs,