diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-01-19 03:09:10 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-01 21:08:54 -0500 |
commit | 920925f90fa6455f7e8c9db0e215e706cd7dedeb (patch) | |
tree | 917a98a8929c2fa95c561b21fe47b6d63de5facf /arch/sh/boards | |
parent | 331af0c15284798f678057a52039ef24f7c04f22 (diff) |
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>
Diffstat (limited to 'arch/sh/boards')
-rw-r--r-- | arch/sh/boards/mach-migor/setup.c | 16 |
1 files changed, 16 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[] = { | |||
419 | I2C_BOARD_INFO("migor_ts", 0x51), | 419 | I2C_BOARD_INFO("migor_ts", 0x51), |
420 | .irq = 38, /* IRQ6 */ | 420 | .irq = 38, /* IRQ6 */ |
421 | }, | 421 | }, |
422 | { | ||
423 | I2C_BOARD_INFO("wm8978", 0x1a), | ||
424 | }, | ||
422 | }; | 425 | }; |
423 | 426 | ||
424 | static struct i2c_board_info migor_i2c_camera[] = { | 427 | static struct i2c_board_info migor_i2c_camera[] = { |
@@ -619,6 +622,19 @@ static int __init migor_devices_setup(void) | |||
619 | 622 | ||
620 | platform_resource_setup_memory(&migor_ceu_device, "ceu", 4 << 20); | 623 | platform_resource_setup_memory(&migor_ceu_device, "ceu", 4 << 20); |
621 | 624 | ||
625 | /* SIU: Port B */ | ||
626 | gpio_request(GPIO_FN_SIUBOLR, NULL); | ||
627 | gpio_request(GPIO_FN_SIUBOBT, NULL); | ||
628 | gpio_request(GPIO_FN_SIUBISLD, NULL); | ||
629 | gpio_request(GPIO_FN_SIUBOSLD, NULL); | ||
630 | gpio_request(GPIO_FN_SIUMCKB, NULL); | ||
631 | |||
632 | /* | ||
633 | * The original driver sets SIUB OLR/OBT, ILR/IBT, and SIUA OLR/OBT to | ||
634 | * output. Need only SIUB, set to output for master mode (table 34.2) | ||
635 | */ | ||
636 | ctrl_outw(ctrl_inw(PORT_MSELCRA) | 1, PORT_MSELCRA); | ||
637 | |||
622 | i2c_register_board_info(0, migor_i2c_devices, | 638 | i2c_register_board_info(0, migor_i2c_devices, |
623 | ARRAY_SIZE(migor_i2c_devices)); | 639 | ARRAY_SIZE(migor_i2c_devices)); |
624 | 640 | ||