2 files changed, 17 insertions, 0 deletions

diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index be300aaca6fe..dc2ddc2c2d8d 100644
--- 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 cee6cb88e020..42fccf93412e 100644
--- 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