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

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

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

* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
  sh: Ignore R_SH_NONE module relocations.
  SH: SE7751: Fix pcibios_map_platform_irq prototype.
  sh: remove warning and warning_symbol from struct stacktrace_ops
  sh: wire up sys_sendmmsg.
  clocksource: sh_tmu: Runtime PM support
  clocksource: sh_tmu: __clocksource_updatefreq_hz() update
  clocksource: sh_cmt: Runtime PM support
  clocksource: sh_cmt: __clocksource_updatefreq_hz() update
  dmaengine: shdma: synchronize RCU before freeing, simplify spinlock
  dmaengine: shdma: add runtime- and system-level power management
  dmaengine: shdma: fix locking
  sh: sh-sci: sh7377 and sh73a0 build fixes
  sh: cosmetic improvement: use an existing pointer
  serial: sh-sci: suspend/resume wakeup support V2
  serial: sh-sci: Runtime PM support
  sh: select IRQ_FORCED_THREADING.
  sh: intc: Set virtual IRQs as nothread.
  sh: fixup fpu.o compile order
  i2c: add a module alias to the sh-mobile driver
  ALSA: add a module alias to the FSI driver
  ...
parents 52146383 78207ffd

arch/sh/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ config SUPERH 
	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_GENERIC_HARDIRQS

	select HAVE_GENERIC_HARDIRQS

	select HAVE_SPARSE_IRQ

	select HAVE_SPARSE_IRQ

	select IRQ_FORCED_THREADING

	select RTC_LIB

	select RTC_LIB

	select GENERIC_ATOMIC64

	select GENERIC_ATOMIC64

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW

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

+9 −9
Original line number Original line Diff line number Diff line
@@ -482,7 +482,7 @@ static struct i2c_board_info ts_i2c_clients = { 
	.irq		= IRQ0,

	.irq		= IRQ0,

};

};





#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)

#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)

/* SDHI0 */

/* SDHI0 */

static void sdhi0_set_pwr(struct platform_device *pdev, int state)

static void sdhi0_set_pwr(struct platform_device *pdev, int state)

{

{
@@ -522,7 +522,7 @@ static struct platform_device sdhi0_device = { 
	},

	},

};

};





#if !defined(CONFIG_MMC_SH_MMCIF)

#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)

/* SDHI1 */

/* SDHI1 */

static void sdhi1_set_pwr(struct platform_device *pdev, int state)

static void sdhi1_set_pwr(struct platform_device *pdev, int state)

{

{
@@ -836,7 +836,7 @@ static struct platform_device vou_device = { 
	},

	},

};

};





#if defined(CONFIG_MMC_SH_MMCIF)

#if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)

/* SH_MMCIF */

/* SH_MMCIF */

static void mmcif_set_pwr(struct platform_device *pdev, int state)

static void mmcif_set_pwr(struct platform_device *pdev, int state)

{

{
@@ -898,9 +898,9 @@ static struct platform_device *ecovec_devices[] __initdata = { 
	&ceu0_device,

	&ceu0_device,

	&ceu1_device,

	&ceu1_device,

	&keysc_device,

	&keysc_device,

#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)

#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)

	&sdhi0_device,

	&sdhi0_device,

#if !defined(CONFIG_MMC_SH_MMCIF)

#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)

	&sdhi1_device,

	&sdhi1_device,

#endif

#endif

#else

#else
@@ -912,7 +912,7 @@ static struct platform_device *ecovec_devices[] __initdata = { 
	&fsi_device,

	&fsi_device,

	&irda_device,

	&irda_device,

	&vou_device,

	&vou_device,

#if defined(CONFIG_MMC_SH_MMCIF)

#if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)

	&sh_mmcif_device,

	&sh_mmcif_device,

#endif

#endif

};

};
@@ -1180,7 +1180,7 @@ static int __init arch_setup(void) 
	gpio_direction_input(GPIO_PTR5);

	gpio_direction_input(GPIO_PTR5);

	gpio_direction_input(GPIO_PTR6);

	gpio_direction_input(GPIO_PTR6);





#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)

#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)

	/* enable SDHI0 on CN11 (needs DS2.4 set to ON) */

	/* enable SDHI0 on CN11 (needs DS2.4 set to ON) */

	gpio_request(GPIO_FN_SDHI0CD,  NULL);

	gpio_request(GPIO_FN_SDHI0CD,  NULL);

	gpio_request(GPIO_FN_SDHI0WP,  NULL);

	gpio_request(GPIO_FN_SDHI0WP,  NULL);
@@ -1193,7 +1193,7 @@ static int __init arch_setup(void) 
	gpio_request(GPIO_PTB6, NULL);

	gpio_request(GPIO_PTB6, NULL);

	gpio_direction_output(GPIO_PTB6, 0);

	gpio_direction_output(GPIO_PTB6, 0);





#if !defined(CONFIG_MMC_SH_MMCIF)

#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)

	/* enable SDHI1 on CN12 (needs DS2.6,7 set to ON,OFF) */

	/* enable SDHI1 on CN12 (needs DS2.6,7 set to ON,OFF) */

	gpio_request(GPIO_FN_SDHI1CD,  NULL);

	gpio_request(GPIO_FN_SDHI1CD,  NULL);

	gpio_request(GPIO_FN_SDHI1WP,  NULL);

	gpio_request(GPIO_FN_SDHI1WP,  NULL);
@@ -1284,7 +1284,7 @@ static int __init arch_setup(void) 
	gpio_request(GPIO_PTU5, NULL);

	gpio_request(GPIO_PTU5, NULL);

	gpio_direction_output(GPIO_PTU5, 0);

	gpio_direction_output(GPIO_PTU5, 0);





#if defined(CONFIG_MMC_SH_MMCIF)

#if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)

	/* enable MMCIF (needs DS2.6,7 set to OFF,ON) */

	/* enable MMCIF (needs DS2.6,7 set to OFF,ON) */

	gpio_request(GPIO_FN_MMC_D7, NULL);

	gpio_request(GPIO_FN_MMC_D7, NULL);

	gpio_request(GPIO_FN_MMC_D6, NULL);

	gpio_request(GPIO_FN_MMC_D6, NULL);

arch/sh/configs/ecovec24_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -115,7 +115,7 @@ CONFIG_USB_GADGET=y 
CONFIG_USB_FILE_STORAGE=m

CONFIG_USB_FILE_STORAGE=m

CONFIG_MMC=y

CONFIG_MMC=y

CONFIG_MMC_SPI=y

CONFIG_MMC_SPI=y

CONFIG_MMC_TMIO=y

CONFIG_MMC_SDHI=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_RS5C372=y

CONFIG_RTC_DRV_RS5C372=y

CONFIG_UIO=y

CONFIG_UIO=y

arch/sh/configs/sh7757lcr_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ CONFIG_USB_EHCI_HCD=y 
CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC=y

CONFIG_MMC_TMIO=y

CONFIG_MMC_SDHI=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS=y

arch/sh/drivers/pci/fixups-se7751.c

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

#include <linux/io.h>

#include "pci-sh4.h"

#include "pci-sh4.h"





int __init pcibios_map_platform_irq(u8 slot, u8 pin)

int __init pcibios_map_platform_irq(struct pci_dev *, u8 slot, u8 pin)

{

{

        switch (slot) {

        switch (slot) {

        case 0: return 13;

        case 0: return 13;