diff options
Diffstat (limited to 'arch/arm/mach-shmobile/board-kzm9g.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-kzm9g.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index 7f3a6b7e7b7c..d34d12ae496b 100644 --- a/arch/arm/mach-shmobile/board-kzm9g.c +++ b/arch/arm/mach-shmobile/board-kzm9g.c | |||
@@ -81,7 +81,7 @@ static struct resource smsc9221_resources[] = { | |||
81 | .flags = IORESOURCE_MEM, | 81 | .flags = IORESOURCE_MEM, |
82 | }, | 82 | }, |
83 | [1] = { | 83 | [1] = { |
84 | .start = intcs_evt2irq(0x260), /* IRQ3 */ | 84 | .start = irq_pin(3), /* IRQ3 */ |
85 | .flags = IORESOURCE_IRQ, | 85 | .flags = IORESOURCE_IRQ, |
86 | }, | 86 | }, |
87 | }; | 87 | }; |
@@ -115,7 +115,7 @@ static struct resource usb_resources[] = { | |||
115 | .flags = IORESOURCE_MEM, | 115 | .flags = IORESOURCE_MEM, |
116 | }, | 116 | }, |
117 | [1] = { | 117 | [1] = { |
118 | .start = intcs_evt2irq(0x220), /* IRQ1 */ | 118 | .start = irq_pin(1), /* IRQ1 */ |
119 | .flags = IORESOURCE_IRQ, | 119 | .flags = IORESOURCE_IRQ, |
120 | }, | 120 | }, |
121 | }; | 121 | }; |
@@ -138,7 +138,7 @@ struct usbhs_private { | |||
138 | struct renesas_usbhs_platform_info info; | 138 | struct renesas_usbhs_platform_info info; |
139 | }; | 139 | }; |
140 | 140 | ||
141 | #define IRQ15 intcs_evt2irq(0x03e0) | 141 | #define IRQ15 irq_pin(15) |
142 | #define USB_PHY_MODE (1 << 4) | 142 | #define USB_PHY_MODE (1 << 4) |
143 | #define USB_PHY_INT_EN ((1 << 3) | (1 << 2)) | 143 | #define USB_PHY_INT_EN ((1 << 3) | (1 << 2)) |
144 | #define USB_PHY_ON (1 << 1) | 144 | #define USB_PHY_ON (1 << 1) |
@@ -563,25 +563,25 @@ static struct i2c_board_info i2c0_devices[] = { | |||
563 | }, | 563 | }, |
564 | { | 564 | { |
565 | I2C_BOARD_INFO("ak8975", 0x0c), | 565 | I2C_BOARD_INFO("ak8975", 0x0c), |
566 | .irq = intcs_evt2irq(0x3380), /* IRQ28 */ | 566 | .irq = irq_pin(28), /* IRQ28 */ |
567 | }, | 567 | }, |
568 | { | 568 | { |
569 | I2C_BOARD_INFO("adxl34x", 0x1d), | 569 | I2C_BOARD_INFO("adxl34x", 0x1d), |
570 | .irq = intcs_evt2irq(0x3340), /* IRQ26 */ | 570 | .irq = irq_pin(26), /* IRQ26 */ |
571 | }, | 571 | }, |
572 | }; | 572 | }; |
573 | 573 | ||
574 | static struct i2c_board_info i2c1_devices[] = { | 574 | static struct i2c_board_info i2c1_devices[] = { |
575 | { | 575 | { |
576 | I2C_BOARD_INFO("st1232-ts", 0x55), | 576 | I2C_BOARD_INFO("st1232-ts", 0x55), |
577 | .irq = intcs_evt2irq(0x300), /* IRQ8 */ | 577 | .irq = irq_pin(8), /* IRQ8 */ |
578 | }, | 578 | }, |
579 | }; | 579 | }; |
580 | 580 | ||
581 | static struct i2c_board_info i2c3_devices[] = { | 581 | static struct i2c_board_info i2c3_devices[] = { |
582 | { | 582 | { |
583 | I2C_BOARD_INFO("pcf8575", 0x20), | 583 | I2C_BOARD_INFO("pcf8575", 0x20), |
584 | .irq = intcs_evt2irq(0x3260), /* IRQ19 */ | 584 | .irq = irq_pin(19), /* IRQ19 */ |
585 | .platform_data = &pcf8575_pdata, | 585 | .platform_data = &pcf8575_pdata, |
586 | }, | 586 | }, |
587 | }; | 587 | }; |