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

Commit 34e2fde8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits)
  ARM: 5865/1: nuc900 ethernet driver needs mii
  ARM: 5864/1: Implement arch_reset() in NUC900
  ARM: 5863/1: fix bugs of clock source of NUC900
  ARM: 5858/1: Remove unused vma_vm_flags macro from v7wbi_flush_user_tlb_range
  imx/mx3: depend on USB_ULPI for otg_ulpi_create
  ARM: MX3: make CPU revision number detection work on all boards
  mx25: pdk: add platform code for FEC support
  mx25: add support for FEC on i.MX25
  mx25: s/NO_PAD_CTL/NO_PAD_CTRL/
  mx31moboard: fix usbh device names
  mx3: add support for the mt9v022 camera sensor to pcm037 platform
  mx27: mxt_td60: Remove not used UART pins
  [ARM] pxa/poodle: fix incorrect 'gpio_card_detect' of MMC
  [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot
  [ARM] pxa/ttc_dkb: remove duplicate macro definition
  [ARM] pxa/zeus: provide power-source information when APM is enabled
  [ARM] pxa/zeus: relax memory timings on Zeus ethernet ports
  [ARM] pxa/zeus: make internal zeus_get_pcb_info static
  [ARM] pxa/littleton: select CPU_PXA300 and CPU_PXA310
  [ARM] pxa/littleton: add UART3 GPIO config
  ...
parents 10b465aa dc2f9c5a

arch/arm/mach-mmp/ttc_dkb.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -24,8 +24,6 @@ 




#include "common.h"

#include "common.h"





#define ARRAY_AND_SIZE(x)       (x), ARRAY_SIZE(x)



static unsigned long ttc_dkb_pin_config[] __initdata = {

static unsigned long ttc_dkb_pin_config[] __initdata = {

	/* UART2 */

	/* UART2 */

	GPIO47_UART2_RXD,

	GPIO47_UART2_RXD,

arch/arm/mach-mx2/mxt_td60.c

+0 −24
Original line number Original line Diff line number Diff line
@@ -58,21 +58,6 @@ static unsigned int mxt_td60_pins[] __initdata = { 
	PE9_PF_UART3_RXD,

	PE9_PF_UART3_RXD,

	PE10_PF_UART3_CTS,

	PE10_PF_UART3_CTS,

	PE11_PF_UART3_RTS,

	PE11_PF_UART3_RTS,

	/* UART3 */

	PB26_AF_UART4_RTS,

	PB28_AF_UART4_TXD,

	PB29_AF_UART4_CTS,

	PB31_AF_UART4_RXD,

	/* UART4 */

	PB18_AF_UART5_TXD,

	PB19_AF_UART5_RXD,

	PB20_AF_UART5_CTS,

	PB21_AF_UART5_RTS,

	/* UART5 */

	PB10_AF_UART6_TXD,

	PB12_AF_UART6_CTS,

	PB11_AF_UART6_RXD,

	PB13_AF_UART6_RTS,

	/* FEC */

	/* FEC */

	PD0_AIN_FEC_TXD0,

	PD0_AIN_FEC_TXD0,

	PD1_AIN_FEC_TXD1,

	PD1_AIN_FEC_TXD1,
@@ -261,12 +246,6 @@ static struct imxuart_platform_data uart_pdata[] = { 
		.flags = IMXUART_HAVE_RTSCTS,

		.flags = IMXUART_HAVE_RTSCTS,

	}, {

	}, {

		.flags = IMXUART_HAVE_RTSCTS,

		.flags = IMXUART_HAVE_RTSCTS,

	}, {

		.flags = IMXUART_HAVE_RTSCTS,

	}, {

		.flags = IMXUART_HAVE_RTSCTS,

	}, {

		.flags = IMXUART_HAVE_RTSCTS,

	},

	},

};

};
@@ -278,9 +257,6 @@ static void __init mxt_td60_board_init(void) 
	mxc_register_device(&mxc_uart_device0, &uart_pdata[0]);

	mxc_register_device(&mxc_uart_device0, &uart_pdata[0]);

	mxc_register_device(&mxc_uart_device1, &uart_pdata[1]);

	mxc_register_device(&mxc_uart_device1, &uart_pdata[1]);

	mxc_register_device(&mxc_uart_device2, &uart_pdata[2]);

	mxc_register_device(&mxc_uart_device2, &uart_pdata[2]);

	mxc_register_device(&mxc_uart_device3, &uart_pdata[3]);

	mxc_register_device(&mxc_uart_device4, &uart_pdata[4]);

	mxc_register_device(&mxc_uart_device5, &uart_pdata[5]);

	mxc_register_device(&mxc_nand_device, &mxt_td60_nand_board_info);

	mxc_register_device(&mxc_nand_device, &mxt_td60_nand_board_info);





	i2c_register_board_info(0, mxt_td60_i2c_devices,

	i2c_register_board_info(0, mxt_td60_i2c_devices,

arch/arm/mach-mx25/clock.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -173,6 +173,7 @@ DEFINE_CLOCK(pwm4_clk, 0, CCM_CGCR2, 2, get_rate_ipg, NULL); 
DEFINE_CLOCK(kpp_clk,	 0, CCM_CGCR1, 28, get_rate_ipg, NULL);

DEFINE_CLOCK(kpp_clk,	 0, CCM_CGCR1, 28, get_rate_ipg, NULL);

DEFINE_CLOCK(tsc_clk,	 0, CCM_CGCR2, 13, get_rate_ipg, NULL);

DEFINE_CLOCK(tsc_clk,	 0, CCM_CGCR2, 13, get_rate_ipg, NULL);

DEFINE_CLOCK(i2c_clk,	 0, CCM_CGCR0,  6, get_rate_i2c, NULL);

DEFINE_CLOCK(i2c_clk,	 0, CCM_CGCR0,  6, get_rate_i2c, NULL);

DEFINE_CLOCK(fec_clk,	 0, CCM_CGCR0, 23, get_rate_ipg, NULL);





#define _REGISTER_CLOCK(d, n, c)	\

#define _REGISTER_CLOCK(d, n, c)	\

	{				\

	{				\
@@ -204,6 +205,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)

	_REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)

	_REGISTER_CLOCK("imx-i2c.1", NULL, i2c_clk)

	_REGISTER_CLOCK("imx-i2c.1", NULL, i2c_clk)

	_REGISTER_CLOCK("imx-i2c.2", NULL, i2c_clk)

	_REGISTER_CLOCK("imx-i2c.2", NULL, i2c_clk)

	_REGISTER_CLOCK("fec.0", NULL, fec_clk)

};

};





int __init mx25_clocks_init(unsigned long fref)

int __init mx25_clocks_init(unsigned long fref)

arch/arm/mach-mx25/devices.c

+19 −0
Original line number Original line Diff line number Diff line
@@ -419,3 +419,22 @@ int __init mxc_register_gpios(void) 
	return mxc_gpio_init(imx_gpio_ports, ARRAY_SIZE(imx_gpio_ports));

	return mxc_gpio_init(imx_gpio_ports, ARRAY_SIZE(imx_gpio_ports));

}

}





static struct resource mx25_fec_resources[] = {

	{

		.start	= MX25_FEC_BASE_ADDR,

		.end	= MX25_FEC_BASE_ADDR + 0xfff,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= MX25_INT_FEC,

		.end	= MX25_INT_FEC,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device mx25_fec_device = {

	.name	= "fec",

	.id	= 0,

	.num_resources	= ARRAY_SIZE(mx25_fec_resources),

	.resource	= mx25_fec_resources,

};

arch/arm/mach-mx25/devices.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,3 +17,4 @@ extern struct platform_device mxc_keypad_device; 
extern struct platform_device mxc_i2c_device0;

extern struct platform_device mxc_i2c_device0;

extern struct platform_device mxc_i2c_device1;

extern struct platform_device mxc_i2c_device1;

extern struct platform_device mxc_i2c_device2;

extern struct platform_device mxc_i2c_device2;

extern struct platform_device mx25_fec_device;