i.MX patches for next
Subsystems (3)
Sascha Hauer
maintainerThe following changes since commit 255ed73db5c48bcdda69aac642e265fde60564e5:
imx: remove deprecated symbols as all users are gone now (2010-11-05 09:12:31 +0100)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git imx-pu
Sascha Hauer (7):
ARM i.MX51 boards: Do not use PHYS_OFFSET
ARM i.MX irq: Compile avic irq code only on SoCs that need it ARM i.MX51: Make CONFIG_MXC_TZIC an invisible option ARM i.MX irq: Allow runtime decision between AVIC and TZIC ARM i.MX DMA: return gracefully on different socs ARM i.MX51: return gracefully on different socs ARM i.MX27 pm: return gracefully on different socs
arch/arm/mach-imx/Kconfig | 3 +
arch/arm/mach-imx/dma-v1.c | 2 +-
arch/arm/mach-imx/pm-imx27.c | 3 +
arch/arm/mach-mx3/Kconfig | 2 +
arch/arm/mach-mx5/board-cpuimx51.c | 2 +-
arch/arm/mach-mx5/board-cpuimx51sd.c | 2 +-
arch/arm/mach-mx5/board-mx51_3ds.c | 2 +-
arch/arm/mach-mx5/cpu.c | 3 +
arch/arm/plat-mxc/Kconfig | 11 ++--
arch/arm/plat-mxc/Makefile | 3 +-
arch/arm/plat-mxc/{irq.c => avic.c} | 2 +
arch/arm/plat-mxc/cpu.c | 3 +
arch/arm/plat-mxc/include/mach/entry-macro.S | 66 ++++++++++++++++----------
arch/arm/plat-mxc/include/mach/mxc.h | 8 +++
arch/arm/plat-mxc/tzic.c | 3 +
15 files changed, 79 insertions(+), 36 deletions(-)
rename arch/arm/plat-mxc/{irq.c => avic.c} (98%)Sascha Hauer
maintainerPATCH 1/7 ARM i.MX51 boards: Do not use PHYS_OFFSET
PHYS_OFFSET may become a variable once the runtime PHYS_OFFSET patch is merged, so use MX51_PHYS_OFFSET for boot_params.
--- arch/arm/mach-mx5/board-cpuimx51.c | 2 +- arch/arm/mach-mx5/board-cpuimx51sd.c | 2 +- arch/arm/mach-mx5/board-mx51_3ds.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-mx5/board-cpuimx51.c +1 -1
@@ -292,7 +292,7 @@ static struct sys_timer mxc_timer = {MACHINE_START (EUKREA_CPUIMX51 ,"Eukrea CPUIMX51 Module" )/* Maintainer: Eric B?nard <[email protected]> */ - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX51_PHYS_OFFSET + 0x100, .map_io = mx51_map_io, .init_irq = mx51_init_irq, .init_machine = eukrea_cpuimx51_init,
arch/arm/mach-mx5/board-cpuimx51sd.c +1 -1
@@ -323,7 +323,7 @@ static struct sys_timer mxc_timer = {MACHINE_START (EUKREA_CPUIMX51SD ,"Eukrea CPUIMX51SD" )/* Maintainer: Eric B?nard <[email protected]> */ - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX51_PHYS_OFFSET + 0x100, .map_io = mx51_map_io, .init_irq = mx51_init_irq, .init_machine = eukrea_cpuimx51sd_init,
arch/arm/mach-mx5/board-mx51_3ds.c +1 -1
@@ -186,7 +186,7 @@ static struct sys_timer mxc_timer = {MACHINE_START (MX51_3DS ,"Freescale MX51 3-Stack Board" )/* Maintainer: Freescale Semiconductor, Inc. */ - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = mx51_map_io, .init_irq = mx51_init_irq, .init_machine = mxc_board_init,
Signature · 1 line
1.7.2.3
PATCH 1/7 ARM i.MX51 boards: Do not use PHYS_OFFSET
Hey Sascha,
Quoted 41 lines · Sascha Hauer
PHYS_OFFSETmay become a variable once the runtimePHYS_OFFSETpatch is merged, so useMX51_PHYS_OFFSETforboot_params.Signed-off-by Sascha Hauer <[email protected]>--- arch/arm/mach-mx5/board-cpuimx51.c | 2 +- arch/arm/mach-mx5/board-cpuimx51sd.c | 2 +- arch/arm/mach-mx5/board-mx51_3ds.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)arch/arm/mach-mx5/board-cpuimx51.c +1
-1@@ -292,7 +292,7 @@ static struct sys_timer mxc_timer = {MACHINE_START (EUKREA_CPUIMX51 ,"Eukrea CPUIMX51 Module" )/* Maintainer: Eric B?nard <[email protected]> */ - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX51_PHYS_OFFSET + 0x100, .map_io = mx51_map_io, .init_irq = mx51_init_irq, .init_machine = eukrea_cpuimx51_init,arch/arm/mach-mx5/board-cpuimx51sd.c +1
-1@@ -323,7 +323,7 @@ static struct sys_timer mxc_timer = {MACHINE_START (EUKREA_CPUIMX51SD ,"Eukrea CPUIMX51SD" )/* Maintainer: Eric B?nard <[email protected]> */ - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX51_PHYS_OFFSET + 0x100, .map_io = mx51_map_io, .init_irq = mx51_init_irq, .init_machine = eukrea_cpuimx51sd_init,arch/arm/mach-mx5/board-mx51_3ds.c +0
-0
arch/arm/mach-mx5/board-mx51_3ds.c static struct sys_timer mxc_timer = { · line 189
Quoted 5 lines
arch/arm/mach-mx5/board-mx51_3ds.c +1
-1@@ -186,7 +186,7 @@ static struct sys_timer mxc_timer = {MACHINE_START (MX51_3DS ,"Freescale MX51 3-Stack Board" )/* Maintainer: Freescale Semiconductor, Inc. */ - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX3x_PHYS_OFFSET + 0x100,
This looks wrong.
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Sascha Hauer
maintainerPATCH 2/7 ARM i.MX irq: Compile avic irq code only on SoCs that need it
In reply to Sascha HauerThis patch adds a Kconfig option for the avic irq controller and lets the SoCs that need it select this option. Also, as we have two irq controllers for i.MX, irq.c is not appropriate anymore, so rename it to avic.c
---
arch/arm/mach-imx/Kconfig | 3 +++
arch/arm/mach-mx3/Kconfig | 2 ++
arch/arm/plat-mxc/Kconfig | 4 ++++
arch/arm/plat-mxc/Makefile | 3 ++-
arch/arm/plat-mxc/{irq.c => avic.c} | 0
5 files changed, 11 insertions(+), 1 deletions(-)
rename arch/arm/plat-mxc/{irq.c => avic.c} (100%)arch/arm/mach-imx/Kconfig +3 -0
@@ -7,6 +7,7 @@ config SOC_IMX1 select CPU_ARM920T select IMX_HAVE_DMA_V1 select IMX_HAVE_IOMUX_V1 + select MXC_AVIC bool comment "MX1 platforms:"
@@ -36,6 +37,7 @@ config SOC_IMX21 select ARCH_MXC_AUDMUX_V1 select IMX_HAVE_DMA_V1 select IMX_HAVE_IOMUX_V1 + select MXC_AVIC bool config SOC_IMX27
@@ -43,6 +45,7 @@ config SOC_IMX27 select ARCH_MXC_AUDMUX_V1 select IMX_HAVE_DMA_V1 select IMX_HAVE_IOMUX_V1 + select MXC_AVIC bool choice
arch/arm/mach-mx3/Kconfig +2 -0
@@ -3,6 +3,7 @@ if ARCH_MX3 config ARCH_MX31 select ARCH_HAS_RNGA select ARCH_MXC_AUDMUX_V2 + select MXC_AVIC bool config ARCH_MX35
@@ -10,6 +11,7 @@ config ARCH_MX35 select ARCH_MXC_IOMUX_V3 select ARCH_MXC_AUDMUX_V2 select HAVE_EPIT + select MXC_AVIC comment "MX3 platforms:"
arch/arm/plat-mxc/Kconfig +4 -0
@@ -25,6 +25,7 @@ config ARCH_MX25 select ARCH_MXC_IOMUX_V3 select HAVE_FB_IMX select ARCH_MXC_AUDMUX_V2 + select MXC_AVIC help This enables support for systems based on the Freescale i.MX25 family
@@ -75,6 +76,9 @@ config MXC_TZIC containing this interrupt controller. Say N here only if you are really sure. +config MXC_AVIC + bool + config MXC_PWM tristate "Enable PWM driver" select HAVE_PWM
arch/arm/plat-mxc/Makefile +2 -1
@@ -3,10 +3,11 @@ # # Common support -obj-y := irq.o clock.o gpio.o time.o devices.o cpu.o system.o +obj-y := clock.o gpio.o time.o devices.o cpu.o system.o # MX51 uses the TZIC interrupt controller, older platforms use AVIC (irq.o) obj-$(CONFIG_MXC_TZIC) += tzic.o +obj-$(CONFIG_MXC_AVIC) += avic.o obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
arch/arm/plat-mxc/avic.c renamed from arch/arm/plat-mxc/irq.c +0 -0
Signature · 1 line
1.7.2.3
PATCH 2/7 ARM i.MX irq: Compile avic irq code only on SoCs that need it
Quoted 90 lines · Sascha Hauer
This patch adds a
Kconfigoption for the avic irq controller and lets the SoCs that need it select this option. Also, as we have two irq controllers for i.MX,irq.cis not appropriate anymore, so rename it toavic.cSigned-off-by Sascha Hauer<[email protected]>--- arch/arm/mach-imx/Kconfig | 3 +++ arch/arm/mach-mx3/Kconfig | 2 ++ arch/arm/plat-mxc/Kconfig | 4 ++++ arch/arm/plat-mxc/Makefile | 3 ++- arch/arm/plat-mxc/{irq.c => avic.c} | 0 5 files changed, 11 insertions(+), 1 deletions(-)rename
arch/arm/plat-mxc/{irq.c=>avic.c} (100%)arch/arm/mach-imx/Kconfig +3
-0@@ -7,6 +7,7 @@ config SOC_IMX1 select CPU_ARM920T select IMX_HAVE_DMA_V1 select IMX_HAVE_IOMUX_V1 + select MXC_AVIC bool comment "MX1 platforms:"@@ -36,6 +37,7 @@ config SOC_IMX21 select ARCH_MXC_AUDMUX_V1 select IMX_HAVE_DMA_V1 select IMX_HAVE_IOMUX_V1 + select MXC_AVIC bool config SOC_IMX27@@ -43,6 +45,7 @@ config SOC_IMX27 select ARCH_MXC_AUDMUX_V1 select IMX_HAVE_DMA_V1 select IMX_HAVE_IOMUX_V1 + select MXC_AVIC bool choicearch/arm/mach-mx3/Kconfig +2
-0@@ -3,6 +3,7 @@ if ARCH_MX3 config ARCH_MX31 select ARCH_HAS_RNGA select ARCH_MXC_AUDMUX_V2 + select MXC_AVIC bool config ARCH_MX35@@ -10,6 +11,7 @@ config ARCH_MX35 select ARCH_MXC_IOMUX_V3 select ARCH_MXC_AUDMUX_V2 select HAVE_EPIT + select MXC_AVIC comment "MX3 platforms:"arch/arm/plat-mxc/Kconfig +4
-0@@ -25,6 +25,7 @@ config ARCH_MX25 select ARCH_MXC_IOMUX_V3 select HAVE_FB_IMX select ARCH_MXC_AUDMUX_V2 + select MXC_AVIC help This enables support for systems based on the Freescale i.MX25 family@@ -75,6 +76,9 @@ config MXC_TZIC containing this interrupt controller. Say N here only if you are really sure. +config MXC_AVIC + bool + config MXC_PWM tristate "Enable PWM driver" select HAVE_PWMarch/arm/plat-mxc/Makefile +0
-0
arch/arm/plat-mxc/Makefile line 8
Quoted 7 lines
arch/arm/plat-mxc/Makefile +1
-1@@ -3,10 +3,11 @@ # # Common support -obj-y := irq.o clock.o gpio.o time.o devices.o cpu.o system.o +obj-y := clock.o gpio.o time.o devices.o cpu.o system.o # MX51 uses the TZIC interrupt controller, older platforms use AVIC (irq.o)
it is not irq.o anymore as stated in the comment
Quoted 9 lines
arch/arm/plat-mxc/Makefile +1
-0obj-$(CONFIG_MXC_TZIC) += tzic.o +obj-$(CONFIG_MXC_AVIC) += avic.o obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.oarch/arm/plat-mxc/avic.c renamed from arch/arm/plat-mxc/irq.c +0
-0
Sascha Hauer
maintainerPATCH 3/7 ARM i.MX51: Make CONFIG_MXC_TZIC an invisible option
In reply to Sascha HauerThere's no point showing this option to the user. The correct value will be selected anyway.
--- arch/arm/plat-mxc/Kconfig | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-)
arch/arm/plat-mxc/Kconfig +1 -6
@@ -69,12 +69,7 @@ config MXC_IRQ_PRIOR Say N here, unless you have a specialized requirement. config MXC_TZIC - bool "Enable TrustZone Interrupt Controller" - depends on ARCH_MX51 - help - This will be automatically selected for all processors - containing this interrupt controller. - Say N here only if you are really sure. + bool config MXC_AVIC bool
Signature · 1 line
1.7.2.3
Sascha Hauer
maintainerPATCH 4/7 ARM i.MX irq: Allow runtime decision between AVIC and TZIC
In reply to Sascha HauerAs we are on a path to support more different i.MX SoCs in a single binary we have to able to support both AVIC and TZIC in a single binary. This patch only introduces overhead when both controllers are needed.
--- arch/arm/plat-mxc/avic.c | 2 + arch/arm/plat-mxc/cpu.c | 3 + arch/arm/plat-mxc/include/mach/entry-macro.S | 66 ++++++++++++++++---------- arch/arm/plat-mxc/include/mach/mxc.h | 8 +++ arch/arm/plat-mxc/tzic.c | 3 + 5 files changed, 57 insertions(+), 25 deletions(-)
arch/arm/plat-mxc/avic.c +2 -0
@@ -118,6 +118,8 @@ void __init mxc_init_irq(void __iomem *irqbase)int i; avic_base = irqbase; + mxc_irq_base = irqbase; + mxc_irq_controller_type =MXC_IRQ_TYPE_AVIC ;/* put the AVIC into the reset value with * all interrupts disabled
arch/arm/plat-mxc/cpu.c +3 -0
@@ -9,3 +9,6 @@ void mxc_set_cpu_type(unsigned int type) __mxc_cpu_type = type; } +void __iomem *mxc_irq_base; +int mxc_irq_controller_type; +
arch/arm/plat-mxc/include/mach/entry-macro.S +41 -25
87 lines not on this page · raw message
arch/arm/plat-mxc/include/mach/mxc.h +8 -0
@@ -154,4 +154,12 @@ extern struct cpu_op *(*get_cpu_op)(int *op);#define cpu_is_mx3 () (cpu_is_mx31() || cpu_is_mx35() || cpu_is_mxc91231())#define cpu_is_mx2 () (cpu_is_mx21() || cpu_is_mx27()) +#ifndef __ASSEMBLY__ +extern int mxc_irq_controller_type; +extern void __iomem *mxc_irq_base; +#endif + +#define MXC_IRQ_TYPE_AVIC 1 +#define MXC_IRQ_TYPE_TZIC 2 +#endif /* __ASM_ARCH_MXC_H__ */
arch/arm/plat-mxc/tzic.c +3 -0
@@ -122,6 +122,9 @@ void __init tzic_init_irq(void __iomem *irqbase)int i; tzic_base = irqbase; + mxc_irq_base = irqbase; + mxc_irq_controller_type =MXC_IRQ_TYPE_TZIC ; +/* put the TZIC into the reset value with * all interrupts disabled */
Signature · 1 line
1.7.2.3
PATCH 4/7 ARM i.MX irq: Allow runtime decision between AVIC and TZIC
Quoted 19 lines · Sascha Hauer
As we are on a path to support more different i.MX SoCs in a single binary we have to able to support both AVIC and TZIC in a single binary. This patch only introduces overhead when both controllers are needed.
Signed-off-by Sascha Hauer <[email protected]>--- arch/arm/plat-mxc/avic.c | 2 + arch/arm/plat-mxc/cpu.c | 3 + arch/arm/plat-mxc/include/mach/entry-macro.S | 66 ++++++++++++++++---------- arch/arm/plat-mxc/include/mach/mxc.h | 8 +++ arch/arm/plat-mxc/tzic.c | 3 + 5 files changed, 57 insertions(+), 25 deletions(-)arch/arm/plat-mxc/avic.c +0
-0
arch/arm/plat-mxc/avic.c void __init mxc_init_irq(void __iomem *irqbase) · line 120
Quoted 3 lines
arch/arm/plat-mxc/avic.c +0
-0@@ -118,6 +118,8 @@ void __init mxc_init_irq(void __iomem *irqbase)int i; avic_base = irqbase;
Is avic_base still needed?
Quoted 131 lines
arch/arm/plat-mxc/avic.c +2
-0+ mxc_irq_base = irqbase; + mxc_irq_controller_type =MXC_IRQ_TYPE_AVIC ;/* put the AVIC into the reset value with * all interrupts disabled arch/arm/plat-mxc/cpu.c +3
-0@@ -9,3 +9,6 @@ void mxc_set_cpu_type(unsigned int type) __mxc_cpu_type = type; } +void __iomem *mxc_irq_base; +int mxc_irq_controller_type; +arch/arm/plat-mxc/include/mach/entry-macro.S +41
-25@@ -18,40 +18,18 @@ .endm .macro get_irqnr_preamble, base, tmp -#ifndef CONFIG_MXC_TZIC - ldr \base, =avic_base + ldr \base, =mxc_irq_base ldr \base, [\base] #ifdef CONFIG_MXC_IRQ_PRIOR ldr r4, [\base, #AVIC_NIMASK] #endif -#elif defined CONFIG_MXC_TZIC - ldr \base, =tzic_base - ldr \base, [\base] -#endif /* CONFIG_MXC_TZIC */ .endm .macro arch_ret_to_user, tmp1, tmp2 .endm - @ this macro checks which interrupt occured - @ and returns its number in irqnr - @ and returns if an interrupt occured in irqstat - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp -#ifndef CONFIG_MXC_TZIC - @ Load offset & priority of the highest priority - @ interrupt pending from AVIC_NIVECSR - ldr \irqstat, [\base, #0x40] - @ Shift to get the decoded IRQ number, using ASR so - @ 'no interrupt pending' becomes 0xffffffff - mov \irqnr, \irqstat, asr #16 - @ set zero flag if IRQ + 1 == 0 - adds \tmp, \irqnr, #1 -#ifdef CONFIG_MXC_IRQ_PRIOR - bicne \tmp, \irqstat, #0xFFFFFFE0 - strne \tmp, [\base, #AVIC_NIMASK] - streq r4, [\base, #AVIC_NIMASK] -#endif -#elif defined CONFIG_MXC_TZIC + .macro tzic_get_irqnr_and_base, irqnr, irqstat, base, tmp + @ Load offset & priority of the highest priority @ interrupt pending. @ 0xD80 is HIPND0 register@@ -76,6 +54,44 @@ mov \irqnr, #0 2002: movs \irqnr, \irqnr + .endm + + .macro avic_get_irqnr_and_base, irqnr, irqstat, base, tmp + + @ Load offset & priority of the highest priority + @ interrupt pending from AVIC_NIVECSR + ldr \irqstat, [\base, #0x40] + @ Shift to get the decoded IRQ number, using ASR so + @ 'no interrupt pending' becomes 0xffffffff + mov \irqnr, \irqstat, asr #16 + @ set zero flag if IRQ + 1 == 0 + adds \tmp, \irqnr, #1 +#ifdef CONFIG_MXC_IRQ_PRIOR + bicne \tmp, \irqstat, #0xFFFFFFE0 + strne \tmp, [\base, #AVIC_NIMASK] + streq r4, [\base, #AVIC_NIMASK] +#endif + .endm + + .macro get_irqnr_and_base, irqnr, irqstat, base, tmp +#if defined CONFIG_MXC_TZIC && defined CONFIG_MXC_AVIC + ldr \tmp, =mxc_irq_controller_type + ldr \tmp, [\tmp] + cmp \tmp, #MXC_IRQ_TYPE_AVIC + beq 3001f + + tzic_get_irqnr_and_base \irqnr, \irqstat, \base, \tmp + b 3002f +3001: + avic_get_irqnr_and_base \irqnr, \irqstat, \base, \tmp +3002: + +#elif defined CONFIG_MXC_TZIC + tzic_get_irqnr_and_base \irqnr, \irqstat, \base, \tmp +#elif defined CONFIG_MXC_AVIC + avic_get_irqnr_and_base \irqnr, \irqstat, \base, \tmp +#else +#error no tzic and no avic? #endif .endmarch/arm/plat-mxc/include/mach/mxc.h +8
-0@@ -154,4 +154,12 @@ extern struct cpu_op *(*get_cpu_op)(int *op);#define cpu_is_mx3 () (cpu_is_mx31() || cpu_is_mx35() || cpu_is_mxc91231())#define cpu_is_mx2 () (cpu_is_mx21() || cpu_is_mx27()) +#ifndef __ASSEMBLY__ +extern int mxc_irq_controller_type; +extern void __iomem *mxc_irq_base; +#endif + +#define MXC_IRQ_TYPE_AVIC 1 +#define MXC_IRQ_TYPE_TZIC 2 +#endif /* __ASM_ARCH_MXC_H__ */ arch/arm/plat-mxc/tzic.c +0
-0
arch/arm/plat-mxc/tzic.c void __init tzic_init_irq(void __iomem *irqbase) · line 124
Quoted 3 lines
arch/arm/plat-mxc/tzic.c +0
-0@@ -122,6 +122,9 @@ void __init tzic_init_irq(void __iomem *irqbase)int i; tzic_base = irqbase;
ditto for tzic_base.
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Sascha Hauer
maintainerPATCH 4/7 ARM i.MX irq: Allow runtime decision between AVIC and TZIC
Quoted 25 lines · Uwe Kleine-K?nig
Quoted 19 lines · Sascha Hauer
As we are on a path to support more different i.MX SoCs in a single binary we have to able to support both AVIC and TZIC in a single binary. This patch only introduces overhead when both controllers are needed.
Signed-off-by Sascha Hauer <[email protected]>--- arch/arm/plat-mxc/avic.c | 2 + arch/arm/plat-mxc/cpu.c | 3 + arch/arm/plat-mxc/include/mach/entry-macro.S | 66 ++++++++++++++++---------- arch/arm/plat-mxc/include/mach/mxc.h | 8 +++ arch/arm/plat-mxc/tzic.c | 3 + 5 files changed, 57 insertions(+), 25 deletions(-)arch/arm/plat-mxc/avic.c +0
-0arch/arm/plat-mxc/avic.c void __init mxc_init_irq(void __iomem *irqbase) · line 120
Quoted 3 lines
arch/arm/plat-mxc/avic.c +0
-0@@ -118,6 +118,8 @@ void __init mxc_init_irq(void __iomem *irqbase)int i; avic_base = irqbase;Is
avic_basestill needed?
Quoted 6 lines
arch/arm/plat-mxc/avic.c void __init tzic_init_irq(void __iomem *irqbase) · line 124
Quoted 5 lines
arch/arm/plat-mxc/avic.c +1
-0+++ b/arch/arm/plat-mxc/tzic.c@@ -122,6 +122,9 @@ void __init tzic_init_irq(void __iomem *irqbase)int i; tzic_base = irqbase;ditto for
tzic_base.
The C code uses them. I only kept them to create a minimal patch. They can be removed in a later patch.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH 4/7 ARM i.MX irq: Allow runtime decision between AVIC and TZIC
In reply to Sascha HauerHello,
Quoted 4 lines · Sascha Hauer
As we are on a path to support more different i.MX SoCs in a single binary we have to able to support both AVIC and TZIC in a single binary. This patch only introduces overhead when both controllers are needed.
During my lunch break I remembered this patch:
http://article.gmane.org/gmane.linux.ports.arm.kernel/84809
With that supporting both irq controllers should be a bit nicer.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Sascha Hauer
maintainerPATCH 5/7 ARM i.MX DMA: return gracefully on different socs
In reply to Sascha HauerCode called from an initcall can be maybe called for machines it's not intended for. So check for valid machines and return gracefully if an incompatible machine is found.
--- arch/arm/mach-imx/dma-v1.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-imx/dma-v1.c +1 -1
@@ -818,7 +818,7 @@ static int __init imx_dma_init(void) imx_dmav1_baseaddr =MX27_IO_ADDRESS (MX27_DMA_BASE_ADDR ); else#endif -BUG (); +return 0 ; dma_clk =clk_get (NULL ,"dma" );clk_enable (dma_clk);
Signature · 1 line
1.7.2.3
Sascha Hauer
maintainerPATCH 6/7 ARM i.MX51: return gracefully on different socs
In reply to Sascha HauerCode called from an initcall can be maybe called for machines it's not intended for. So check for valid machines and return gracefully if an incompatible machine is found.
--- arch/arm/mach-mx5/cpu.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
arch/arm/mach-mx5/cpu.c +3 -0
@@ -79,6 +79,9 @@ EXPORT_SYMBOL(mx51_revision);*/ static int __init mx51_neon_fixup (void ) { +if (!cpu_is_mx51 ()) +return 0 ; +if (mx51_revision () <MX51_CHIP_REV_3_0 && (elf_hwcap &HWCAP_NEON )) { elf_hwcap &= ~HWCAP_NEON ;pr_info ("Turning off NEON support, detected broken NEON implementation\n" );
Signature · 1 line
1.7.2.3
Sascha Hauer
maintainerPATCH 7/7 ARM i.MX27 pm: return gracefully on different socs
In reply to Sascha HauerCode called from an initcall can be maybe called for machines it's not intended for. So check for valid machines and return gracefully if an incompatible machine is found.
--- arch/arm/mach-imx/pm-imx27.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
arch/arm/mach-imx/pm-imx27.c +3 -0
@@ -39,6 +39,9 @@ static struct platform_suspend_ops mx27_suspend_ops = {static int __init mx27_pm_init (void ) { +if (!cpu_is_mx27 ()) +return 0 ; +suspend_set_ops (&mx27_suspend_ops);return 0 ; }
Signature · 1 line
1.7.2.3