Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 181231
b: refs/heads/master
c: bbb892a
h: refs/heads/master
i:
  181229: e1ca4a1
  181227: 7d8c674
  181223: f14cb84
  181215: 7e8871a
v: v3
  • Loading branch information
Kuninori Morimoto authored and Paul Mundt committed Feb 25, 2010
1 parent 9a07daf commit 6e3fd45
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 263657168549075b57ecfbf730738105d1af8b65
refs/heads/master: bbb892aac4724b7cc6e1626665310eddfd747235
26 changes: 26 additions & 0 deletions trunk/arch/sh/boards/mach-se/7724/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,26 @@ static struct platform_device sdhi1_cn8_device = {
},
};

/* IrDA */
static struct resource irda_resources[] = {
[0] = {
.name = "IrDA",
.start = 0xA45D0000,
.end = 0xA45D0049,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = 20,
.flags = IORESOURCE_IRQ,
},
};

static struct platform_device irda_device = {
.name = "sh_sir",
.num_resources = ARRAY_SIZE(irda_resources),
.resource = irda_resources,
};

static struct platform_device *ms7724se_devices[] __initdata = {
&heartbeat_device,
&smc91x_eth_device,
Expand All @@ -503,6 +523,7 @@ static struct platform_device *ms7724se_devices[] __initdata = {
&fsi_device,
&sdhi0_cn7_device,
&sdhi1_cn8_device,
&irda_device,
};

/* I2C device */
Expand Down Expand Up @@ -599,6 +620,7 @@ static int __init devices_setup(void)
~((1 << 1) | /* LAN */
(1 << 6) | /* VIDEO DAC */
(1 << 7) | /* AK4643 */
(1 << 8) | /* IrDA */
(1 << 12) | /* USB0 */
(1 << 14)), /* RMII */
FPGA_OUT);
Expand Down Expand Up @@ -788,6 +810,10 @@ static int __init devices_setup(void)
gpio_request(GPIO_FN_SDHI1CMD, NULL);
gpio_request(GPIO_FN_SDHI1CLK, NULL);

/* enable IrDA */
gpio_request(GPIO_FN_IRDA_OUT, NULL);
gpio_request(GPIO_FN_IRDA_IN, NULL);

/*
* enable SH-Eth
*
Expand Down

0 comments on commit 6e3fd45

Please sign in to comment.