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

Commit ab3bd08a authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk-rc' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6

parents 9c656850 2eca047b

arch/arm/mach-mx3/mx31ads.c

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ 
#include <mach/imx-uart.h>

#include <mach/iomux-mx3.h>



#include "devices.h"



/*!

 * @file mx31ads.c

 *

arch/arm/mach-mx3/pcm037.c

+2 −2
Original line number Diff line number Diff line
@@ -91,12 +91,12 @@ static struct map_desc pcm037_io_desc[] __initdata = { 
		.virtual	= AIPS1_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(AIPS1_BASE_ADDR),

		.length		= AIPS1_SIZE,

		.type		= MT_DEVICE

		.type		= MT_DEVICE_NONSHARED

	}, {

		.virtual	= AIPS2_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(AIPS2_BASE_ADDR),

		.length		= AIPS2_SIZE,

		.type		= MT_DEVICE

		.type		= MT_DEVICE_NONSHARED

	},

};

arch/arm/plat-mxc/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static int mxc_gpio_get(struct gpio_chip *chip, unsigned offset) 
	struct mxc_gpio_port *port =

		container_of(chip, struct mxc_gpio_port, chip);



	return (__raw_readl(port->base + GPIO_DR) >> offset) & 1;

	return (__raw_readl(port->base + GPIO_PSR) >> offset) & 1;

}



static int mxc_gpio_direction_input(struct gpio_chip *chip, unsigned offset)

arch/arm/plat-mxc/include/mach/io.h

+20 −0
Original line number Diff line number Diff line
@@ -14,6 +14,26 @@ 
/* Allow IO space to be anywhere in the memory */

#define IO_SPACE_LIMIT 0xffffffff



#ifdef CONFIG_ARCH_MX3

#define __arch_ioremap __mx3_ioremap

#define __arch_iounmap __iounmap



static inline void __iomem *

__mx3_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)

{

	if (mtype == MT_DEVICE) {

		/* Access all peripherals below 0x80000000 as nonshared device

		 * but leave l2cc alone.

		 */

		if ((phys_addr < 0x80000000) && ((phys_addr < L2CC_BASE_ADDR) ||

			(phys_addr >= L2CC_BASE_ADDR + L2CC_SIZE)))

			mtype = MT_DEVICE_NONSHARED;

	}



	return __arm_ioremap(phys_addr, size, mtype);

}

#endif



/* io address mapping macro */

#define __io(a)			((void __iomem *)(a))

drivers/serial/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -1276,7 +1276,7 @@ config SERIAL_SGI_IOC3 
	  say Y or M.  Otherwise, say N.



config SERIAL_NETX

	bool "NetX serial port support"

	tristate "NetX serial port support"

	depends on ARM && ARCH_NETX

	select SERIAL_CORE

	help
@@ -1288,7 +1288,7 @@ config SERIAL_NETX 


config SERIAL_NETX_CONSOLE

	bool "Console on NetX serial port"

	depends on SERIAL_NETX

	depends on SERIAL_NETX=y

	select SERIAL_CORE_CONSOLE

	help

	  If you have enabled the serial port on the Hilscher NetX SoC