From 37412f3201590e47a06d4678fa833164d370b41c Mon Sep 17 00:00:00 2001 From: Hung-Te Lin Date: Fri, 8 Nov 2013 21:22:03 +0800 Subject: [PATCH] nyan: Add pinmux settings for audio peripherals. The clock output and I2S1 GPIO pins must be correctly configured so we can initialize the audio system. BUG=none TEST=emerge-nyan chromeos-coreboot-nyan BRANCH=none Change-Id: Ie0f283ab8948b0d9ac713eec3bc7c8ae72949330 Signed-off-by: Hung-Te Lin Reviewed-on: https://chromium-review.googlesource.com/176212 Reviewed-by: Gabe Black Reviewed-by: David Hendricks --- src/mainboard/google/nyan/mainboard.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/mainboard/google/nyan/mainboard.c b/src/mainboard/google/nyan/mainboard.c index 2dfe6252af..1116c001f1 100644 --- a/src/mainboard/google/nyan/mainboard.c +++ b/src/mainboard/google/nyan/mainboard.c @@ -181,6 +181,21 @@ static void setup_pinmux(void) * but it doesn't. Go with GPIOs for now and solve the problem later. */ gpio_output_open_drain(GPIO(N4), 1); /* USB VBUS EN0 */ gpio_output_open_drain(GPIO(N5), 1); /* USB VBUS EN1 */ + + /* Clock output 1 (for external peripheral) */ + pinmux_set_config(PINMUX_DAP_MCLK1_INDEX, + PINMUX_DAP_MCLK1_FUNC_EXTPERIPH1 | PINMUX_PULL_NONE); + + /* I2S1 */ + pinmux_set_config(PINMUX_DAP2_DIN_INDEX, + PINMUX_DAP2_DIN_FUNC_I2S1 | PINMUX_TRISTATE | + PINMUX_INPUT_ENABLE); + pinmux_set_config(PINMUX_DAP2_DOUT_INDEX, + PINMUX_DAP2_DOUT_FUNC_I2S1 | PINMUX_INPUT_ENABLE); + pinmux_set_config(PINMUX_DAP2_FS_INDEX, + PINMUX_DAP2_FS_FUNC_I2S1 | PINMUX_INPUT_ENABLE); + pinmux_set_config(PINMUX_DAP2_SCLK_INDEX, + PINMUX_DAP2_SCLK_FUNC_I2S1 | PINMUX_INPUT_ENABLE); } static void setup_kernel_info(void)