diff options
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r-- | arch/arm/plat-mxc/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/Makefile | 4 | ||||
-rw-r--r-- | arch/arm/plat-mxc/irq.c | 14 |
3 files changed, 4 insertions, 16 deletions
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index 03a65c0dfb60..bb6e12738fb3 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig | |||
@@ -4,7 +4,7 @@ menu "Freescale MXC Implementations" | |||
4 | 4 | ||
5 | choice | 5 | choice |
6 | prompt "MXC/iMX System Type" | 6 | prompt "MXC/iMX System Type" |
7 | default 0 | 7 | default ARCH_MX3 |
8 | 8 | ||
9 | config ARCH_MX3 | 9 | config ARCH_MX3 |
10 | bool "MX3-based" | 10 | bool "MX3-based" |
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile index 66ad9c2b6d64..f96dc0362068 100644 --- a/arch/arm/plat-mxc/Makefile +++ b/arch/arm/plat-mxc/Makefile | |||
@@ -4,7 +4,3 @@ | |||
4 | 4 | ||
5 | # Common support | 5 | # Common support |
6 | obj-y := irq.o | 6 | obj-y := irq.o |
7 | |||
8 | obj-m := | ||
9 | obj-n := | ||
10 | obj- := | ||
diff --git a/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/irq.c index 87d253bc3d3c..2ad5a6917b3f 100644 --- a/arch/arm/plat-mxc/irq.c +++ b/arch/arm/plat-mxc/irq.c | |||
@@ -19,21 +19,13 @@ | |||
19 | #include <asm/mach/irq.h> | 19 | #include <asm/mach/irq.h> |
20 | #include <asm/arch/common.h> | 20 | #include <asm/arch/common.h> |
21 | 21 | ||
22 | /*! | 22 | /* Disable interrupt number "irq" in the AVIC */ |
23 | * Disable interrupt number "irq" in the AVIC | ||
24 | * | ||
25 | * @param irq interrupt source number | ||
26 | */ | ||
27 | static void mxc_mask_irq(unsigned int irq) | 23 | static void mxc_mask_irq(unsigned int irq) |
28 | { | 24 | { |
29 | __raw_writel(irq, AVIC_INTDISNUM); | 25 | __raw_writel(irq, AVIC_INTDISNUM); |
30 | } | 26 | } |
31 | 27 | ||
32 | /*! | 28 | /* Enable interrupt number "irq" in the AVIC */ |
33 | * Enable interrupt number "irq" in the AVIC | ||
34 | * | ||
35 | * @param irq interrupt source number | ||
36 | */ | ||
37 | static void mxc_unmask_irq(unsigned int irq) | 29 | static void mxc_unmask_irq(unsigned int irq) |
38 | { | 30 | { |
39 | __raw_writel(irq, AVIC_INTENNUM); | 31 | __raw_writel(irq, AVIC_INTENNUM); |
@@ -45,7 +37,7 @@ static struct irq_chip mxc_avic_chip = { | |||
45 | .unmask = mxc_unmask_irq, | 37 | .unmask = mxc_unmask_irq, |
46 | }; | 38 | }; |
47 | 39 | ||
48 | /*! | 40 | /* |
49 | * This function initializes the AVIC hardware and disables all the | 41 | * This function initializes the AVIC hardware and disables all the |
50 | * interrupts. It registers the interrupt enable and disable functions | 42 | * interrupts. It registers the interrupt enable and disable functions |
51 | * to the kernel for each interrupt source. | 43 | * to the kernel for each interrupt source. |