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

Commit 365e1087 authored by Arnd Hannemann's avatar Arnd Hannemann Committed by Paul Mundt
Browse files

sh: sh7723 / ap325rxa enable SDIO IRQs 



This patch enables the interrupt generation for SDIO IRQs
of the sdhi controllers of the SoC. To make sure SDIO IRQs
are used announce the MMC_CAP_SDIO_IRQ capability
on ap325rxa.

Signed-off-by: default avatarArnd Hannemann <arnd@arndnet.de>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 464495e5

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

+16 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include <linux/device.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/mfd/sh_mobile_sdhi.h>

#include <linux/mmc/host.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/sh_flctl.h>

#include <linux/delay.h>
@@ -430,11 +432,18 @@ static struct resource sdhi0_cn3_resources[] = { 
	},

};



static struct sh_mobile_sdhi_info sdhi0_cn3_data = {

	.tmio_caps      = MMC_CAP_SDIO_IRQ,

};



static struct platform_device sdhi0_cn3_device = {

	.name		= "sh_mobile_sdhi",

	.id             = 0, /* "sdhi0" clock */

	.num_resources	= ARRAY_SIZE(sdhi0_cn3_resources),

	.resource	= sdhi0_cn3_resources,

	.dev = {

		.platform_data = &sdhi0_cn3_data,

	},

	.archdata = {

		.hwblk_id = HWBLK_SDHI0,

	},
@@ -453,11 +462,18 @@ static struct resource sdhi1_cn7_resources[] = { 
	},

};



static struct sh_mobile_sdhi_info sdhi1_cn7_data = {

	.tmio_caps      = MMC_CAP_SDIO_IRQ,

};



static struct platform_device sdhi1_cn7_device = {

	.name		= "sh_mobile_sdhi",

	.id             = 1, /* "sdhi1" clock */

	.num_resources	= ARRAY_SIZE(sdhi1_cn7_resources),

	.resource	= sdhi1_cn7_resources,

	.dev = {

		.platform_data = &sdhi1_cn7_data,

	},

	.archdata = {

		.hwblk_id = HWBLK_SDHI1,

	},

arch/sh/kernel/cpu/sh4a/setup-sh7723.c

+2 −2
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ static struct intc_group groups[] __initdata = { 
static struct intc_mask_reg mask_registers[] __initdata = {

	{ 0xa4080080, 0xa40800c0, 8, /* IMR0 / IMCR0 */

	  { 0, TMU1_TUNI2, TMU1_TUNI1, TMU1_TUNI0,

	    0, DISABLED, ENABLED, ENABLED } },

	    0, ENABLED, ENABLED, ENABLED } },

	{ 0xa4080084, 0xa40800c4, 8, /* IMR1 / IMCR1 */

	  { VIO_VOUI, VIO_VEU2HI,VIO_BEUI,VIO_CEUI,DMAC0A_DEI3,DMAC0A_DEI2,DMAC0A_DEI1,DMAC0A_DEI0 } },

	{ 0xa4080088, 0xa40800c8, 8, /* IMR2 / IMCR2 */
@@ -736,7 +736,7 @@ static struct intc_mask_reg mask_registers[] __initdata = { 
	  { I2C_DTEI, I2C_WAITI, I2C_TACKI, I2C_ALI,

	    FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLTENDI, FLCTL_FLSTEI } },

	{ 0xa40800a0, 0xa40800e0, 8, /* IMR8 / IMCR8 */

	  { 0, DISABLED, ENABLED, ENABLED,

	  { 0, ENABLED, ENABLED, ENABLED,

	    0, 0, SCIFA_SCIFA2, SIU_SIUI } },

	{ 0xa40800a4, 0xa40800e4, 8, /* IMR9 / IMCR9 */

	  { 0, 0, 0, CMT_CMTI, 0, 0, USB_USI0,0 } },