[U-Boot] [PATCH] Tegra114: Dalmore: Always use DEFAULT instead of DISABLE for lock bits

[Tom Warren]

On Wed, Mar 13, 2013 at 3:46 PM, Tom Warren <twarren.nvidia at gmail.com> wrote:
> The pinmux code issues a warning if the aller attempts to disable the
*caller - I'll fix this when I apply it. :/

> lock bit in a pinmux register, since this is impossible (once it's
> locked, the only way to unlock it is to reset the device/pmt controller).
>
> The I2C/DDC/CEC/USB macros expect a lock setting to be passed in,
> and the previous setting of DISABLE caused the pinmux table parsing
> code to issue the warning. Changing the lock bits in these table
> entries to DEFAULT (i.e. don't touch it) fixes this.
>
> Signed-off-by: Tom Warren <twarren at nvidia.com>
> ---
>  board/nvidia/dalmore/pinmux-config-dalmore.h |   24 ++++++++++++------------
>  1 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/board/nvidia/dalmore/pinmux-config-dalmore.h b/board/nvidia/dalmore/pinmux-config-dalmore.h
> index d258819..cb48b3b 100644
> --- a/board/nvidia/dalmore/pinmux-config-dalmore.h
> +++ b/board/nvidia/dalmore/pinmux-config-dalmore.h
> @@ -120,8 +120,8 @@ static struct pingroup_config tegra114_pinmux_common[] = {
>         DEFAULT_PINMUX(ULPI_STP,      ULPI,        NORMAL,    NORMAL,   OUTPUT),
>
>         /* I2C3 pinmux */
> -       I2C_PINMUX(CAM_I2C_SCL, I2C3, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
> -       I2C_PINMUX(CAM_I2C_SDA, I2C3, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
> +       I2C_PINMUX(CAM_I2C_SCL, I2C3, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE),
> +       I2C_PINMUX(CAM_I2C_SDA, I2C3, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE),
>
>         /* VI pinmux */
>         VI_PINMUX(CAM_MCLK, VI_ALT3,  NORMAL, NORMAL, OUTPUT, DEFAULT, DEFAULT),
> @@ -133,8 +133,8 @@ static struct pingroup_config tegra114_pinmux_common[] = {
>         VI_PINMUX(GPIO_PBB4, VGP4,    NORMAL, NORMAL, OUTPUT, DEFAULT, DEFAULT),
>
>         /* I2C2 pinmux */
> -       I2C_PINMUX(GEN2_I2C_SCL, I2C2, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
> -       I2C_PINMUX(GEN2_I2C_SDA, I2C2, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
> +       I2C_PINMUX(GEN2_I2C_SCL, I2C2, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE),
> +       I2C_PINMUX(GEN2_I2C_SDA, I2C2, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE),
>
>         /* UARTD pinmux */
>         DEFAULT_PINMUX(GMI_A16,       UARTD,       NORMAL,    NORMAL,   OUTPUT),
> @@ -212,8 +212,8 @@ static struct pingroup_config tegra114_pinmux_common[] = {
>         DEFAULT_PINMUX(KB_ROW9,       UARTA,       NORMAL,    NORMAL,   OUTPUT),
>
>         /* I2CPWR pinmux (I2C5) */
> -       I2C_PINMUX(PWR_I2C_SCL, I2CPWR, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
> -       I2C_PINMUX(PWR_I2C_SDA, I2CPWR, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
> +       I2C_PINMUX(PWR_I2C_SCL, I2CPWR, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE),
> +       I2C_PINMUX(PWR_I2C_SDA, I2CPWR, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE),
>
>         /* SYSCLK pinmux */
>         DEFAULT_PINMUX(SYS_CLK_REQ,   SYSCLK,      NORMAL,    NORMAL,   OUTPUT),
> @@ -240,8 +240,8 @@ static struct pingroup_config tegra114_pinmux_common[] = {
>         DEFAULT_PINMUX(CLK3_OUT,      EXTPERIPH3,  NORMAL,    NORMAL,   OUTPUT),
>
>         /* I2C1 pinmux */
> -       I2C_PINMUX(GEN1_I2C_SCL, I2C1, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
> -       I2C_PINMUX(GEN1_I2C_SDA, I2C1, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
> +       I2C_PINMUX(GEN1_I2C_SCL, I2C1, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE),
> +       I2C_PINMUX(GEN1_I2C_SDA, I2C1, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE),
>
>         /* UARTB pinmux */
>         DEFAULT_PINMUX(UART2_CTS_N,   UARTB,       NORMAL,    TRISTATE, INPUT),
> @@ -261,14 +261,14 @@ static struct pingroup_config tegra114_pinmux_common[] = {
>         DEFAULT_PINMUX(OWR,           OWR,         NORMAL,    NORMAL,   INPUT),
>
>         /* CEC pinmux */
> -       CEC_PINMUX(HDMI_CEC, CEC, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
> +       CEC_PINMUX(HDMI_CEC, CEC, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE),
>
>         /* I2C4 pinmux */
> -       DDC_PINMUX(DDC_SCL, I2C4, NORMAL, NORMAL, INPUT, DISABLE, HIGH),
> -       DDC_PINMUX(DDC_SDA, I2C4, NORMAL, NORMAL, INPUT, DISABLE, HIGH),
> +       DDC_PINMUX(DDC_SCL, I2C4, NORMAL, NORMAL, INPUT, DEFAULT, HIGH),
> +       DDC_PINMUX(DDC_SDA, I2C4, NORMAL, NORMAL, INPUT, DEFAULT, HIGH),
>
>         /* USB pinmux */
> -       USB_PINMUX(USB_VBUS_EN0, USB, NORMAL, NORMAL, INPUT, DISABLE, ENABLE),
> +       USB_PINMUX(USB_VBUS_EN0, USB, NORMAL, NORMAL, INPUT, DEFAULT, ENABLE),
>
>         /* nct */
>         DEFAULT_PINMUX(GPIO_X6_AUD,   SPI6,        UP,        TRISTATE, INPUT),
> --
> 1.7.0.4
>