renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 05:04:00 +08:00
Code

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

Browse Source
This commit is contained in:
Russell King 2008-10-30 15:04:22 +00:00 committed by Russell King
commit ab3bd08a25
6 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-mx3/mx31ads.c
View File

@ -35,6 +35,8 @@
#include <mach/imx-uart.h> #include <mach/imx-uart.h>
#include <mach/iomux-mx3.h> #include <mach/iomux-mx3.h>
#include "devices.h"
/*! /*!
* @file mx31ads.c * @file mx31ads.c
* *

4
arch/arm/mach-mx3/pcm037.c
View File

@ -91,12 +91,12 @@ static struct map_desc pcm037_io_desc[] __initdata = {
.virtual = AIPS1_BASE_ADDR_VIRT, .virtual = AIPS1_BASE_ADDR_VIRT,
.pfn = __phys_to_pfn(AIPS1_BASE_ADDR), .pfn = __phys_to_pfn(AIPS1_BASE_ADDR),
.length = AIPS1_SIZE, .length = AIPS1_SIZE,
.type = MT_DEVICE .type = MT_DEVICE_NONSHARED
}, { }, {
.virtual = AIPS2_BASE_ADDR_VIRT, .virtual = AIPS2_BASE_ADDR_VIRT,
.pfn = __phys_to_pfn(AIPS2_BASE_ADDR), .pfn = __phys_to_pfn(AIPS2_BASE_ADDR),
.length = AIPS2_SIZE, .length = AIPS2_SIZE,
.type = MT_DEVICE .type = MT_DEVICE_NONSHARED
}, },
}; };

2
arch/arm/plat-mxc/gpio.c
View File

@ -188,7 +188,7 @@ static int mxc_gpio_get(struct gpio_chip *chip, unsigned offset)
struct mxc_gpio_port *port = struct mxc_gpio_port *port =
container_of(chip, struct mxc_gpio_port, chip); 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) static int mxc_gpio_direction_input(struct gpio_chip *chip, unsigned offset)

20
arch/arm/plat-mxc/include/mach/io.h
View File

@ -14,6 +14,26 @@
/* Allow IO space to be anywhere in the memory */ /* Allow IO space to be anywhere in the memory */
#define IO_SPACE_LIMIT 0xffffffff #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 */ /* io address mapping macro */
#define __io(a) ((void __iomem *)(a)) #define __io(a) ((void __iomem *)(a))

4
drivers/serial/Kconfig
View File

@ -1276,7 +1276,7 @@ config SERIAL_SGI_IOC3
say Y or M. Otherwise, say N. say Y or M. Otherwise, say N.
config SERIAL_NETX config SERIAL_NETX
bool "NetX serial port support" tristate "NetX serial port support"
depends on ARM && ARCH_NETX depends on ARM && ARCH_NETX
select SERIAL_CORE select SERIAL_CORE
help help
@ -1288,7 +1288,7 @@ config SERIAL_NETX
config SERIAL_NETX_CONSOLE config SERIAL_NETX_CONSOLE
bool "Console on NetX serial port" bool "Console on NetX serial port"
depends on SERIAL_NETX depends on SERIAL_NETX=y
select SERIAL_CORE_CONSOLE select SERIAL_CORE_CONSOLE
help help
If you have enabled the serial port on the Hilscher NetX SoC If you have enabled the serial port on the Hilscher NetX SoC

4
drivers/serial/netx-serial.c
View File

@ -42,8 +42,6 @@
#define SERIAL_NX_MAJOR 204 #define SERIAL_NX_MAJOR 204
#define MINOR_START 170 #define MINOR_START 170
#ifdef CONFIG_SERIAL_NETX_CONSOLE
enum uart_regs { enum uart_regs {
UART_DR = 0x00, UART_DR = 0x00,
UART_SR = 0x04, UART_SR = 0x04,
@ -528,6 +526,8 @@ static struct netx_port netx_ports[] = {
} }
}; };
#ifdef CONFIG_SERIAL_NETX_CONSOLE
static void netx_console_putchar(struct uart_port *port, int ch) static void netx_console_putchar(struct uart_port *port, int ch)
{ {
while (readl(port->membase + UART_FR) & FR_BUSY); while (readl(port->membase + UART_FR) & FR_BUSY);