diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 13 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 15 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410-module.c | 14 | ||||
-rw-r--r-- | arch/arm/mach-ux500/include/mach/irqs-board-mop500.h | 2 |
4 files changed, 28 insertions, 16 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 30768c2f53f..37dcb1bc025 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c | |||
@@ -490,21 +490,22 @@ static struct platform_device omap_vwlan_device = { | |||
490 | 490 | ||
491 | static int omap4_twl6030_hsmmc_late_init(struct device *dev) | 491 | static int omap4_twl6030_hsmmc_late_init(struct device *dev) |
492 | { | 492 | { |
493 | int ret = 0; | 493 | int irq = 0; |
494 | struct platform_device *pdev = container_of(dev, | 494 | struct platform_device *pdev = container_of(dev, |
495 | struct platform_device, dev); | 495 | struct platform_device, dev); |
496 | struct omap_mmc_platform_data *pdata = dev->platform_data; | 496 | struct omap_mmc_platform_data *pdata = dev->platform_data; |
497 | 497 | ||
498 | /* Setting MMC1 Card detect Irq */ | 498 | /* Setting MMC1 Card detect Irq */ |
499 | if (pdev->id == 0) { | 499 | if (pdev->id == 0) { |
500 | ret = twl6030_mmc_card_detect_config(); | 500 | irq = twl6030_mmc_card_detect_config(); |
501 | if (ret) | 501 | if (irq < 0) { |
502 | pr_err("Failed configuring MMC1 card detect\n"); | 502 | pr_err("Failed configuring MMC1 card detect\n"); |
503 | pdata->slots[0].card_detect_irq = TWL6030_IRQ_BASE + | 503 | return irq; |
504 | MMCDETECT_INTR_OFFSET; | 504 | } |
505 | pdata->slots[0].card_detect_irq = irq; | ||
505 | pdata->slots[0].card_detect = twl6030_mmc_card_detect; | 506 | pdata->slots[0].card_detect = twl6030_mmc_card_detect; |
506 | } | 507 | } |
507 | return ret; | 508 | return 0; |
508 | } | 509 | } |
509 | 510 | ||
510 | static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev) | 511 | static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev) |
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index e9071a57c37..8bf8e99c358 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -238,7 +238,7 @@ struct wl12xx_platform_data omap_panda_wlan_data __initdata = { | |||
238 | 238 | ||
239 | static int omap4_twl6030_hsmmc_late_init(struct device *dev) | 239 | static int omap4_twl6030_hsmmc_late_init(struct device *dev) |
240 | { | 240 | { |
241 | int ret = 0; | 241 | int irq = 0; |
242 | struct platform_device *pdev = container_of(dev, | 242 | struct platform_device *pdev = container_of(dev, |
243 | struct platform_device, dev); | 243 | struct platform_device, dev); |
244 | struct omap_mmc_platform_data *pdata = dev->platform_data; | 244 | struct omap_mmc_platform_data *pdata = dev->platform_data; |
@@ -249,14 +249,15 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev) | |||
249 | } | 249 | } |
250 | /* Setting MMC1 Card detect Irq */ | 250 | /* Setting MMC1 Card detect Irq */ |
251 | if (pdev->id == 0) { | 251 | if (pdev->id == 0) { |
252 | ret = twl6030_mmc_card_detect_config(); | 252 | irq = twl6030_mmc_card_detect_config(); |
253 | if (ret) | 253 | if (irq < 0) { |
254 | dev_err(dev, "%s: Error card detect config(%d)\n", | 254 | dev_err(dev, "%s: Error card detect config(%d)\n", |
255 | __func__, ret); | 255 | __func__, irq); |
256 | else | 256 | return irq; |
257 | pdata->slots[0].card_detect = twl6030_mmc_card_detect; | 257 | } |
258 | pdata->slots[0].card_detect = twl6030_mmc_card_detect; | ||
258 | } | 259 | } |
259 | return ret; | 260 | return 0; |
260 | } | 261 | } |
261 | 262 | ||
262 | static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev) | 263 | static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev) |
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c index b6a67728cc8..0ace108c3e3 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c | |||
@@ -17,6 +17,8 @@ | |||
17 | #include <linux/mfd/wm831x/gpio.h> | 17 | #include <linux/mfd/wm831x/gpio.h> |
18 | #include <linux/mfd/wm8994/pdata.h> | 18 | #include <linux/mfd/wm8994/pdata.h> |
19 | 19 | ||
20 | #include <linux/regulator/machine.h> | ||
21 | |||
20 | #include <sound/wm5100.h> | 22 | #include <sound/wm5100.h> |
21 | #include <sound/wm8996.h> | 23 | #include <sound/wm8996.h> |
22 | #include <sound/wm8962.h> | 24 | #include <sound/wm8962.h> |
@@ -153,6 +155,14 @@ static const struct i2c_board_info wm1259_devs[] = { | |||
153 | }, | 155 | }, |
154 | }; | 156 | }; |
155 | 157 | ||
158 | static struct regulator_init_data wm8994_ldo1 = { | ||
159 | .supply_regulator = "WALLVDD", | ||
160 | }; | ||
161 | |||
162 | static struct regulator_init_data wm8994_ldo2 = { | ||
163 | .supply_regulator = "WALLVDD", | ||
164 | }; | ||
165 | |||
156 | static struct wm8994_pdata wm8994_pdata = { | 166 | static struct wm8994_pdata wm8994_pdata = { |
157 | .gpio_base = CODEC_GPIO_BASE, | 167 | .gpio_base = CODEC_GPIO_BASE, |
158 | .gpio_defaults = { | 168 | .gpio_defaults = { |
@@ -160,8 +170,8 @@ static struct wm8994_pdata wm8994_pdata = { | |||
160 | }, | 170 | }, |
161 | .irq_base = CODEC_IRQ_BASE, | 171 | .irq_base = CODEC_IRQ_BASE, |
162 | .ldo = { | 172 | .ldo = { |
163 | { .supply = "WALLVDD" }, | 173 | { .init_data = &wm8994_ldo1, }, |
164 | { .supply = "WALLVDD" }, | 174 | { .init_data = &wm8994_ldo2, }, |
165 | }, | 175 | }, |
166 | }; | 176 | }; |
167 | 177 | ||
diff --git a/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h b/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h index d2d4131435a..7d34c52798b 100644 --- a/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h +++ b/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h | |||
@@ -13,7 +13,7 @@ | |||
13 | 13 | ||
14 | #define MOP500_AB8500_IRQ_BASE IRQ_BOARD_START | 14 | #define MOP500_AB8500_IRQ_BASE IRQ_BOARD_START |
15 | #define MOP500_AB8500_IRQ_END (MOP500_AB8500_IRQ_BASE \ | 15 | #define MOP500_AB8500_IRQ_END (MOP500_AB8500_IRQ_BASE \ |
16 | + AB8500_NR_IRQS) | 16 | + AB8500_MAX_NR_IRQS) |
17 | 17 | ||
18 | /* TC35892 */ | 18 | /* TC35892 */ |
19 | #define TC35892_NR_INTERNAL_IRQS 8 | 19 | #define TC35892_NR_INTERNAL_IRQS 8 |