diff mbox

[U-Boot] ARM: tegra: add PCIe-related pins to the Jetson TK1 pinmux tables

Message ID 1408741448-10448-1-git-send-email-swarren@wwwdotorg.org
State Accepted
Delegated to: Tom Warren
Headers show

Commit Message

Stephen Warren Aug. 22, 2014, 9:04 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

This pinmux tables currently omit any configuration for PCIe clk_req,
wake, and rst pins, which in turn causes intermittent failures in
U-Boot's PCIe support. Import an updated version of the pinmux tables
which rectifies this.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Stephen Warren Sept. 17, 2014, 4:16 p.m. UTC | #1 
On 08/22/2014 03:04 PM, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> This pinmux tables currently omit any configuration for PCIe clk_req,
> wake, and rst pins, which in turn causes intermittent failures in
> U-Boot's PCIe support. Import an updated version of the pinmux tables
> which rectifies this.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>

Could this please make it into the imminent v2014.10 release?
Stephen Warren Oct. 14, 2014, 3:24 p.m. UTC | #2 
On 09/17/2014 10:16 AM, Stephen Warren wrote:
> On 08/22/2014 03:04 PM, Stephen Warren wrote:
>> From: Stephen Warren <swarren@nvidia.com>
>>
>> This pinmux tables currently omit any configuration for PCIe clk_req,
>> wake, and rst pins, which in turn causes intermittent failures in
>> U-Boot's PCIe support. Import an updated version of the pinmux tables
>> which rectifies this.
>>
>> Signed-off-by: Stephen Warren <swarren@nvidia.com>
>
> Could this please make it into the imminent v2014.10 release?

I see this in u-boot-tegra/master, but it doesn't seem to be in 
u-boot-arm/master or u-boot/master.

Did a pull request get sent for this commit? I'd really like to see this 
bugfix get applied to the main U-Boot repo ASAP...
Albert ARIBAUD Oct. 14, 2014, 10:28 p.m. UTC | #3 
Hi Tom,

On Tue, 14 Oct 2014 18:05:40 +0000, Tom Warren <TWarren@nvidia.com>
wrote:

> My gmail account has been in flux for a few weeks, so I can't say for sure whether I sent a PR or not.

I've gone through the U-Boot archives, and the last tegra PR sent was
on aug 20, applied aug 29.

> I'll resend one today to Albert.

I'll make sue to apply it as soon as I get it in my inbox.

> Tom

Amicalement,
Albert ARIBAUD Oct. 15, 2014, 11:43 a.m. UTC | #4 
Hi Tom,

On Tue, 14 Oct 2014 23:14:24 +0000, Tom Warren <TWarren@nvidia.com>
wrote:

> Albert,
> 
> Please pull u-boot-tegra/master into ARM/master. Thanks!
> 
> The following changes since commit a7f99bf139b3aaa0d5494693fd0395084355e41a:
> 
>   arm: Fix _start for CONFIG_SYS_DV_NOR_BOOT_CFG (2014-09-11 18:04:39 +0200)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-tegra.git master
> 
> for you to fetch changes up to 90a565acf3a18c61170ec0e0b2046c98cb7ecc85:
> 
>   arm: tegra: initial support for apalis t30 (2014-09-17 11:15:04 -0700)
> 
> ----------------------------------------------------------------
> Marcel Ziswiler (1):
>       arm: tegra: initial support for apalis t30
> 
> Stephen Warren (1):
>       ARM: tegra: add PCIe-related pins to the Jetson TK1 pinmux tables

This new board fails when I merge this branch to u-boot-arm/master,
with the following diagnostics:

include/configs/apalis_t30.h:17:0: warning: "CONFIG_OF_SEPARATE"
redefined [enabled by default]
In file included
from /home/albert.u.boot/src/u-boot-arm/include/linux/kconfig.h:4:0,
                 from <command-line>:0:
include/generated/autoconf.h:8:0: note: this is the location of the
previous definition

(actually, there is a lot of these, for various config options)

Device Tree Source is not correctly specified.
Please define 'CONFIG_DEFAULT_DEVICE_TREE'
or build with 'DEVICE_TREE=<device_tree>' argument

(This one is fatal even though it does not explicitly state "error:")

This failure does not happen on the tegra branch; it is obviously due
to the Kbuild stuff.

Amicalement,
Stephen Warren Oct. 15, 2014, 3:34 p.m. UTC | #5 
On 10/15/2014 05:43 AM, Albert ARIBAUD wrote:
> Hi Tom,
>
> On Tue, 14 Oct 2014 23:14:24 +0000, Tom Warren <TWarren@nvidia.com>
> wrote:
>
>> Albert,
>>
>> Please pull u-boot-tegra/master into ARM/master. Thanks!
>>
>> The following changes since commit a7f99bf139b3aaa0d5494693fd0395084355e41a:
>>
>>    arm: Fix _start for CONFIG_SYS_DV_NOR_BOOT_CFG (2014-09-11 18:04:39 +0200)
>>
>> are available in the git repository at:
>>
>>    git://git.denx.de/u-boot-tegra.git master
>>
>> for you to fetch changes up to 90a565acf3a18c61170ec0e0b2046c98cb7ecc85:
>>
>>    arm: tegra: initial support for apalis t30 (2014-09-17 11:15:04 -0700)
>>
>> ----------------------------------------------------------------
>> Marcel Ziswiler (1):
>>        arm: tegra: initial support for apalis t30
>>
>> Stephen Warren (1):
>>        ARM: tegra: add PCIe-related pins to the Jetson TK1 pinmux tables
>
> This new board fails when I merge this branch to u-boot-arm/master,
> with the following diagnostics:
>
> include/configs/apalis_t30.h:17:0: warning: "CONFIG_OF_SEPARATE"
> redefined [enabled by default]
> In file included
> from /home/albert.u.boot/src/u-boot-arm/include/linux/kconfig.h:4:0,
>                   from <command-line>:0:
> include/generated/autoconf.h:8:0: note: this is the location of the
> previous definition
>
> (actually, there is a lot of these, for various config options)
>
> Device Tree Source is not correctly specified.
> Please define 'CONFIG_DEFAULT_DEVICE_TREE'
> or build with 'DEVICE_TREE=<device_tree>' argument
>
> (This one is fatal even though it does not explicitly state "error:")
>
> This failure does not happen on the tegra branch; it is obviously due
> to the Kbuild stuff.

This issue should be fixed by:

https://patchwork.ozlabs.org/patch/398793/
[U-Boot] tegra: apalis_t30: master revamp

However, I would assert that at this point during the release cycle, we 
probably shouldn't be adding new boards/features, but just fixing bugs. 
Perhaps we should drop the Apalis patch completely and re-apply it once 
the release is out?
Albert ARIBAUD Oct. 15, 2014, 3:39 p.m. UTC | #6 
Hi Stephen,

On Wed, 15 Oct 2014 09:34:49 -0600, Stephen Warren
<swarren@wwwdotorg.org> wrote:

> On 10/15/2014 05:43 AM, Albert ARIBAUD wrote:
> > Hi Tom,
> >
> > On Tue, 14 Oct 2014 23:14:24 +0000, Tom Warren <TWarren@nvidia.com>
> > wrote:
> >
> >> Albert,
> >>
> >> Please pull u-boot-tegra/master into ARM/master. Thanks!
> >>
> >> The following changes since commit a7f99bf139b3aaa0d5494693fd0395084355e41a:
> >>
> >>    arm: Fix _start for CONFIG_SYS_DV_NOR_BOOT_CFG (2014-09-11 18:04:39 +0200)
> >>
> >> are available in the git repository at:
> >>
> >>    git://git.denx.de/u-boot-tegra.git master
> >>
> >> for you to fetch changes up to 90a565acf3a18c61170ec0e0b2046c98cb7ecc85:
> >>
> >>    arm: tegra: initial support for apalis t30 (2014-09-17 11:15:04 -0700)
> >>
> >> ----------------------------------------------------------------
> >> Marcel Ziswiler (1):
> >>        arm: tegra: initial support for apalis t30
> >>
> >> Stephen Warren (1):
> >>        ARM: tegra: add PCIe-related pins to the Jetson TK1 pinmux tables
> >
> > This new board fails when I merge this branch to u-boot-arm/master,
> > with the following diagnostics:
> >
> > include/configs/apalis_t30.h:17:0: warning: "CONFIG_OF_SEPARATE"
> > redefined [enabled by default]
> > In file included
> > from /home/albert.u.boot/src/u-boot-arm/include/linux/kconfig.h:4:0,
> >                   from <command-line>:0:
> > include/generated/autoconf.h:8:0: note: this is the location of the
> > previous definition
> >
> > (actually, there is a lot of these, for various config options)
> >
> > Device Tree Source is not correctly specified.
> > Please define 'CONFIG_DEFAULT_DEVICE_TREE'
> > or build with 'DEVICE_TREE=<device_tree>' argument
> >
> > (This one is fatal even though it does not explicitly state "error:")
> >
> > This failure does not happen on the tegra branch; it is obviously due
> > to the Kbuild stuff.
> 
> This issue should be fixed by:
> 
> https://patchwork.ozlabs.org/patch/398793/
> [U-Boot] tegra: apalis_t30: master revamp
> 
> However, I would assert that at this point during the release cycle, we 
> probably shouldn't be adding new boards/features, but just fixing bugs. 
> Perhaps we should drop the Apalis patch completely and re-apply it once 
> the release is out?

Ok. Should I still apply the TK1 pinmux patch, or should I consider the
whole PR to be for -next?

Amicalement,
Albert ARIBAUD Oct. 15, 2014, 4:34 p.m. UTC | #7 
Hi Tom,

On Wed, 15 Oct 2014 15:59:44 +0000, Tom Warren <TWarren@nvidia.com>
wrote:

> Albert,
> 
> I did a Makeall -s tegra before sending the PR (as I always do), and I saw no failures. But I haven't rebased against ARM master in a few weeks.
> 
> I think the Jetson TK1 change is still valid and should go in.

Ok. Seeing as this is a single patch to pick and board-, not arm-,
specific, maybe Tom (Rini, promoted to To:) can pick it up directly
instead of going through an ARM PR?

> Thanks,
> 
> Tom

Amicalement,
Stephen Warren Oct. 15, 2014, 4:38 p.m. UTC | #8 
On 10/15/2014 09:39 AM, Albert ARIBAUD wrote:
> Hi Stephen,
>
> On Wed, 15 Oct 2014 09:34:49 -0600, Stephen Warren
> <swarren@wwwdotorg.org> wrote:
>
>> On 10/15/2014 05:43 AM, Albert ARIBAUD wrote:
>>> Hi Tom,
>>>
>>> On Tue, 14 Oct 2014 23:14:24 +0000, Tom Warren <TWarren@nvidia.com>
>>> wrote:
>>>
>>>> Albert,
>>>>
>>>> Please pull u-boot-tegra/master into ARM/master. Thanks!
>>>>
>>>> The following changes since commit a7f99bf139b3aaa0d5494693fd0395084355e41a:
>>>>
>>>>     arm: Fix _start for CONFIG_SYS_DV_NOR_BOOT_CFG (2014-09-11 18:04:39 +0200)
>>>>
>>>> are available in the git repository at:
>>>>
>>>>     git://git.denx.de/u-boot-tegra.git master
>>>>
>>>> for you to fetch changes up to 90a565acf3a18c61170ec0e0b2046c98cb7ecc85:
>>>>
>>>>     arm: tegra: initial support for apalis t30 (2014-09-17 11:15:04 -0700)
>>>>
>>>> ----------------------------------------------------------------
>>>> Marcel Ziswiler (1):
>>>>         arm: tegra: initial support for apalis t30
>>>>
>>>> Stephen Warren (1):
>>>>         ARM: tegra: add PCIe-related pins to the Jetson TK1 pinmux tables
>>>
>>> This new board fails when I merge this branch to u-boot-arm/master,
>>> with the following diagnostics:
>>>
>>> include/configs/apalis_t30.h:17:0: warning: "CONFIG_OF_SEPARATE"
>>> redefined [enabled by default]
>>> In file included
>>> from /home/albert.u.boot/src/u-boot-arm/include/linux/kconfig.h:4:0,
>>>                    from <command-line>:0:
>>> include/generated/autoconf.h:8:0: note: this is the location of the
>>> previous definition
>>>
>>> (actually, there is a lot of these, for various config options)
>>>
>>> Device Tree Source is not correctly specified.
>>> Please define 'CONFIG_DEFAULT_DEVICE_TREE'
>>> or build with 'DEVICE_TREE=<device_tree>' argument
>>>
>>> (This one is fatal even though it does not explicitly state "error:")
>>>
>>> This failure does not happen on the tegra branch; it is obviously due
>>> to the Kbuild stuff.
>>
>> This issue should be fixed by:
>>
>> https://patchwork.ozlabs.org/patch/398793/
>> [U-Boot] tegra: apalis_t30: master revamp
>>
>> However, I would assert that at this point during the release cycle, we
>> probably shouldn't be adding new boards/features, but just fixing bugs.
>> Perhaps we should drop the Apalis patch completely and re-apply it once
>> the release is out?
>
> Ok. Should I still apply the TK1 pinmux patch, or should I consider the
> whole PR to be for -next?

I consider the Jetson TK1 pinmux patch a bug-fix; it adds entries that 
always should have been there.
Simon Glass Oct. 15, 2014, 4:41 p.m. UTC | #9 
Hi,

On 15 October 2014 18:38, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 10/15/2014 09:39 AM, Albert ARIBAUD wrote:
>>
>> Hi Stephen,
>>
>> On Wed, 15 Oct 2014 09:34:49 -0600, Stephen Warren
>> <swarren@wwwdotorg.org> wrote:
>>
>>> On 10/15/2014 05:43 AM, Albert ARIBAUD wrote:
>>>>
>>>> Hi Tom,
>>>>
>>>> On Tue, 14 Oct 2014 23:14:24 +0000, Tom Warren <TWarren@nvidia.com>
>>>> wrote:
>>>>
>>>>> Albert,
>>>>>
>>>>> Please pull u-boot-tegra/master into ARM/master. Thanks!
>>>>>
>>>>> The following changes since commit
>>>>> a7f99bf139b3aaa0d5494693fd0395084355e41a:
>>>>>
>>>>>     arm: Fix _start for CONFIG_SYS_DV_NOR_BOOT_CFG (2014-09-11 18:04:39
>>>>> +0200)
>>>>>
>>>>> are available in the git repository at:
>>>>>
>>>>>     git://git.denx.de/u-boot-tegra.git master
>>>>>
>>>>> for you to fetch changes up to
>>>>> 90a565acf3a18c61170ec0e0b2046c98cb7ecc85:
>>>>>
>>>>>     arm: tegra: initial support for apalis t30 (2014-09-17 11:15:04
>>>>> -0700)
>>>>>
>>>>> ----------------------------------------------------------------
>>>>> Marcel Ziswiler (1):
>>>>>         arm: tegra: initial support for apalis t30
>>>>>
>>>>> Stephen Warren (1):
>>>>>         ARM: tegra: add PCIe-related pins to the Jetson TK1 pinmux
>>>>> tables
>>>>
>>>>
>>>> This new board fails when I merge this branch to u-boot-arm/master,
>>>> with the following diagnostics:
>>>>
>>>> include/configs/apalis_t30.h:17:0: warning: "CONFIG_OF_SEPARATE"
>>>> redefined [enabled by default]
>>>> In file included
>>>> from /home/albert.u.boot/src/u-boot-arm/include/linux/kconfig.h:4:0,
>>>>                    from <command-line>:0:
>>>> include/generated/autoconf.h:8:0: note: this is the location of the
>>>> previous definition
>>>>
>>>> (actually, there is a lot of these, for various config options)
>>>>
>>>> Device Tree Source is not correctly specified.
>>>> Please define 'CONFIG_DEFAULT_DEVICE_TREE'
>>>> or build with 'DEVICE_TREE=<device_tree>' argument
>>>>
>>>> (This one is fatal even though it does not explicitly state "error:")
>>>>
>>>> This failure does not happen on the tegra branch; it is obviously due
>>>> to the Kbuild stuff.
>>>
>>>
>>> This issue should be fixed by:
>>>
>>> https://patchwork.ozlabs.org/patch/398793/
>>> [U-Boot] tegra: apalis_t30: master revamp
>>>
>>> However, I would assert that at this point during the release cycle, we
>>> probably shouldn't be adding new boards/features, but just fixing bugs.
>>> Perhaps we should drop the Apalis patch completely and re-apply it once
>>> the release is out?
>>
>>
>> Ok. Should I still apply the TK1 pinmux patch, or should I consider the
>> whole PR to be for -next?
>
>
> I consider the Jetson TK1 pinmux patch a bug-fix; it adds entries that
> always should have been there.

BTW the release has already gone out. Also what is the status of the
Norrin patch? Will that go into Tegra soon?

Regards,
Simon
diff mbox

Patch

diff --git a/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h b/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h
index d338818a64eb..de4eb355982c 100644
--- a/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h
+++ b/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h
@@ -283,6 +283,11 @@  static const struct pmux_pingrp_config jetson_tk1_pingrps[] = {
 	PINCFG(PCC2,                   DEFAULT,      DOWN,   NORMAL,   INPUT,   DEFAULT, DEFAULT),
 	PINCFG(SDMMC4_CLK_PCC4,        SDMMC4,       NORMAL, NORMAL,   INPUT,   DEFAULT, DEFAULT),
 	PINCFG(CLK2_REQ_PCC5,          DEFAULT,      NORMAL, NORMAL,   OUTPUT,  DEFAULT, DEFAULT),
+	PINCFG(PEX_L0_RST_N_PDD1,      PE0,          NORMAL, NORMAL,   OUTPUT,  DEFAULT, DEFAULT),
+	PINCFG(PEX_L0_CLKREQ_N_PDD2,   PE0,          UP,     NORMAL,   INPUT,   DEFAULT, DEFAULT),
+	PINCFG(PEX_WAKE_N_PDD3,        PE,           UP,     NORMAL,   INPUT,   DEFAULT, DEFAULT),
+	PINCFG(PEX_L1_RST_N_PDD5,      PE1,          NORMAL, NORMAL,   OUTPUT,  DEFAULT, DEFAULT),
+	PINCFG(PEX_L1_CLKREQ_N_PDD6,   PE1,          UP,     NORMAL,   INPUT,   DEFAULT, DEFAULT),
 	PINCFG(CLK3_OUT_PEE0,          EXTPERIPH3,   NORMAL, NORMAL,   OUTPUT,  DEFAULT, DEFAULT),
 	PINCFG(CLK3_REQ_PEE1,          DEFAULT,      NORMAL, NORMAL,   OUTPUT,  DEFAULT, DEFAULT),
 	PINCFG(DAP_MCLK1_REQ_PEE2,     SATA,         NORMAL, NORMAL,   OUTPUT,  DEFAULT, DEFAULT),