sh: audio support for the sh7722 Migo-R board

Configure SIU port B pins and register the WM8978 audio codec.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index be300aaca6fed6ceea4c8ddfe64c3b3190f1384e..dc2ddc2c2d8dfbe6002203d870e9008c9af22a6a 100644 (file)
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -419,6 +419,9 @@ static struct i2c_board_info migor_i2c_devices[] = {
                I2C_BOARD_INFO("migor_ts", 0x51),
                .irq = 38, /* IRQ6 */
        },
+       {
+               I2C_BOARD_INFO("wm8978", 0x1a),
+       },
 };
 
 static struct i2c_board_info migor_i2c_camera[] = {
@@ -619,6 +622,19 @@ static int __init migor_devices_setup(void)
 
        platform_resource_setup_memory(&migor_ceu_device, "ceu", 4 << 20);
 
+       /* SIU: Port B */
+       gpio_request(GPIO_FN_SIUBOLR, NULL);
+       gpio_request(GPIO_FN_SIUBOBT, NULL);
+       gpio_request(GPIO_FN_SIUBISLD, NULL);
+       gpio_request(GPIO_FN_SIUBOSLD, NULL);
+       gpio_request(GPIO_FN_SIUMCKB, NULL);
+
+       /*
+        * The original driver sets SIUB OLR/OBT, ILR/IBT, and SIUA OLR/OBT to
+        * output. Need only SIUB, set to output for master mode (table 34.2)
+        */
+       ctrl_outw(ctrl_inw(PORT_MSELCRA) | 1, PORT_MSELCRA);
+
        i2c_register_board_info(0, migor_i2c_devices,
                                ARRAY_SIZE(migor_i2c_devices));
 

diff --git a/arch/sh/include/mach-migor/mach/migor.h b/arch/sh/include/mach-migor/mach/migor.h
index cee6cb88e0209eb2b13adb454e60c22bc1ed177a..42fccf93412e0996c878835c70257e90d38544f6 100644 (file)
--- a/arch/sh/include/mach-migor/mach/migor.h
+++ b/arch/sh/include/mach-migor/mach/migor.h
@@ -1,6 +1,7 @@
 #ifndef __ASM_SH_MIGOR_H
 #define __ASM_SH_MIGOR_H
 
+#define PORT_MSELCRA 0xa4050180
 #define PORT_MSELCRB 0xa4050182
 #define BSC_CS4BCR 0xfec10010
 #define BSC_CS6ABCR 0xfec1001c