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

Commit 41733e89 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'rmobile/kota2' into rmobile-fixes-for-linus

parents c2bc3a31 2fde109c

arch/arm/mach-shmobile/board-kota2.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -143,11 +143,10 @@ static struct gpio_keys_button gpio_buttons[] = { 
static struct gpio_keys_platform_data gpio_key_info = {

static struct gpio_keys_platform_data gpio_key_info = {

	.buttons        = gpio_buttons,

	.buttons        = gpio_buttons,

	.nbuttons       = ARRAY_SIZE(gpio_buttons),

	.nbuttons       = ARRAY_SIZE(gpio_buttons),

	.poll_interval  = 250, /* polled for now */

};

};





static struct platform_device gpio_keys_device = {

static struct platform_device gpio_keys_device = {

	.name   = "gpio-keys-polled", /* polled for now */

	.name   = "gpio-keys",

	.id     = -1,

	.id     = -1,

	.dev    = {

	.dev    = {

		.platform_data  = &gpio_key_info,

		.platform_data  = &gpio_key_info,

arch/arm/mach-shmobile/include/mach/sh73a0.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -515,8 +515,8 @@ enum { 
	SHDMA_SLAVE_MMCIF_RX,

	SHDMA_SLAVE_MMCIF_RX,

};

};





/* PINT interrupts are located at Linux IRQ 768 and up */

/* PINT interrupts are located at Linux IRQ 800 and up */

#define SH73A0_PINT0_IRQ(irq) ((irq) + 768)

#define SH73A0_PINT0_IRQ(irq) ((irq) + 800)

#define SH73A0_PINT1_IRQ(irq) ((irq) + 800)

#define SH73A0_PINT1_IRQ(irq) ((irq) + 832)





#endif /* __ASM_SH73A0_H__ */
 
#endif /* __ASM_SH73A0_H__ */

arch/arm/mach-shmobile/intc-sh73a0.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/sh_intc.h>

#include <linux/sh_intc.h>
@@ -445,6 +446,7 @@ void __init sh73a0_init_irq(void) 
		setup_irq(gic_spi(1 + k), &sh73a0_irq_pin_cascade[k]);

		setup_irq(gic_spi(1 + k), &sh73a0_irq_pin_cascade[k]);





		n = intcs_evt2irq(to_intc_vect(gic_spi(1 + k)));

		n = intcs_evt2irq(to_intc_vect(gic_spi(1 + k)));

		WARN_ON(irq_alloc_desc_at(n, numa_node_id()) != n);

		irq_set_chip_and_handler_name(n, &intca_gic_irq_chip,

		irq_set_chip_and_handler_name(n, &intca_gic_irq_chip,

					      handle_level_irq, "level");

					      handle_level_irq, "level");

		set_irq_flags(n, IRQF_VALID); /* yuck */

		set_irq_flags(n, IRQF_VALID); /* yuck */