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

Commit 7138a7f9 authored by Eric Bénard's avatar Eric Bénard Committed by Sascha Hauer
Browse files

ARM: imx: eukrea_cpuimx51sd: support rev2 PCB 



rev1 were shipped with silicon 2.0, rev2 with silicon 3.0
so we are using the silicon version to know the PCB revision

Signed-off-by: default avatarEric Bénard <eric@eukrea.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 932d67d4

arch/arm/mach-imx/mach-cpuimx51sd.c

+41 −8
Original line number Diff line number Diff line
@@ -41,11 +41,13 @@ 


#define USBH1_RST		IMX_GPIO_NR(2, 28)

#define ETH_RST			IMX_GPIO_NR(2, 31)

#define TSC2007_IRQGPIO		IMX_GPIO_NR(3, 12)

#define TSC2007_IRQGPIO_REV2	IMX_GPIO_NR(3, 12)

#define TSC2007_IRQGPIO_REV3	IMX_GPIO_NR(4, 0)

#define CAN_IRQGPIO		IMX_GPIO_NR(1, 1)

#define CAN_RST			IMX_GPIO_NR(4, 15)

#define CAN_NCS			IMX_GPIO_NR(4, 24)

#define CAN_RXOBF		IMX_GPIO_NR(1, 4)

#define CAN_RXOBF_REV2		IMX_GPIO_NR(1, 4)

#define CAN_RXOBF_REV3		IMX_GPIO_NR(3, 12)

#define CAN_RX1BF		IMX_GPIO_NR(1, 6)

#define CAN_TXORTS		IMX_GPIO_NR(1, 7)

#define CAN_TX1RTS		IMX_GPIO_NR(1, 8)
@@ -90,6 +92,10 @@ static iomux_v3_cfg_t eukrea_cpuimx51sd_pads[] = { 
	MX51_PAD_I2C1_CLK__GPIO4_16,

	MX51_PAD_I2C1_DAT__GPIO4_17,



	/* I2C1 */

	MX51_PAD_SD2_CMD__I2C1_SCL,

	MX51_PAD_SD2_CLK__I2C1_SDA,



	/* CAN */

	MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI,

	MX51_PAD_CSPI1_MISO__ECSPI1_MISO,
@@ -108,15 +114,27 @@ static iomux_v3_cfg_t eukrea_cpuimx51sd_pads[] = { 
	NEW_PAD_CTRL(MX51_PAD_GPIO_NAND__GPIO_NAND, PAD_CTL_PUS_22K_UP |

			PAD_CTL_PKE | PAD_CTL_SRE_FAST |

			PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),

	NEW_PAD_CTRL(MX51_PAD_NANDF_D8__GPIO4_0, PAD_CTL_PUS_22K_UP |

			PAD_CTL_PKE | PAD_CTL_SRE_FAST |

			PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),

};



static const struct imxuart_platform_data uart_pdata __initconst = {

	.flags = IMXUART_HAVE_RTSCTS,

};



static int tsc2007_get_pendown_state(void)

{

	if (mx51_revision() < IMX_CHIP_REVISION_3_0)

		return !gpio_get_value(TSC2007_IRQGPIO_REV2);

	else

		return !gpio_get_value(TSC2007_IRQGPIO_REV3);

}



static struct tsc2007_platform_data tsc2007_info = {

	.model			= 2007,

	.x_plate_ohms		= 180,

	.get_pendown_state	= tsc2007_get_pendown_state,

};



static struct i2c_board_info eukrea_cpuimx51sd_i2c_devices[] = {
@@ -126,7 +144,6 @@ static struct i2c_board_info eukrea_cpuimx51sd_i2c_devices[] = { 
		I2C_BOARD_INFO("tsc2007", 0x49),

		.type		= "tsc2007",

		.platform_data	= &tsc2007_info,

		.irq		= IMX_GPIO_TO_IRQ(TSC2007_IRQGPIO),

	},

};
@@ -255,10 +272,14 @@ static const struct spi_imx_master cpuimx51sd_ecspi1_pdata __initconst = { 
	.num_chipselect	= ARRAY_SIZE(cpuimx51sd_spi1_cs),

};



static struct platform_device *platform_devices[] __initdata = {

static struct platform_device *rev2_platform_devices[] __initdata = {

	&hsi2c_gpio_device,

};



static const struct imxi2c_platform_data cpuimx51sd_i2c_data __initconst = {

	.bitrate = 100000,

};



static void __init eukrea_cpuimx51sd_init(void)

{

	imx51_soc_init();
@@ -292,13 +313,25 @@ static void __init eukrea_cpuimx51sd_init(void) 
	spi_register_board_info(cpuimx51sd_spi_device,

				ARRAY_SIZE(cpuimx51sd_spi_device));



	gpio_request(TSC2007_IRQGPIO, "tsc2007_irq");

	gpio_direction_input(TSC2007_IRQGPIO);

	gpio_free(TSC2007_IRQGPIO);

	if (mx51_revision() < IMX_CHIP_REVISION_3_0) {

		eukrea_cpuimx51sd_i2c_devices[1].irq =

			gpio_to_irq(TSC2007_IRQGPIO_REV2),

		platform_add_devices(rev2_platform_devices,

			ARRAY_SIZE(rev2_platform_devices));

		gpio_request(TSC2007_IRQGPIO_REV2, "tsc2007_irq");

		gpio_direction_input(TSC2007_IRQGPIO_REV2);

		gpio_free(TSC2007_IRQGPIO_REV2);

	} else {

		eukrea_cpuimx51sd_i2c_devices[1].irq =

			gpio_to_irq(TSC2007_IRQGPIO_REV3),

		imx51_add_imx_i2c(0, &cpuimx51sd_i2c_data);

		gpio_request(TSC2007_IRQGPIO_REV3, "tsc2007_irq");

		gpio_direction_input(TSC2007_IRQGPIO_REV3);

		gpio_free(TSC2007_IRQGPIO_REV3);

	}



	i2c_register_board_info(0, eukrea_cpuimx51sd_i2c_devices,

			ARRAY_SIZE(eukrea_cpuimx51sd_i2c_devices));

	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));



	if (otg_mode_host)

		imx51_add_mxc_ehci_otg(&dr_utmi_config);