diff mbox

[U-Boot,v2,8/9] tegra: nyan-big: Allow TPM on I2C

Message ID 1431522151-20245-9-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Tom Warren
Headers show

Commit Message

Simon Glass May 13, 2015, 1:02 p.m. UTC
Enable the I2C3 pins so that the TPM can be used.

Note: There is an DP change also, caused by running board-to-uboot.py
script in the latest tegra-pinmux-script tree.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2:
- Use tegra-pinmux-scripts to update the pinmux

 board/nvidia/nyan-big/pinmux-config-nyan-big.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Stephen Warren May 13, 2015, 1:53 p.m. UTC | #1
On 05/13/2015 07:02 AM, Simon Glass wrote:
> Enable the I2C3 pins so that the TPM can be used.
>
> Note: There is an DP change also, caused by running board-to-uboot.py
> script in the latest tegra-pinmux-script tree.

I didn't get the patch for tegra-pinmux-scripts. What was the send 
time/date and patch title?
Simon Glass May 13, 2015, 1:57 p.m. UTC | #2
Hi Stephen,

On 13 May 2015 at 07:53, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 05/13/2015 07:02 AM, Simon Glass wrote:
>>
>> Enable the I2C3 pins so that the TPM can be used.
>>
>> Note: There is an DP change also, caused by running board-to-uboot.py
>> script in the latest tegra-pinmux-script tree.
>
>
> I didn't get the patch for tegra-pinmux-scripts. What was the send time/date
> and patch title?

It will be in the future :-) I need to transfer it via github as I
don't have a proper git mirror in-house.

Regards,
Simon
Stephen Warren May 13, 2015, 2:33 p.m. UTC | #3
On 05/13/2015 07:57 AM, Simon Glass wrote:
> Hi Stephen,
>
> On 13 May 2015 at 07:53, Stephen Warren <swarren@wwwdotorg.org> wrote:
>> On 05/13/2015 07:02 AM, Simon Glass wrote:
>>>
>>> Enable the I2C3 pins so that the TPM can be used.
>>>
>>> Note: There is an DP change also, caused by running board-to-uboot.py
>>> script in the latest tegra-pinmux-script tree.

This also means that the version that got checked into U-Boot wasn't 
generated from the config file that first got checked into 
tegra-pinmux-scripts:-( Tomeu made this DP change when he submitted 
support to tegra-pinmux-scripts. We should make sure that boards are 
added to tegra-pinmux-scripts before sending U-Boot/kernel patches for a 
board to avoid this.

>> I didn't get the patch for tegra-pinmux-scripts. What was the send time/date
>> and patch title?
>
> It will be in the future :-) I need to transfer it via github as I
> don't have a proper git mirror in-house.

Ah, I should have looked at the email time; I didn't notice it'd only 
just arrived.

Assuming there are no objections to the tegra-pinmux-scripts patch and I 
apply it on Friday as I expect, then this patch looks fine too.

Acked-by: Stephen Warren <swarren@nvidia.com>
Simon Glass July 3, 2015, 11:14 p.m. UTC | #4
Hi Tom,

On 13 May 2015 at 08:33, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 05/13/2015 07:57 AM, Simon Glass wrote:
>>
>> Hi Stephen,
>>
>> On 13 May 2015 at 07:53, Stephen Warren <swarren@wwwdotorg.org> wrote:
>>>
>>> On 05/13/2015 07:02 AM, Simon Glass wrote:
>>>>
>>>>
>>>> Enable the I2C3 pins so that the TPM can be used.
>>>>
>>>> Note: There is an DP change also, caused by running board-to-uboot.py
>>>> script in the latest tegra-pinmux-script tree.
>
>
> This also means that the version that got checked into U-Boot wasn't
> generated from the config file that first got checked into
> tegra-pinmux-scripts:-( Tomeu made this DP change when he submitted support
> to tegra-pinmux-scripts. We should make sure that boards are added to
> tegra-pinmux-scripts before sending U-Boot/kernel patches for a board to
> avoid this.
>
>>> I didn't get the patch for tegra-pinmux-scripts. What was the send
>>> time/date
>>> and patch title?
>>
>>
>> It will be in the future :-) I need to transfer it via github as I
>> don't have a proper git mirror in-house.
>
>
> Ah, I should have looked at the email time; I didn't notice it'd only just
> arrived.
>
> Assuming there are no objections to the tegra-pinmux-scripts patch and I
> apply it on Friday as I expect, then this patch looks fine too.
>
> Acked-by: Stephen Warren <swarren@nvidia.com>

I think three patches got missed, including this one:

http://patchwork.ozlabs.org/patch/471865/
http://patchwork.ozlabs.org/patch/471871/
http://patchwork.ozlabs.org/patch/471869/

Can you please take a look?

Regards,
Simon
diff mbox

Patch

diff --git a/board/nvidia/nyan-big/pinmux-config-nyan-big.h b/board/nvidia/nyan-big/pinmux-config-nyan-big.h
index 9c5fbaa..9c838ba 100644
--- a/board/nvidia/nyan-big/pinmux-config-nyan-big.h
+++ b/board/nvidia/nyan-big/pinmux-config-nyan-big.h
@@ -1,5 +1,5 @@ 
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
  *
  * SPDX-License-Identifier: GPL-2.0+
  */
@@ -234,8 +234,8 @@  static const struct pmux_pingrp_config nyan_big_pingrps[] = {
 	PINCFG(SDMMC4_DAT6_PAA6,       SDMMC4,      UP,     NORMAL,   INPUT,   DEFAULT, DEFAULT),
 	PINCFG(SDMMC4_DAT7_PAA7,       SDMMC4,      UP,     NORMAL,   INPUT,   DEFAULT, DEFAULT),
 	PINCFG(PBB0,                   VGP6,        DOWN,   TRISTATE, OUTPUT,  DEFAULT, DEFAULT),
-	PINCFG(CAM_I2C_SCL_PBB1,       RSVD3,       DOWN,   TRISTATE, OUTPUT,  DISABLE, DEFAULT),
-	PINCFG(CAM_I2C_SDA_PBB2,       RSVD3,       DOWN,   TRISTATE, OUTPUT,  DISABLE, DEFAULT),
+	PINCFG(CAM_I2C_SCL_PBB1,       I2C3,        NORMAL, NORMAL,   INPUT,   ENABLE,  DEFAULT),
+	PINCFG(CAM_I2C_SDA_PBB2,       I2C3,        NORMAL, NORMAL,   INPUT,   ENABLE,  DEFAULT),
 	PINCFG(PBB3,                   VGP3,        DOWN,   TRISTATE, OUTPUT,  DEFAULT, DEFAULT),
 	PINCFG(PBB4,                   VGP4,        DOWN,   TRISTATE, OUTPUT,  DEFAULT, DEFAULT),
 	PINCFG(PBB5,                   RSVD3,       DOWN,   TRISTATE, OUTPUT,  DEFAULT, DEFAULT),
@@ -257,7 +257,7 @@  static const struct pmux_pingrp_config nyan_big_pingrps[] = {
 	PINCFG(HDMI_CEC_PEE3,          CEC,         NORMAL, NORMAL,   INPUT,   ENABLE,  DEFAULT),
 	PINCFG(SDMMC3_CLK_LB_OUT_PEE4, SDMMC3,      NORMAL, NORMAL,   OUTPUT,  DEFAULT, DEFAULT),
 	PINCFG(SDMMC3_CLK_LB_IN_PEE5,  SDMMC3,      UP,     NORMAL,   INPUT,   DEFAULT, DEFAULT),
-	PINCFG(DP_HPD_PFF0,            DP,          UP,     NORMAL,   INPUT,   DEFAULT, DEFAULT),
+	PINCFG(DP_HPD_PFF0,            DP,          NORMAL, NORMAL,   INPUT,   DEFAULT, DEFAULT),
 	PINCFG(USB_VBUS_EN2_PFF1,      RSVD2,       DOWN,   TRISTATE, OUTPUT,  DISABLE, DEFAULT),
 	PINCFG(PFF2,                   RSVD2,       DOWN,   TRISTATE, OUTPUT,  DISABLE, DEFAULT),
 	PINCFG(CORE_PWR_REQ,           PWRON,       NORMAL, NORMAL,   OUTPUT,  DEFAULT, DEFAULT),