eukrea_mbimxsd: add audio support

PATCH New Eric Bénard 1 participant 8 messages Feb 25, 2011

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape

lore

Share & tools

lore

Eric Bénard

author

2011-02-25 13:38 UTC #0 lore raw

PATCH 1/6 eukrea_mbimxsd: add audio support

Signed-off-by Eric B?nard <[email protected]>

---
 arch/arm/mach-mx5/Kconfig                    |    1 +
 arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c |   28 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 0 deletions(-)

arch/arm/mach-mx5/Kconfig +1 -0

index 4e4d7af..ded1d2d 100644
@@ -108,6 +108,7 @@ config MACH_EUKREA_MBIMXSD51_BASEBOARD
 	prompt "Eukrea MBIMXSD development board"
 	bool
 	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+	select IMX_HAVE_PLATFORM_IMX_SSI
 	help
 	  This adds board specific devices that can be found on Eukrea's
 	  MBIMXSD evaluation board.

arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c +28 -0

index c372a43..712061c 100644
@@ -67,6 +67,11 @@ static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = {
 	MX51_PAD_SD1_DATA1__SD1_DATA1,
 	MX51_PAD_SD1_DATA2__SD1_DATA2,
 	MX51_PAD_SD1_DATA3__SD1_DATA3,
+	/* SSI */
+	MX51_PAD_AUD3_BB_TXD__AUD3_TXD,
+	MX51_PAD_AUD3_BB_RXD__AUD3_RXD,
+	MX51_PAD_AUD3_BB_CK__AUD3_TXC,
+	MX51_PAD_AUD3_BB_FS__AUD3_TXFS,
 };
 
 #define GPIO_LED1	IMX_GPIO_NR(3, 30)

@@ -133,6 +138,11 @@ static struct i2c_board_info eukrea_mbimxsd_i2c_devices[] = {
 	},
 };
 
+static const
+struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata __initconst = {
+	.flags = IMX_SSI_SYN | IMX_SSI_NET | IMX_SSI_USE_I2S_SLAVE,
+};
+
 /*
  * system init for baseboard usage. Will be called by cpuimx51sd init.
  *

@@ -145,10 +155,28 @@ void __init eukrea_mbimxsd51_baseboard_init(void)
 			ARRAY_SIZE(eukrea_mbimxsd_pads)))
 		printk(KERN_ERR "error setting mbimxsd pads !\n");
 
+#if defined(CONFIG_SND_SOC_EUKREA_TLV320)
+	/* SSI unit master I2S codec connected to SSI_AUD3 */
+	mxc_audmux_v2_configure_port(0,
+			MXC_AUDMUX_V2_PTCR_SYN |
+			MXC_AUDMUX_V2_PTCR_TFSDIR |
+			MXC_AUDMUX_V2_PTCR_TFSEL(2) |
+			MXC_AUDMUX_V2_PTCR_TCLKDIR |
+			MXC_AUDMUX_V2_PTCR_TCSEL(2),
+			MXC_AUDMUX_V2_PDCR_RXDSEL(2)
+	);
+	mxc_audmux_v2_configure_port(2,
+			MXC_AUDMUX_V2_PTCR_SYN |
+			MXC_AUDMUX_V2_PTCR_TCSEL(0),
+			MXC_AUDMUX_V2_PDCR_RXDSEL(0)
+	);
+#endif
+
 	imx51_add_imx_uart(1, NULL);
 	imx51_add_imx_uart(2, &uart_pdata);
 
 	imx51_add_sdhci_esdhc_imx(0, NULL);
+	imx51_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);
 
 	gpio_request(GPIO_LED1, "LED1");
 	gpio_direction_output(GPIO_LED1, 1);

Signature · 1 line

1.7.4

Eric Bénard

author

2011-02-25 13:38 UTC #1 lore raw

PATCH 2/6 cpuimx51sd: add cpufreq support

Signed-off-by Eric B?nard <[email protected]>

---
 arch/arm/mach-mx5/board-cpuimx51sd.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

arch/arm/mach-mx5/board-cpuimx51sd.c +5 -0

index b89afba..68ecfc0 100644
@@ -42,6 +42,7 @@
 
 #include "devices-imx51.h"
 #include "devices.h"
+#include "cpu_op-mx51.h"
 
 #define USBH1_RST		IMX_GPIO_NR(2, 28)
 #define ETH_RST			IMX_GPIO_NR(2, 31)

@@ -269,6 +270,10 @@ static void __init eukrea_cpuimx51sd_init(void)
 	mxc_iomux_v3_setup_multiple_pads(eukrea_cpuimx51sd_pads,
 					ARRAY_SIZE(eukrea_cpuimx51sd_pads));
 
+#if defined(CONFIG_CPU_FREQ_IMX)
+	get_cpu_op = mx51_get_cpu_op;
+#endif
+
 	imx51_add_imx_uart(0, &uart_pdata);
 	imx51_add_mxc_nand(&eukrea_cpuimx51sd_nand_board_info);

Signature · 1 line

1.7.4

Eric Bénard

author

2011-02-25 13:38 UTC #2 lore raw

PATCH 3/6 cpuimx51sd: fix tsc2007

In reply to Eric Bénard

- wrong MUX was set before for IRQ
- get_pendown_state is no more needed

Signed-off-by Eric B?nard <[email protected]>

---
 arch/arm/mach-mx5/board-cpuimx51sd.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

arch/arm/mach-mx5/board-cpuimx51sd.c +1 -7

index 68ecfc0..5b19419 100644
@@ -110,7 +110,7 @@ static iomux_v3_cfg_t eukrea_cpuimx51sd_pads[] = {
 
 	/* Touchscreen */
 	/* IRQ */
-	_MX51_PAD_CSI1_D8__GPIO3_12 | MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP |
+	MX51_PAD_GPIO_NAND__GPIO_NAND | MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP |
 			PAD_CTL_PKE | PAD_CTL_SRE_FAST |
 			PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
 };

@@ -119,15 +119,9 @@ static const struct imxuart_platform_data uart_pdata __initconst = {
 	.flags = IMXUART_HAVE_RTSCTS,
 };
 
-static int ts_get_pendown_state(void)
-{
-	return gpio_get_value(TSC2007_IRQGPIO) ? 0 : 1;
-}
-
 static struct tsc2007_platform_data tsc2007_info = {
 	.model			= 2007,
 	.x_plate_ohms		= 180,
-	.get_pendown_state	= ts_get_pendown_state,
 };
 
 static struct i2c_board_info eukrea_cpuimx51sd_i2c_devices[] = {

Signature · 1 line

1.7.4

Eric Bénard

author

2011-02-25 14:04 UTC #3 lore raw

PATCH v2 3/6 cpuimx51sd: fix tsc2007

- wrong MUX was set before for IRQ
- get_pendown_state is no more needed

Signed-off-by Eric B?nard <[email protected]>

---
v2 : use correct define for pad name (with _)

 arch/arm/mach-mx5/board-cpuimx51sd.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

arch/arm/mach-mx5/board-cpuimx51sd.c +1 -7

index 68ecfc0..6ac41d5 100644
@@ -110,7 +110,7 @@ static iomux_v3_cfg_t eukrea_cpuimx51sd_pads[] = {
 
 	/* Touchscreen */
 	/* IRQ */
-	_MX51_PAD_CSI1_D8__GPIO3_12 | MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP |
+	_MX51_PAD_GPIO_NAND__GPIO_NAND | MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP |
 			PAD_CTL_PKE | PAD_CTL_SRE_FAST |
 			PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
 };

@@ -119,15 +119,9 @@ static const struct imxuart_platform_data uart_pdata __initconst = {
 	.flags = IMXUART_HAVE_RTSCTS,
 };
 
-static int ts_get_pendown_state(void)
-{
-	return gpio_get_value(TSC2007_IRQGPIO) ? 0 : 1;
-}
-
 static struct tsc2007_platform_data tsc2007_info = {
 	.model			= 2007,
 	.x_plate_ohms		= 180,
-	.get_pendown_state	= ts_get_pendown_state,
 };
 
 static struct i2c_board_info eukrea_cpuimx51sd_i2c_devices[] = {

Signature · 1 line

1.7.4

Eric Bénard

author

2011-02-25 13:38 UTC #4 lore raw

PATCH 4/6 cpuimx51sd: mcp2515 supports up to 10MHz SPI clock

In reply to Eric Bénard

Signed-off-by Eric B?nard <[email protected]>

---
 arch/arm/mach-mx5/board-cpuimx51sd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/mach-mx5/board-cpuimx51sd.c +1 -1

index 5b19419..4d4e8e4 100644
@@ -237,7 +237,7 @@ static struct mcp251x_platform_data mcp251x_info = {
 static struct spi_board_info cpuimx51sd_spi_device[] = {
 	{
 		.modalias        = "mcp2515",
-		.max_speed_hz    = 6500000,
+		.max_speed_hz    = 10000000,
 		.bus_num         = 0,
 		.mode		= SPI_MODE_0,
 		.chip_select     = 0,

Signature · 1 line

1.7.4

Eric Bénard

author

2011-02-25 13:38 UTC #5 lore raw

PATCH 5/6 eukrea_mbimxsd51: add IPU support

In reply to Eric Bénard

- TFT lcd or DVI output selection
- if a TFT is used, add backight and lcd platform data

Signed-off-by Eric B?nard <[email protected]>

---
 arch/arm/mach-mx5/Kconfig                    |    1 +
 arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c |  131 ++++++++++++++++++++++++++
 2 files changed, 132 insertions(+), 0 deletions(-)

arch/arm/mach-mx5/Kconfig +1 -0

index ded1d2d..c50089b 100644
@@ -109,6 +109,7 @@ config MACH_EUKREA_MBIMXSD51_BASEBOARD
 	bool
 	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
 	select IMX_HAVE_PLATFORM_IMX_SSI
+	select IMX_HAVE_PLATFORM_IMX_IPUV3
 	help
 	  This adds board specific devices that can be found on Eukrea's
 	  MBIMXSD evaluation board.

arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c +131 -0

167 lines not on this page · raw message

Signature · 1 line

1.7.4

Eric Bénard

author

2011-02-25 14:04 UTC #6 lore raw

PATCH v2 5/6 eukrea_mbimxsd51: add IPU support

- TFT lcd or DVI output selection
- if a TFT is used, add backight and lcd platform data

Signed-off-by Eric B?nard <[email protected]>

---
v2 : don't free gpio when lcd is selected

 arch/arm/mach-mx5/Kconfig                    |    1 +
 arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c |  132 ++++++++++++++++++++++++++
 2 files changed, 133 insertions(+), 0 deletions(-)

arch/arm/mach-mx5/Kconfig +1 -0

index ded1d2d..c50089b 100644
@@ -109,6 +109,7 @@ config MACH_EUKREA_MBIMXSD51_BASEBOARD
 	bool
 	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
 	select IMX_HAVE_PLATFORM_IMX_SSI
+	select IMX_HAVE_PLATFORM_IMX_IPUV3
 	help
 	  This adds board specific devices that can be found on Eukrea's
 	  MBIMXSD evaluation board.

arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c +132 -0

168 lines not on this page · raw message

Signature · 1 line

1.7.4

Eric Bénard

author

2011-02-25 13:38 UTC #7 lore raw

PATCH 6/6 eukrea_mbimxsd51: add SD Card detect

In reply to Eric Bénard

Signed-off-by Eric B?nard <[email protected]>

---
 arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c +4 -0

index fe70e76..04927ff 100644
@@ -103,6 +103,10 @@ static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = {
 	MX51_PAD_DI1_D1_CS__GPIO3_4,
 	/* LCD RST */
 	MX51_PAD_CSI1_D9__GPIO3_13,
+	/* SD1 CD */
+	_MX51_PAD_GPIO1_0__SD1_CD | MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP |
+			PAD_CTL_PKE | PAD_CTL_SRE_FAST |
+			PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
 };
 
 #define GPIO_LED1	IMX_GPIO_NR(3, 30)

Signature · 1 line

1.7.4