From 59091f05d7c13c1532ce2bcf8b4dee2526aa5d35 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Mon, 13 Jun 2016 17:44:12 +0200 Subject: apalis/colibri_t30: fix cam_mclk_pcc0 pin muxing being locked Due to an undefined pin muxing function being used for CAM_MCLK_PCC0 that pin got locked and did no more allow for the Linux kernel and/or our GPIOConfig tool to make any further modifications. On Apalis T30 this pin is used as camera master clock CAM1_MCLK which was impossible to do due to it being locked while on Colibri T30 this pin is just multiplexed with the SD/MMC card clock MM_CLK which is tri-stated by default anyway. Signed-off-by: Marcel Ziswiler Acked-by: Max Krummenacher --- board/toradex/apalis_t30/pinmux-config-apalis_t30.h | 2 +- board/toradex/colibri_t30/pinmux-config-colibri_t30.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/toradex/apalis_t30/pinmux-config-apalis_t30.h b/board/toradex/apalis_t30/pinmux-config-apalis_t30.h index c5b73e245f..48764a374a 100644 --- a/board/toradex/apalis_t30/pinmux-config-apalis_t30.h +++ b/board/toradex/apalis_t30/pinmux-config-apalis_t30.h @@ -229,7 +229,7 @@ static struct pmux_pingrp_config tegra3_pinmux_common[] = { DEFAULT_PINMUX(GMI_A18_PB1, UARTD, DOWN, TRISTATE, OUTPUT), /* NC */ DEFAULT_PINMUX(GMI_A19_PK7, UARTD, DOWN, TRISTATE, OUTPUT), /* NC */ - DEFAULT_PINMUX(CAM_MCLK_PCC0, VI_ALT2, NORMAL, NORMAL, OUTPUT), + DEFAULT_PINMUX(CAM_MCLK_PCC0, VI_ALT3, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(PBB0, RSVD1, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(PBB3, VGP3, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(PBB4, VGP4, NORMAL, NORMAL, OUTPUT), diff --git a/board/toradex/colibri_t30/pinmux-config-colibri_t30.h b/board/toradex/colibri_t30/pinmux-config-colibri_t30.h index ab8500b9b0..b0aec87608 100644 --- a/board/toradex/colibri_t30/pinmux-config-colibri_t30.h +++ b/board/toradex/colibri_t30/pinmux-config-colibri_t30.h @@ -221,7 +221,7 @@ static struct pmux_pingrp_config tegra3_pinmux_common[] = { /* Multiplexed with KB_ROW10/KB_ROW11/KB_ROW12/KB_ROW15 */ - DEFAULT_PINMUX(CAM_MCLK_PCC0, VI_ALT2, UP, TRISTATE, INPUT), + DEFAULT_PINMUX(CAM_MCLK_PCC0, VI_ALT3, UP, TRISTATE, INPUT), DEFAULT_PINMUX(PCC1, RSVD1, NORMAL, TRISTATE, INPUT), DEFAULT_PINMUX(PBB0, RSVD1, NORMAL, TRISTATE, INPUT), DEFAULT_PINMUX(PBB3, VGP3, NORMAL, TRISTATE, INPUT), -- cgit v1.2.3