diff options
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index c00c68961bb..6ef40107948 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -17,21 +17,21 @@ | |||
17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/of.h> | 19 | #include <linux/of.h> |
20 | #include <linux/pinctrl/machine.h> | ||
20 | #include <linux/platform_data/omap4-keypad.h> | 21 | #include <linux/platform_data/omap4-keypad.h> |
21 | 22 | ||
22 | #include <mach/hardware.h> | ||
23 | #include <mach/irqs.h> | ||
24 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
25 | #include <asm/mach/map.h> | 24 | #include <asm/mach/map.h> |
26 | #include <asm/pmu.h> | 25 | #include <asm/pmu.h> |
27 | 26 | ||
28 | #include "iomap.h" | 27 | #include "iomap.h" |
29 | #include <plat/board.h> | ||
30 | #include <plat/dma.h> | 28 | #include <plat/dma.h> |
31 | #include <plat/omap_hwmod.h> | 29 | #include <plat/omap_hwmod.h> |
32 | #include <plat/omap_device.h> | 30 | #include <plat/omap_device.h> |
33 | #include <plat/omap4-keypad.h> | 31 | #include <plat/omap4-keypad.h> |
34 | 32 | ||
33 | #include "soc.h" | ||
34 | #include "common.h" | ||
35 | #include "mux.h" | 35 | #include "mux.h" |
36 | #include "control.h" | 36 | #include "control.h" |
37 | #include "devices.h" | 37 | #include "devices.h" |
@@ -112,7 +112,7 @@ static struct resource omap2cam_resources[] = { | |||
112 | .flags = IORESOURCE_MEM, | 112 | .flags = IORESOURCE_MEM, |
113 | }, | 113 | }, |
114 | { | 114 | { |
115 | .start = INT_24XX_CAM_IRQ, | 115 | .start = 24 + OMAP_INTC_START, |
116 | .flags = IORESOURCE_IRQ, | 116 | .flags = IORESOURCE_IRQ, |
117 | } | 117 | } |
118 | }; | 118 | }; |
@@ -201,7 +201,7 @@ static struct resource omap3isp_resources[] = { | |||
201 | .flags = IORESOURCE_MEM, | 201 | .flags = IORESOURCE_MEM, |
202 | }, | 202 | }, |
203 | { | 203 | { |
204 | .start = INT_34XX_CAM_IRQ, | 204 | .start = 24 + OMAP_INTC_START, |
205 | .flags = IORESOURCE_IRQ, | 205 | .flags = IORESOURCE_IRQ, |
206 | } | 206 | } |
207 | }; | 207 | }; |
@@ -435,14 +435,12 @@ static inline void omap_init_mcspi(void) {} | |||
435 | #endif | 435 | #endif |
436 | 436 | ||
437 | static struct resource omap2_pmu_resource = { | 437 | static struct resource omap2_pmu_resource = { |
438 | .start = 3, | 438 | .start = 3 + OMAP_INTC_START, |
439 | .end = 3, | ||
440 | .flags = IORESOURCE_IRQ, | 439 | .flags = IORESOURCE_IRQ, |
441 | }; | 440 | }; |
442 | 441 | ||
443 | static struct resource omap3_pmu_resource = { | 442 | static struct resource omap3_pmu_resource = { |
444 | .start = INT_34XX_BENCH_MPU_EMUL, | 443 | .start = 3 + OMAP_INTC_START, |
445 | .end = INT_34XX_BENCH_MPU_EMUL, | ||
446 | .flags = IORESOURCE_IRQ, | 444 | .flags = IORESOURCE_IRQ, |
447 | }; | 445 | }; |
448 | 446 | ||
@@ -475,7 +473,7 @@ static struct resource omap2_sham_resources[] = { | |||
475 | .flags = IORESOURCE_MEM, | 473 | .flags = IORESOURCE_MEM, |
476 | }, | 474 | }, |
477 | { | 475 | { |
478 | .start = INT_24XX_SHA1MD5, | 476 | .start = 51 + OMAP_INTC_START, |
479 | .flags = IORESOURCE_IRQ, | 477 | .flags = IORESOURCE_IRQ, |
480 | } | 478 | } |
481 | }; | 479 | }; |
@@ -493,7 +491,7 @@ static struct resource omap3_sham_resources[] = { | |||
493 | .flags = IORESOURCE_MEM, | 491 | .flags = IORESOURCE_MEM, |
494 | }, | 492 | }, |
495 | { | 493 | { |
496 | .start = INT_34XX_SHA1MD52_IRQ, | 494 | .start = 49 + OMAP_INTC_START, |
497 | .flags = IORESOURCE_IRQ, | 495 | .flags = IORESOURCE_IRQ, |
498 | }, | 496 | }, |
499 | { | 497 | { |
@@ -631,6 +629,10 @@ static inline void omap_init_vout(void) {} | |||
631 | 629 | ||
632 | static int __init omap2_init_devices(void) | 630 | static int __init omap2_init_devices(void) |
633 | { | 631 | { |
632 | /* Enable dummy states for those platforms without pinctrl support */ | ||
633 | if (!of_have_populated_dt()) | ||
634 | pinctrl_provide_dummies(); | ||
635 | |||
634 | /* | 636 | /* |
635 | * please keep these calls, and their implementations above, | 637 | * please keep these calls, and their implementations above, |
636 | * in alphabetical order so they're easier to sort through. | 638 | * in alphabetical order so they're easier to sort through. |