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

Commit cf655c36 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'rmobile/core' into rmobile-latest

parents a7bcf21e 2e351ec6

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

+2 −0
Original line number Diff line number Diff line
@@ -163,11 +163,13 @@ static struct mtd_partition nor_flash_partitions[] = { 
		.name		= "loader",

		.offset		= 0x00000000,

		.size		= 512 * 1024,

		.mask_flags	= MTD_WRITEABLE,

	},

	{

		.name		= "bootenv",

		.offset		= MTDPART_OFS_APPEND,

		.size		= 512 * 1024,

		.mask_flags	= MTD_WRITEABLE,

	},

	{

		.name		= "kernel_ro",

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

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static struct intc_vect intca_vectors[] __initdata = { 
	INTC_VECT(IRQ14A, 0x03c0), INTC_VECT(IRQ15A, 0x03e0),

	INTC_VECT(IRQ16A, 0x3200), INTC_VECT(IRQ17A, 0x3220),

	INTC_VECT(IRQ18A, 0x3240), INTC_VECT(IRQ19A, 0x3260),

	INTC_VECT(IRQ20A, 0x3280), INTC_VECT(IRQ31A, 0x32a0),

	INTC_VECT(IRQ20A, 0x3280), INTC_VECT(IRQ21A, 0x32a0),

	INTC_VECT(IRQ22A, 0x32c0), INTC_VECT(IRQ23A, 0x32e0),

	INTC_VECT(IRQ24A, 0x3300), INTC_VECT(IRQ25A, 0x3320),

	INTC_VECT(IRQ26A, 0x3340), INTC_VECT(IRQ27A, 0x3360),