Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 (3ac58431) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/mach-mx2/mxt_td60.c

+0 −24

Original line number	Diff line number	Diff line
		@@ -58,21 +58,6 @@ static unsigned int mxt_td60_pins[] __initdata = {
		PE9_PF_UART3_RXD,
		PE10_PF_UART3_CTS,
		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 */
		PD0_AIN_FEC_TXD0,
		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,
		},
		};

		@@ -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_device1, &uart_pdata[1]);
		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);

		i2c_register_board_info(0, mxt_td60_i2c_devices,

arch/arm/mach-mx25/clock.c

+2 −0

Original line number	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(tsc_clk, 0, CCM_CGCR2, 13, get_rate_ipg, 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) \
		{ \
		@@ -204,6 +205,7 @@ static struct clk_lookup lookups[] = {
		_REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)
		_REGISTER_CLOCK("imx-i2c.1", 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)

arch/arm/mach-mx25/devices.c

+19 −0

Original line number	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));
		}

		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	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_device1;
		extern struct platform_device mxc_i2c_device2;
		extern struct platform_device mx25_fec_device;

arch/arm/mach-mx25/mx25pdk.c

+44 −2

Original line number	Diff line number	Diff line
		@@ -18,10 +18,11 @@

		#include <linux/types.h>
		#include <linux/init.h>
		#include <linux/delay.h>
		#include <linux/clk.h>
		#include <linux/irq.h>
		#include <linux/gpio.h>
		#include <linux/smsc911x.h>
		#include <linux/fec.h>
		#include <linux/platform_device.h>

		#include <mach/hardware.h>
		@@ -35,16 +36,57 @@
		#include <mach/mx25.h>
		#include <mach/mxc_nand.h>
		#include "devices.h"
		#include <mach/iomux-v3.h>
		#include <mach/iomux.h>

		static struct imxuart_platform_data uart_pdata = {
		.flags = IMXUART_HAVE_RTSCTS,
		};

		static struct pad_desc mx25pdk_pads[] = {
		MX25_PAD_FEC_MDC__FEC_MDC,
		MX25_PAD_FEC_MDIO__FEC_MDIO,
		MX25_PAD_FEC_TDATA0__FEC_TDATA0,
		MX25_PAD_FEC_TDATA1__FEC_TDATA1,
		MX25_PAD_FEC_TX_EN__FEC_TX_EN,
		MX25_PAD_FEC_RDATA0__FEC_RDATA0,
		MX25_PAD_FEC_RDATA1__FEC_RDATA1,
		MX25_PAD_FEC_RX_DV__FEC_RX_DV,
		MX25_PAD_FEC_TX_CLK__FEC_TX_CLK,
		MX25_PAD_A17__GPIO_2_3, /* FEC_EN, GPIO 35 */
		MX25_PAD_D12__GPIO_4_8, /* FEC_RESET_B, GPIO 104 */
		};

		static struct fec_platform_data mx25_fec_pdata = {
		.phy = PHY_INTERFACE_MODE_RMII,
		};

		#define FEC_ENABLE_GPIO 35
		#define FEC_RESET_B_GPIO 104

		static void __init mx25pdk_fec_reset(void)
		{
		gpio_request(FEC_ENABLE_GPIO, "FEC PHY enable");
		gpio_request(FEC_RESET_B_GPIO, "FEC PHY reset");

		gpio_direction_output(FEC_ENABLE_GPIO, 0); /* drop PHY power */
		gpio_direction_output(FEC_RESET_B_GPIO, 0); /* assert reset */
		udelay(2);

		/* turn on PHY power and lift reset */
		gpio_set_value(FEC_ENABLE_GPIO, 1);
		gpio_set_value(FEC_RESET_B_GPIO, 1);
		}

		static void __init mx25pdk_init(void)
		{
		mxc_iomux_v3_setup_multiple_pads(mx25pdk_pads,
		ARRAY_SIZE(mx25pdk_pads));

		mxc_register_device(&mxc_uart_device0, &uart_pdata);
		mxc_register_device(&mxc_usbh2, NULL);

		mx25pdk_fec_reset();
		mxc_register_device(&mx25_fec_device, &mx25_fec_pdata);
		}

		static void __init mx25pdk_timer_init(void)