my imx changes for 2.6.34
Subsystems (3)
Hello,
I have made a few more patches based on Sascha's mxc-master branch for 2.6.34.
As usual I'll send them as reply to this mail and they are available via git. Diffstat and shortlog are below.
Best regards
Uwe
The following changes since commit 1eaa4f2762899d2f3c54ba7a4fee564e255ad0a5:
Baruch Siach (1):
mx25pdk: platform code for the DryIce RTC module
are available in the git repository at:
git://git.pengutronix.de/git/ukl/linux-2.6.git imx/master
Uwe Kleine-K?nig (8):
mx1: prefix SOC specific defines with MX1_ and deprecate old names
mx25: deprecate UART1_BASE_ADDR and UART2_BASE_ADDR
imx: BUG in clk_disable if the clock isn't enabled
mxc91231: use MXC91231_IO_ADDRESS instead of MXC91231_AIPS1_IO_ADDRESS
mxc91231: redefine MXC91231_IO_ADDRESS using IMX_IO_ADDRESS
imx2x: convert serial.c to use soc-prefixed constants
imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSET imx/mx25: rename files defining a machine to mach-$mach.c
arch/arm/mach-mx1/Makefile | 1 +
arch/arm/mach-mx1/mach-mx1ads.c | 4 +-
arch/arm/mach-mx2/Makefile | 1 -
arch/arm/mach-mx2/mach-cpuimx27.c | 2 +-
arch/arm/mach-mx2/mach-imx27lite.c | 2 +-
arch/arm/mach-mx2/mach-mx21ads.c | 2 +-
arch/arm/mach-mx2/mach-mx27_3ds.c | 2 +-
arch/arm/mach-mx2/mach-mx27ads.c | 2 +-
arch/arm/mach-mx2/mach-mxt_td60.c | 2 +-
arch/arm/mach-mx2/mach-pca100.c | 2 +-
arch/arm/mach-mx2/mach-pcm038.c | 2 +-
arch/arm/mach-mx2/serial.c | 48 ++--
arch/arm/mach-mx25/Makefile | 2 +-
arch/arm/mach-mx25/{mx25pdk.c => mach-mx25pdk.c} | 2 +-
arch/arm/mach-mx3/mach-armadillo5x0.c | 2 +-
arch/arm/mach-mx3/mach-kzm_arm11_01.c | 2 +-
arch/arm/mach-mx3/mach-mx31_3ds.c | 2 +-
arch/arm/mach-mx3/mach-mx31ads.c | 2 +-
arch/arm/mach-mx3/mach-mx31lilly.c | 2 +-
arch/arm/mach-mx3/mach-mx31lite.c | 2 +-
arch/arm/mach-mx3/mach-mx31moboard.c | 2 +-
arch/arm/mach-mx3/mach-mx35pdk.c | 2 +-
arch/arm/mach-mx3/mach-pcm037.c | 2 +-
arch/arm/mach-mx3/mach-pcm043.c | 2 +-
arch/arm/mach-mx3/mach-qong.c | 2 +-
arch/arm/mach-mxc91231/magx-zn5.c | 2 +-
arch/arm/plat-mxc/clock.c | 1 +
arch/arm/plat-mxc/include/mach/debug-macro.S | 2 +-
arch/arm/plat-mxc/include/mach/memory.h | 36 ++-
arch/arm/plat-mxc/include/mach/mx1.h | 387 +++++++++++++++-------
arch/arm/plat-mxc/include/mach/mx25.h | 9 +-
arch/arm/plat-mxc/include/mach/mxc91231.h | 58 +---
32 files changed, 349 insertions(+), 242 deletions(-)
rename arch/arm/mach-mx25/{mx25pdk.c => mach-mx25pdk.c} (98%)Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 1/8 mx1: prefix SOC specific defines with MX1_ and deprecate old names
The old names are defined only if the cpp symbol IMX_NEEDS_DEPRECATED_SYMBOLS exists, which is defined (for now) for all files below arch/arm/mach-mx1.
This was done earlier for mx2 and mx3, too.
USBD_INT0 is for now defined unconditionally to prevent breaking drivers/usb/gadget/imx_udc.
While at it use IMX_IO_ADDRESS to define MX1_IO_ADDRESS which adds a cast to the IO_ADDRESS macro fixing many warnings like
arch/arm/mach-mx1/generic.c:51: warning: passing argument 1 of 'mxc_init_irq' makes pointer from integer without a cast
.
--- arch/arm/mach-mx1/Makefile | 1 + arch/arm/plat-mxc/include/mach/mx1.h | 387 +++++++++++++++++++++++----------- 2 files changed, 261 insertions(+), 127 deletions(-)
arch/arm/mach-mx1/Makefile +1 -0
@@ -4,6 +4,7 @@ # Object file lists. +EXTRA_CFLAGS += -DIMX_NEEDS_DEPRECATED_SYMBOLS obj-y += generic.o clock.o devices.o # Support for CMOS sensor interface
arch/arm/plat-mxc/include/mach/mx1.h +260 -127
408 lines not on this page · raw message
Signature · 1 line
1.6.6
PATCH 2/8 mx25: deprecate UART1_BASE_ADDR and UART2_BASE_ADDR
In reply to Uwe Kleine-König--- arch/arm/plat-mxc/include/mach/mx25.h | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
arch/arm/plat-mxc/include/mach/mx25.h +7 -2
@@ -27,8 +27,8 @@ IMX_IO_ADDRESS(x, MX25_AIPS2) ?: \ IMX_IO_ADDRESS(x, MX25_AVIC)) -#define UART1_BASE_ADDR 0x43f90000 -#define UART2_BASE_ADDR 0x43f94000 +#define MX25_UART1_BASE_ADDR 0x43f90000 +#define MX25_UART2_BASE_ADDR 0x43f94000#define MX25_FEC_BASE_ADDR 0x50038000#define MX25_NFC_BASE_ADDR 0xbb000000
@@ -38,4 +38,9 @@#define MX25_INT_FEC 57#define MX25_INT_NANDFC 33 +#if defined(IMX_NEEDS_DEPRECATED_SYMBOLS ) +#define UART1_BASE_ADDR MX25_UART1_BASE_ADDR +#define UART2_BASE_ADDR MX25_UART2_BASE_ADDR +#endif +#endif /* ifndef __MACH_MX25_H__ */
Signature · 1 line
1.6.6
PATCH 3/8 imx: BUG in clk_disable if the clock isn't enabled
In reply to Uwe Kleine-König--- arch/arm/plat-mxc/clock.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/plat-mxc/clock.c +1 -0
@@ -56,6 +56,7 @@ static void __clk_disable(struct clk *clk)__clk_disable (clk->parent);__clk_disable (clk->secondary); +BUG_ON (!clk->usecount);if (!(--clk->usecount) && clk->disable) clk->disable (clk); }
Signature · 1 line
1.6.6
PATCH 3/8 imx: BUG in clk_disable if the clock isn't enabled
Hi Uwe,
Quoted 12 lines · Uwe Kleine-K?nig
Signed-off-by Uwe Kleine-K?nig <[email protected]>Cc Sascha Hauer <[email protected]>Cc Russell King <[email protected]>--- arch/arm/plat-mxc/clock.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)arch/arm/plat-mxc/clock.c +0
-0
arch/arm/plat-mxc/clock.c static void __clk_disable(struct clk *clk) · line 61
Quoted 6 lines
arch/arm/plat-mxc/clock.c +1
-0@@ -56,6 +56,7 @@ static void __clk_disable(struct clk *clk)__clk_disable (clk->parent);__clk_disable (clk->secondary); +BUG_ON (!clk->usecount);if (!(--clk->usecount) && clk->disable) clk->disable (clk);
Is this necessary? Shouldn't WARN_ON be used instead?
Citing include/asm-generic/bug.h: "Don't use BUG() or BUG_ON() unless there's really no way out..."
baruch
Signature · 3 lines
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -PATCH 3/8 imx: BUG in clk_disable if the clock isn't enabled
Hi Baruch,
Quoted 16 lines · Baruch Siach
Quoted 15 lines · Uwe Kleine-K?nig
Signed-off-by Uwe Kleine-K?nig <[email protected]>Cc Sascha Hauer <[email protected]>Cc Russell King <[email protected]>--- arch/arm/plat-mxc/clock.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)arch/arm/plat-mxc/clock.c +0
-0@@ -56,6 +56,7 @@ static void __clk_disable(struct clk *clk)__clk_disable (clk->parent);__clk_disable (clk->secondary);
Quoted 8 lines
arch/arm/plat-mxc/clock.c static void __clk_disable(struct clk *clk) · line 61
Quoted 3 lines
arch/arm/plat-mxc/clock.c +1
-0+BUG_ON (!clk->usecount);if (!(--clk->usecount) && clk->disable) clk->disable (clk);Is this necessary? Shouldn't
WARN_ONbe used instead?Citing
include/asm-generic/bug.h: "Don't useBUG()orBUG_ON()unless there's really no way out..."
I don't care much. AFAIK nothing grave happens if a disabled clock is disabled again provided the disable has a balancing enable. So the only reason to use BUG_ON is that it hurts more :-)
I will change it,
thanks Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 4/8 mxc91231: use MXC91231_IO_ADDRESS instead of MXC91231_AIPS1_IO_ADDRESS
In reply to Uwe Kleine-KönigApart from MXC91231_IO_ADDRESS itself this was the only usage of MXC91231_AIPS1_IO_ADDRESS. Now MXC91231_IO_ADDRESS can be recoded with IMX_IO_ADDRESS and all helper macros can go away.
--- arch/arm/plat-mxc/include/mach/debug-macro.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/plat-mxc/include/mach/debug-macro.S +1 -1
@@ -51,7 +51,7 @@ #endif #include <mach/mxc91231.h> #define UART_PADDR MXC91231_UART2_BASE_ADDR -#define UART_VADDR MXC91231_AIPS1_IO_ADDRESS(MXC91231_UART2_BASE_ADDR) +#define UART_VADDR MXC91231_IO_ADDRESS(MXC91231_UART2_BASE_ADDR) #endif .macro addruart,rx mrc p15, 0, \rx, c1, c0
Signature · 1 line
1.6.6
PATCH 5/8 mxc91231: redefine MXC91231_IO_ADDRESS using IMX_IO_ADDRESS
In reply to Uwe Kleine-KönigThis simplifies the macro and makes is similar to the other ..._IO_ADDRESS macros defined for imx SOCs.
--- arch/arm/plat-mxc/include/mach/mxc91231.h | 58 +++++------------------------ 1 files changed, 10 insertions(+), 48 deletions(-)
arch/arm/plat-mxc/include/mach/mxc91231.h +10 -48
@@ -184,60 +184,22 @@#define MXC91231_CS4_BASE_ADDR 0xB4000000#define MXC91231_CS5_BASE_ADDR 0xB6000000 -/* Is given address belongs to the specified memory region? */ -#define ADDRESS_IN_REGION (addr, start, size) \ - (((addr) >= (start)) && ((addr) < (start)+(size))) - -/* Is given address belongs to the specified named `module'? */ -#define MXC91231_IS_MODULE (addr, module) \ - ADDRESS_IN_REGION(addr, MXC91231_ ## module ## _BASE_ADDR, \ - MXC91231_ ## module ## _SIZE)/* * This macro defines the physical to virtual address mapping for all the * peripheral modules. It is used by passing in the physical address as x * and returning the virtual address. If the physical address is not mapped, -* it returns 0xDEADBEEF -*/ - -#define MXC91231_IO_ADDRESS (x) \ - (void __iomem *) \ - (MXC91231_IS_MODULE(x, L2CC) ? MXC91231_L2CC_IO_ADDRESS(x) : \ - MXC91231_IS_MODULE(x, AIPS1) ? MXC91231_AIPS1_IO_ADDRESS(x) : \ - MXC91231_IS_MODULE(x, AIPS2) ? MXC91231_AIPS2_IO_ADDRESS(x) : \ - MXC91231_IS_MODULE(x, SPBA0) ? MXC91231_SPBA0_IO_ADDRESS(x) : \ - MXC91231_IS_MODULE(x, SPBA1) ? MXC91231_SPBA1_IO_ADDRESS(x) : \ - MXC91231_IS_MODULE(x, ROMP) ? MXC91231_ROMP_IO_ADDRESS(x) : \ - MXC91231_IS_MODULE(x, AVIC) ? MXC91231_AVIC_IO_ADDRESS(x) : \ - MXC91231_IS_MODULE(x, X_MEMC) ? MXC91231_X_MEMC_IO_ADDRESS(x) : \ - 0xDEADBEEF) - - -/* -* define the address mapping macros: in physical address order +* it returns 0. */ -#define MXC91231_L2CC_IO_ADDRESS (x) \ - (((x) - MXC91231_L2CC_BASE_ADDR) + MXC91231_L2CC_BASE_ADDR_VIRT) - -#define MXC91231_AIPS1_IO_ADDRESS (x) \ - (((x) - MXC91231_AIPS1_BASE_ADDR) + MXC91231_AIPS1_BASE_ADDR_VIRT) - -#define MXC91231_SPBA0_IO_ADDRESS (x) \ - (((x) - MXC91231_SPBA0_BASE_ADDR) + MXC91231_SPBA0_BASE_ADDR_VIRT) - -#define MXC91231_SPBA1_IO_ADDRESS (x) \ - (((x) - MXC91231_SPBA1_BASE_ADDR) + MXC91231_SPBA1_BASE_ADDR_VIRT) - -#define MXC91231_AIPS2_IO_ADDRESS (x) \ - (((x) - MXC91231_AIPS2_BASE_ADDR) + MXC91231_AIPS2_BASE_ADDR_VIRT) - -#define MXC91231_ROMP_IO_ADDRESS (x) \ - (((x) - MXC91231_ROMP_BASE_ADDR) + MXC91231_ROMP_BASE_ADDR_VIRT) - -#define MXC91231_AVIC_IO_ADDRESS (x) \ - (((x) - MXC91231_AVIC_BASE_ADDR) + MXC91231_AVIC_BASE_ADDR_VIRT) -#define MXC91231_X_MEMC_IO_ADDRESS (x) \ - (((x) - MXC91231_X_MEMC_BASE_ADDR) + MXC91231_X_MEMC_BASE_ADDR_VIRT) +#define MXC91231_IO_ADDRESS (x) ( \ + IMX_IO_ADDRESS(x, MXC91231_L2CC) ?: \ + IMX_IO_ADDRESS(x, MXC91231_X_MEMC) ?: \ + IMX_IO_ADDRESS(x, MXC91231_ROMP) ?: \ + IMX_IO_ADDRESS(x, MXC91231_AVIC) ?: \ + IMX_IO_ADDRESS(x, MXC91231_AIPS1) ?: \ + IMX_IO_ADDRESS(x, MXC91231_SPBA0) ?: \ + IMX_IO_ADDRESS(x, MXC91231_SPBA1) ?: \ + IMX_IO_ADDRESS(x, MXC91231_AIPS2))/* * Interrupt numbers
Signature · 1 line
1.6.6
PATCH 6/8 imx2x: convert serial.c to use soc-prefixed constants
In reply to Uwe Kleine-KönigThis makes the file compilable for a kernel that supports both imx21 and imx27.
--- arch/arm/mach-mx2/Makefile | 1 - arch/arm/mach-mx2/serial.c | 48 ++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 25 deletions(-)
arch/arm/mach-mx2/Makefile +0 -1
@@ -7,7 +7,6 @@ obj-y := generic.o devices.o serial.o CFLAGS_generic.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS CFLAGS_devices.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS -CFLAGS_serial.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS obj-$(CONFIG_MACH_MX21) += clock_imx21.o
arch/arm/mach-mx2/serial.c +24 -24
96 lines not on this page · raw message
Signature · 1 line
1.6.6
PATCH 7/8 imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSET
In reply to Uwe Kleine-KönigThis is a further step in allowing to build a kernel image for more than one imx SOC.
--- arch/arm/mach-mx1/mach-mx1ads.c | 4 +- arch/arm/mach-mx2/mach-cpuimx27.c | 2 +- arch/arm/mach-mx2/mach-imx27lite.c | 2 +- arch/arm/mach-mx2/mach-mx21ads.c | 2 +- arch/arm/mach-mx2/mach-mx27_3ds.c | 2 +- arch/arm/mach-mx2/mach-mx27ads.c | 2 +- arch/arm/mach-mx2/mach-mxt_td60.c | 2 +- arch/arm/mach-mx2/mach-pca100.c | 2 +- arch/arm/mach-mx2/mach-pcm038.c | 2 +- arch/arm/mach-mx25/mx25pdk.c | 2 +- arch/arm/mach-mx3/mach-armadillo5x0.c | 2 +- arch/arm/mach-mx3/mach-kzm_arm11_01.c | 2 +- arch/arm/mach-mx3/mach-mx31_3ds.c | 2 +- arch/arm/mach-mx3/mach-mx31ads.c | 2 +- arch/arm/mach-mx3/mach-mx31lilly.c | 2 +- arch/arm/mach-mx3/mach-mx31lite.c | 2 +- arch/arm/mach-mx3/mach-mx31moboard.c | 2 +- arch/arm/mach-mx3/mach-mx35pdk.c | 2 +- arch/arm/mach-mx3/mach-pcm037.c | 2 +- arch/arm/mach-mx3/mach-pcm043.c | 2 +- arch/arm/mach-mx3/mach-qong.c | 2 +- arch/arm/mach-mxc91231/magx-zn5.c | 2 +- arch/arm/plat-mxc/include/mach/memory.h | 36 ++++++++++++++++++------------- 23 files changed, 44 insertions(+), 38 deletions(-)
arch/arm/mach-mx1/mach-mx1ads.c +2 -2
@@ -147,7 +147,7 @@ MACHINE_START(MX1ADS, "Freescale MX1ADS")/* Maintainer: Sascha Hauer, Pengutronix */ .phys_io = IMX_IO_PHYS, .io_pg_offst = (IMX_IO_BASE >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX1_PHYS_OFFSET + 0x100, .map_io = mx1_map_io, .init_irq = mx1_init_irq, .timer = &mx1ads_timer,
@@ -157,7 +157,7 @@ MACHINE_ENDMACHINE_START (MXLADS ,"Freescale MXLADS" ) .phys_io = IMX_IO_PHYS, .io_pg_offst = (IMX_IO_BASE >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX1_PHYS_OFFSET + 0x100, .map_io = mx1_map_io, .init_irq = mx1_init_irq, .timer = &mx1ads_timer,
arch/arm/mach-mx2/mach-cpuimx27.c +1 -1
@@ -226,7 +226,7 @@ static struct sys_timer eukrea_cpuimx27_timer = {MACHINE_START (CPUIMX27 ,"EUKREA CPUIMX27" ) .phys_io = MX27_AIPI_BASE_ADDR, .io_pg_offst = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX27_PHYS_OFFSET + 0x100, .map_io = mx27_map_io, .init_irq = mx27_init_irq, .init_machine = eukrea_cpuimx27_init,
arch/arm/mach-mx2/mach-imx27lite.c +1 -1
@@ -87,7 +87,7 @@ static struct sys_timer mx27lite_timer = {MACHINE_START (IMX27LITE ,"LogicPD i.MX27LITE" ) .phys_io = MX27_AIPI_BASE_ADDR, .io_pg_offst = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX27_PHYS_OFFSET + 0x100, .map_io = mx27_map_io, .init_irq = mx27_init_irq, .init_machine = mx27lite_init,
arch/arm/mach-mx2/mach-mx21ads.c +1 -1
@@ -286,7 +286,7 @@ MACHINE_START(MX21ADS, "Freescale i.MX21ADS")/* maintainer: Freescale Semiconductor, Inc. */ .phys_io = MX21_AIPI_BASE_ADDR, .io_pg_offst = ((MX21_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX21_PHYS_OFFSET + 0x100, .map_io = mx21ads_map_io, .init_irq = mx21_init_irq, .init_machine = mx21ads_board_init,
arch/arm/mach-mx2/mach-mx27_3ds.c +1 -1
@@ -87,7 +87,7 @@ MACHINE_START(MX27_3DS, "Freescale MX27PDK")/* maintainer: Freescale Semiconductor, Inc. */ .phys_io = MX27_AIPI_BASE_ADDR, .io_pg_offst = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX27_PHYS_OFFSET + 0x100, .map_io = mx27_map_io, .init_irq = mx27_init_irq, .init_machine = mx27pdk_init,
arch/arm/mach-mx2/mach-mx27ads.c +1 -1
@@ -336,7 +336,7 @@ MACHINE_START(MX27ADS, "Freescale i.MX27ADS")/* maintainer: Freescale Semiconductor, Inc. */ .phys_io = MX27_AIPI_BASE_ADDR, .io_pg_offst = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX27_PHYS_OFFSET + 0x100, .map_io = mx27ads_map_io, .init_irq = mx27_init_irq, .init_machine = mx27ads_board_init,
arch/arm/mach-mx2/mach-mxt_td60.c +1 -1
@@ -286,7 +286,7 @@ MACHINE_START(MXT_TD60, "Maxtrack i-MXT TD60")/* maintainer: Maxtrack Industrial */ .phys_io = MX27_AIPI_BASE_ADDR, .io_pg_offst = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX27_PHYS_OFFSET + 0x100, .map_io = mx27_map_io, .init_irq = mx27_init_irq, .init_machine = mxt_td60_board_init,
arch/arm/mach-mx2/mach-pca100.c +1 -1
@@ -235,7 +235,7 @@ static struct sys_timer pca100_timer = {MACHINE_START (PCA100 ,"phyCARD-i.MX27" ) .phys_io = MX27_AIPI_BASE_ADDR, .io_pg_offst = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX27_PHYS_OFFSET + 0x100, .map_io = mx27_map_io, .init_irq = mx27_init_irq, .init_machine = pca100_init,
arch/arm/mach-mx2/mach-pcm038.c +1 -1
@@ -328,7 +328,7 @@ static struct sys_timer pcm038_timer = {MACHINE_START (PCM038 ,"phyCORE-i.MX27" ) .phys_io = MX27_AIPI_BASE_ADDR, .io_pg_offst = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX27_PHYS_OFFSET + 0x100, .map_io = mx27_map_io, .init_irq = mx27_init_irq, .init_machine = pcm038_init,
arch/arm/mach-mx25/mx25pdk.c +1 -1
@@ -110,7 +110,7 @@ MACHINE_START(MX25_3DS, "Freescale MX25PDK (3DS)")/* Maintainer: Freescale Semiconductor, Inc. */ .phys_io = MX25_AIPS1_BASE_ADDR, .io_pg_offst = ((MX25_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX25_PHYS_OFFSET + 0x100, .map_io = mx25_map_io, .init_irq = mx25_init_irq, .init_machine = mx25pdk_init,
arch/arm/mach-mx3/mach-armadillo5x0.c +1 -1
@@ -408,7 +408,7 @@ MACHINE_START(ARMADILLO5X0, "Armadillo-500")/* Maintainer: Alberto Panizzo */ .phys_io = MX31_AIPS1_BASE_ADDR, .io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x00000100, + .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = mx31_map_io, .init_irq = mx31_init_irq, .timer = &armadillo5x0_timer,
arch/arm/mach-mx3/mach-kzm_arm11_01.c +1 -1
@@ -265,7 +265,7 @@ static struct sys_timer kzm_timer = {MACHINE_START (KZM_ARM11_01 ,"Kyoto Microcomputer Co., Ltd. KZM-ARM11-01" ) .phys_io = MX31_AIPS1_BASE_ADDR, .io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = kzm_map_io, .init_irq = mx31_init_irq, .init_machine = kzm_board_init,
arch/arm/mach-mx3/mach-mx31_3ds.c +1 -1
@@ -258,7 +258,7 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")/* Maintainer: Freescale Semiconductor, Inc. */ .phys_io = MX31_AIPS1_BASE_ADDR, .io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = mx31pdk_map_io, .init_irq = mx31_init_irq, .init_machine = mxc_board_init,
arch/arm/mach-mx3/mach-mx31ads.c +1 -1
@@ -537,7 +537,7 @@ MACHINE_START(MX31ADS, "Freescale MX31ADS")/* Maintainer: Freescale Semiconductor, Inc. */ .phys_io = MX31_AIPS1_BASE_ADDR, .io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = mx31ads_map_io, .init_irq = mx31ads_init_irq, .init_machine = mxc_board_init,
arch/arm/mach-mx3/mach-mx31lilly.c +1 -1
@@ -197,7 +197,7 @@ static struct sys_timer mx31lilly_timer = {MACHINE_START (LILLY1131 ,"INCO startec LILLY-1131" ) .phys_io = MX31_AIPS1_BASE_ADDR, .io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = mx31_map_io, .init_irq = mx31_init_irq, .init_machine = mx31lilly_board_init,
arch/arm/mach-mx3/mach-mx31lite.c +1 -1
@@ -289,7 +289,7 @@ MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM")/* Maintainer: Freescale Semiconductor, Inc. */ .phys_io = MX31_AIPS1_BASE_ADDR, .io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = mx31lite_map_io, .init_irq = mx31_init_irq, .init_machine = mxc_board_init,
arch/arm/mach-mx3/mach-mx31moboard.c +1 -1
@@ -571,7 +571,7 @@ MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard")/* Maintainer: Valentin Longchamp, EPFL Mobots group */ .phys_io = MX31_AIPS1_BASE_ADDR, .io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = mx31_map_io, .init_irq = mx31_init_irq, .init_machine = mxc_board_init,
arch/arm/mach-mx3/mach-mx35pdk.c +1 -1
@@ -108,7 +108,7 @@ MACHINE_START(MX35_3DS, "Freescale MX35PDK")/* Maintainer: Freescale Semiconductor, Inc */ .phys_io = MX35_AIPS1_BASE_ADDR, .io_pg_offst = ((MX35_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = mx35_map_io, .init_irq = mx35_init_irq, .init_machine = mxc_board_init,
arch/arm/mach-mx3/mach-pcm037.c +1 -1
@@ -638,7 +638,7 @@ MACHINE_START(PCM037, "Phytec Phycore pcm037")/* Maintainer: Pengutronix */ .phys_io = MX31_AIPS1_BASE_ADDR, .io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = mx31_map_io, .init_irq = mx31_init_irq, .init_machine = mxc_board_init,
arch/arm/mach-mx3/mach-pcm043.c +1 -1
@@ -250,7 +250,7 @@ MACHINE_START(PCM043, "Phytec Phycore pcm043")/* Maintainer: Pengutronix */ .phys_io = MX35_AIPS1_BASE_ADDR, .io_pg_offst = ((MX35_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = mx35_map_io, .init_irq = mx35_init_irq, .init_machine = mxc_board_init,
arch/arm/mach-mx3/mach-qong.c +1 -1
@@ -275,7 +275,7 @@ MACHINE_START(QONG, "Dave/DENX QongEVB-LITE")/* Maintainer: DENX Software Engineering GmbH */ .phys_io = MX31_AIPS1_BASE_ADDR, .io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = mx31_map_io, .init_irq = mx31_init_irq, .init_machine = mxc_board_init,
arch/arm/mach-mxc91231/magx-zn5.c +1 -1
@@ -55,7 +55,7 @@ struct sys_timer zn5_timer = {MACHINE_START (MAGX_ZN5 ,"Motorola Zn5" ) .phys_io = MXC91231_AIPS1_BASE_ADDR, .io_pg_offst = ((MXC91231_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MXC91231_PHYS_OFFSET + 0x100, .map_io = mxc91231_map_io, .init_irq = mxc91231_init_irq, .timer = &zn5_timer,
arch/arm/plat-mxc/include/mach/memory.h +21 -15
@@ -11,21 +11,27 @@#ifndef __ASM_ARCH_MXC_MEMORY_H__#define __ASM_ARCH_MXC_MEMORY_H__ -#if definedCONFIG_ARCH_MX1 -#define PHYS_OFFSET UL(0x08000000) -#elif definedCONFIG_ARCH_MX2 -#ifdef CONFIG_MACH_MX21 -#define PHYS_OFFSET UL(0xC0000000) -#endif -#ifdef CONFIG_MACH_MX27 -#define PHYS_OFFSET UL(0xA0000000) -#endif -#elif definedCONFIG_ARCH_MX3 -#define PHYS_OFFSET UL(0x80000000) -#elif definedCONFIG_ARCH_MX25 -#define PHYS_OFFSET UL(0x80000000) -#elif definedCONFIG_ARCH_MXC91231 -#define PHYS_OFFSET UL(0x90000000) +#define MX1_PHYS_OFFSET UL(0x08000000) +#define MX21_PHYS_OFFSET UL(0xc0000000) +#define MX25_PHYS_OFFSET UL(0x80000000) +#define MX27_PHYS_OFFSET UL(0xa0000000) +#define MX3x_PHYS_OFFSET UL(0x80000000) +#define MXC91231_PHYS_OFFSET UL(0x90000000) + +#if !defined(CONFIG_RUNTIME_PHYS_OFFSET ) +# if definedCONFIG_ARCH_MX1 +# define PHYS_OFFSET MX1_PHYS_OFFSET +# elif definedCONFIG_MACH_MX21 +# define PHYS_OFFSET MX21_PHYS_OFFSET +# elif definedCONFIG_ARCH_MX25 +# define PHYS_OFFSET MX25_PHYS_OFFSET +# elif definedCONFIG_MACH_MX27 +# define PHYS_OFFSET MX27_PHYS_OFFSET +# elif definedCONFIG_ARCH_MX3 +# define PHYS_OFFSET MX3x_PHYS_OFFSET +# elif definedCONFIG_ARCH_MXC91231 +# define PHYS_OFFSET MXC91231_PHYS_OFFSET +# endif #endif #if defined(CONFIG_MX1_VIDEO )
Signature · 1 line
1.6.6
PATCH 8/8 imx/mx25: rename files defining a machine to mach-$mach.c
In reply to Uwe Kleine-König--- arch/arm/mach-mx25/Makefile | 2 +- arch/arm/mach-mx25/mach-mx25pdk.c | 119 +++++++++++++++++++++++++++++++++++++ arch/arm/mach-mx25/mx25pdk.c | 119 ------------------------------------- 3 files changed, 120 insertions(+), 120 deletions(-) create mode 100644 arch/arm/mach-mx25/mach-mx25pdk.c delete mode 100644 arch/arm/mach-mx25/mx25pdk.c
arch/arm/mach-mx25/Makefile +1 -1
@@ -1,3 +1,3 @@ obj-y := mm.o devices.o obj-$(CONFIG_ARCH_MX25) += clock.o -obj-$(CONFIG_MACH_MX25_3DS) += mx25pdk.o +obj-$(CONFIG_MACH_MX25_3DS) += mach-mx25pdk.o
arch/arm/mach-mx25/mach-mx25pdk.c new file +119 -0
119 lines not on this page · raw message
arch/arm/mach-mx25/mx25pdk.c deleted +0 -119
119 lines not on this page · raw message
Signature · 1 line
1.6.6