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

Commit 0bd5292f authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel

parents fdb0a1a6 a2449091

arch/arm/mach-mx1/devices.c

+4 −4
Original line number Diff line number Diff line
@@ -232,25 +232,25 @@ static struct mxc_gpio_port imx_gpio_ports[] = { 
		.chip.label = "gpio-0",

		.base = (void __iomem *)IO_ADDRESS(GPIO_BASE_ADDR),

		.irq = GPIO_INT_PORTA,

		.virtual_irq_start = MXC_MAX_INT_LINES

		.virtual_irq_start = MXC_GPIO_IRQ_START

	},

	[1] = {

		.chip.label = "gpio-1",

		.base = (void __iomem *)IO_ADDRESS(GPIO_BASE_ADDR + 0x100),

		.irq = GPIO_INT_PORTB,

		.virtual_irq_start = MXC_MAX_INT_LINES + 32

		.virtual_irq_start = MXC_GPIO_IRQ_START + 32

	},

	[2] = {

		.chip.label = "gpio-2",

		.base = (void __iomem *)IO_ADDRESS(GPIO_BASE_ADDR + 0x200),

		.irq = GPIO_INT_PORTC,

		.virtual_irq_start = MXC_MAX_INT_LINES + 64

		.virtual_irq_start = MXC_GPIO_IRQ_START + 64

	},

	[3] = {

		.chip.label = "gpio-3",

		.base = (void __iomem *)IO_ADDRESS(GPIO_BASE_ADDR + 0x300),

		.irq = GPIO_INT_PORTD,

		.virtual_irq_start = MXC_MAX_INT_LINES + 96

		.virtual_irq_start = MXC_GPIO_IRQ_START + 96

	}

};

arch/arm/mach-mx2/devices.c

+6 −6
Original line number Diff line number Diff line
@@ -230,32 +230,32 @@ static struct mxc_gpio_port imx_gpio_ports[] = { 
		.chip.label = "gpio-0",

		.irq = MXC_INT_GPIO,

		.base = (void*)(AIPI_BASE_ADDR_VIRT + 0x15000 + 0x100 * 0),

		.virtual_irq_start = MXC_MAX_INT_LINES,

		.virtual_irq_start = MXC_GPIO_IRQ_START,

	},

	[1] = {

		.chip.label = "gpio-1",

		.base = (void*)(AIPI_BASE_ADDR_VIRT + 0x15000 + 0x100 * 1),

		.virtual_irq_start = MXC_MAX_INT_LINES + 32,

		.virtual_irq_start = MXC_GPIO_IRQ_START + 32,

	},

	[2] = {

		.chip.label = "gpio-2",

		.base = (void*)(AIPI_BASE_ADDR_VIRT + 0x15000 + 0x100 * 2),

		.virtual_irq_start = MXC_MAX_INT_LINES + 64,

		.virtual_irq_start = MXC_GPIO_IRQ_START + 64,

	},

	[3] = {

		.chip.label = "gpio-3",

		.base = (void*)(AIPI_BASE_ADDR_VIRT + 0x15000 + 0x100 * 3),

		.virtual_irq_start = MXC_MAX_INT_LINES + 96,

		.virtual_irq_start = MXC_GPIO_IRQ_START + 96,

	},

	[4] = {

		.chip.label = "gpio-4",

		.base = (void*)(AIPI_BASE_ADDR_VIRT + 0x15000 + 0x100 * 4),

		.virtual_irq_start = MXC_MAX_INT_LINES + 128,

		.virtual_irq_start = MXC_GPIO_IRQ_START + 128,

	},

	[5] = {

		.chip.label = "gpio-5",

		.base = (void*)(AIPI_BASE_ADDR_VIRT + 0x15000 + 0x100 * 5),

		.virtual_irq_start = MXC_MAX_INT_LINES + 160,

		.virtual_irq_start = MXC_GPIO_IRQ_START + 160,

	}

};

arch/arm/mach-mx2/mx27ads.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int uart_mxc_port1_init(struct platform_device *pdev) 


static int uart_mxc_port1_exit(struct platform_device *pdev)

{

	mxc_gpio_setup_release_pins(mxc_uart1_pins,

	mxc_gpio_release_multiple_pins(mxc_uart1_pins,

			ARRAY_SIZE(mxc_uart1_pins));

	return 0;

}

arch/arm/mach-mx3/clock.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/err.h>

#include <linux/io.h>

#include <mach/clock.h>

#include <mach/hardware.h>

#include <asm/div64.h>



#include "crm_regs.h"

arch/arm/mach-mx3/devices.c

+3 −3
Original line number Diff line number Diff line
@@ -125,19 +125,19 @@ static struct mxc_gpio_port imx_gpio_ports[] = { 
		.chip.label = "gpio-0",

		.base = IO_ADDRESS(GPIO1_BASE_ADDR),

		.irq = MXC_INT_GPIO1,

		.virtual_irq_start = MXC_GPIO_INT_BASE

		.virtual_irq_start = MXC_GPIO_IRQ_START,

	},

	[1] = {

		.chip.label = "gpio-1",

		.base = IO_ADDRESS(GPIO2_BASE_ADDR),

		.irq = MXC_INT_GPIO2,

		.virtual_irq_start = MXC_GPIO_INT_BASE + GPIO_NUM_PIN

		.virtual_irq_start = MXC_GPIO_IRQ_START + 32,

	},

	[2] = {

		.chip.label = "gpio-2",

		.base = IO_ADDRESS(GPIO3_BASE_ADDR),

		.irq = MXC_INT_GPIO3,

		.virtual_irq_start = MXC_GPIO_INT_BASE + GPIO_NUM_PIN * 2

		.virtual_irq_start = MXC_GPIO_IRQ_START + 64,

	}

};