Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fd96bbb authored by Sascha Hauer's avatar Sascha Hauer
Browse files

Merge branch 'imx/master' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master

parents 5c17ef87 e27bf724

arch/arm/mach-mx1/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/mach-mx1/mach-mx1ads.c

+2 −2
Original line number Diff line number Diff line
@@ -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_END 
MACHINE_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/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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/mach-cpuimx27.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,