[U-Boot] [PATCH v5 3/3] ARM: tegra: Add support for nyan-big board

Wed Dec 10 22:45:31 CET 2014

Hi Tom,

On 10 December 2014 at 14:09, Tom Warren <TWarren at nvidia.com> wrote:
> Simon,
>
>> -----Original Message-----
>> From: sjg at google.com [mailto:sjg at google.com] On Behalf Of Simon Glass
>> Sent: Wednesday, December 10, 2014 2:04 PM
>> To: Tom Warren
>> Cc: U-Boot Mailing List; Stephen Warren; Allen Martin; Stephen Warren;
>> Albert Aribaud
>> Subject: Re: [PATCH v5 3/3] ARM: tegra: Add support for nyan-big board
>>
>> Hi Tom,
>>
>> On 10 December 2014 at 12:36, Simon Glass <sjg at chromium.org> wrote:
>> > Hi Tom,
>> >
>> > On Dec 10, 2014 12:05 PM, "Tom Warren" <TWarren at nvidia.com> wrote:
>> >>
>> >> Simon,
>> >>
>> >> > -----Original Message-----
>> >> > From: sjg at google.com [mailto:sjg at google.com] On Behalf Of Simon
>> >> > Glass
>> >> > Sent: Wednesday, December 10, 2014 10:50 AM
>> >> > To: Tom Warren
>> >> > Cc: U-Boot Mailing List; Allen Martin; Albert Aribaud; Stephen
>> >> > Warren; Stephen Warren
>> >> > Subject: Re: [PATCH v5 3/3] ARM: tegra: Add support for nyan-big
>> >> > board
>> >> >
>> >> > Hi Tom,
>> >> >
>> >> >
>> >> > On 10 December 2014 at 10:39, Tom Warren <TWarren at nvidia.com>
>> wrote:
>> >> > > Simon,
>> >> > >
>> >> > > The v4 PCIE patch series fails to apply to u-boot-tegra/master
>> >> > > after
>> >> > rebasing my repo against both ARM master and U-Boot 'master' master
>> >> > (i.e.
>> >> > FETCH_HEAD =
>> >> > > 32fdf0e4d82bdca5d64d86330e461e59685f9959        branch 'master' of
>> >> > git://git.denx.de/u-boot).  3 - 4 patches fail when using git am.
>> >> > >
>> >> > > I worked thru the conflicts for both branches (my  master rebased
>> >> > > against
>> >> > ARM and U-Boot TOT), and did a MAKEALL -s tegra, and jetson-tk1,
>> >> > beaver and cardhu fail to build (jetson err log below).  Looks like
>> >> > you developed this with your DM I2C series in place?
>> >> > >
>> >> > > To submit a PR from the Tegra repo, I need to either rebase first
>> >> > > against
>> >> > ARM master (my SOP), or against U-Boot 'master'.  So you patches,
>> >> > if they're bound for the Tegra repo, need to work in one of those
>> >> > scenarios.
>> >> > >
>> >> > > Tom
>> >> >
>> >> > Thanks for looking at it. This series depends on the I2C driver
>> >> > model series.
>> >> > It's available at u-boot-dm/i2c-working if you want to check it
>> >> > out. I plan to apply that very soon.
>> >> >
>> >> > I'm sorry I didn't make that clear in this series. I mentioned it
>> >> > on the list at one point but should have added it here. If you
>> >> > like, you could ack it and I can apply to u-boot-dm after I2C is in
>> >> > there.
>> >> I can't ACK something that I can't get to apply to my repo nor build
>> >> nor test. So you'll have to wait on that from Stephen, Thierry (based
>> >> on code
>> >> review) or someone that wants to add DM I2C to Tegra, apply your PCIe
>> >> patches, and test. That's not my normal workflow, though, and I don't
>> >> have the BW to devote to extra hurdles right now.
>> >>
>> >
>> > You could try applying to u-boot-dm/i2c-working. It only has the DM
>> > i2c series in it, plus Tegra stuff. I put a lot of time into cleaning
>> > up this Tegra series to save you and Thierry time.
>>
>> Also Thierry took a look the PCIe series and responded here:
>>
>> http://patchwork.ozlabs.org/patch/410175/
>>
>> There were three nits which I have addressed.
>>
>> For this Nyan-big patch I really don't need a test credit (would be nice, but
>> not necessary). After all it's a new board and if problems are found they can
>> be fixed. But I do need to apply it before DM I2C.
>> Stephen has looked at a few revs.
>>
>> How about this for a plan:
>>
>> - Apply Nyan-big to DM
>> - Apply DM I2C series to DM
>> - Pull request to mainline (final for DM this release unless SPL is resolved
>> somehow)
>>
>> Then if you have time:
>> - Tom - apply PCIe to Tegra tree
>> - Pull request to mainline
> The problem there is that I'd need to wait for the PR to mainline to go thru before I could rebase Tegra against mainline, and only then apply PCIe patches.  Time-wise, it's obviously better for you to do this in one fell swoop from the DM repo.
>
> Does the nyan-big patchset apply/build cleanly in u-boot-tegra/master? If so, I can apply it and do a Tegra test build and then send a PR to Albert if all is clear.

OK, true.

The Tegra tree is too far behind master, but if you catch it up you
can make it work:

(try-nyan=9e10b9: b/ common/ doc/ sandbox/) u> pwclient git-am 417781
Applying patch #417781 using 'git am'
Description: [U-Boot,v5,1/3] dts: Bring in Chrome OS keyboard device
tree definition
Applying: dts: Bring in Chrome OS keyboard device tree definition
(try-nyan=ddebcc: b/ common/ doc/ sandbox/) u> pwclient git-am 417782
Applying patch #417782 using 'git am'
Description: [U-Boot,v5,2/3] tegra: dts: Sync tegra124.dtsi with linux kernel
Applying: tegra: dts: Sync tegra124.dtsi with linux kernel
^[[A(try-nyan=9df313: b/ common/ doc/ sandbox/) u> pwclient git-am 417783
Applying patch #417783 using 'git am'
Description: [U-Boot,v5,3/3] ARM: tegra: Add support for nyan-big board
Applying: ARM: tegra: Add support for nyan-big board
error: patch failed: arch/arm/dts/Makefile:31
error: arch/arm/dts/Makefile: patch does not apply
Patch failed at 0001 ARM: tegra: Add support for nyan-big board
The copy of the patch that failed is found in:
   /usr/local/google/home/sjg/u/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
(try-nyan=9df313: b/ common/ doc/ sandbox/) u> patch -p1 <
/usr/local/google/home/sjg/u/.git/rebase-apply/patch
patching file arch/arm/cpu/armv7/tegra124/Kconfig
patching file arch/arm/dts/Makefile
Hunk #1 succeeded at 29 with fuzz 2 (offset -2 lines).
patching file arch/arm/dts/tegra124-nyan-big.dts
patching file board/nvidia/nyan-big/Kconfig
patching file board/nvidia/nyan-big/MAINTAINERS
patching file board/nvidia/nyan-big/Makefile
patching file board/nvidia/nyan-big/nyan-big.c
patching file board/nvidia/nyan-big/pinmux-config-nyan-big.h
patching file board/nvidia/venice2/as3722_init.h
patching file configs/nyan-big_defconfig
patching file include/configs/nyan-big.h

Then:

 git add arch/arm/cpu/armv7/tegra124/Kconfig arch/arm/dts/Makefile
board/nvidia/venice2/as3722_init.h arch/arm/dts/tegra124-nyan-big.dts
board/nvidia/nyan-big/ configs/nyan-big_defconfig
include/configs/nyan-big.h
git am --resolved

I've pushed it to u-boot-dm/for-tom.

It all builds cleanly for me.

Regards,
Simon

>
>>
>> If you don't have time, I could do this last bit through DM. In any case the
>> problem is that it is getting late and we need to resolve this soon.
>>
>> Regards,
>> Simon
>>
>> >
>> > Regards,
>> > Simon
>> >
>> >> Tom
>> >> >
>> >> > Regards,
>> >> > Simon
>> >> > >
>> >> > > drivers/power/as3722.c: In function 'as3722_read':
>> >> > > drivers/power/as3722.c:34: warning: passing argument 1 of 'i2c_read'
>> >> > > makes integer from pointer without a cast
>> >> > > include/i2c.h:235: note: expected 'uint8_t' but argument is of
>> >> > > type 'struct
>> >> > udevice *'
>> >> > > drivers/power/as3722.c:34: warning: passing argument 3 of 'i2c_read'
>> >> > > makes integer from pointer without a cast
>> >> > > include/i2c.h:235: note: expected 'int' but argument is of type 'u8 *'
>> >> > > drivers/power/as3722.c:34: warning: passing argument 4 of 'i2c_read'
>> >> > > makes pointer from integer without a cast
>> >> > > include/i2c.h:235: note: expected 'uint8_t *' but argument is of
>> >> > > type 'int'
>> >> > > drivers/power/as3722.c:34: error: too few arguments to function
>> >> > > 'i2c_read'
>> >> > > drivers/power/as3722.c: In function 'as3722_write':
>> >> > > drivers/power/as3722.c:45: warning: passing argument 1 of 'i2c_write'
>> >> > > makes integer from pointer without a cast
>> >> > > include/i2c.h:238: note: expected 'uint8_t' but argument is of
>> >> > > type 'struct
>> >> > udevice *'
>> >> > > drivers/power/as3722.c:45: warning: passing argument 3 of 'i2c_write'
>> >> > > makes integer from pointer without a cast
>> >> > > include/i2c.h:238: note: expected 'int' but argument is of type 'u8 *'
>> >> > > drivers/power/as3722.c:45: warning: passing argument 4 of 'i2c_write'
>> >> > > makes pointer from integer without a cast
>> >> > > include/i2c.h:238: note: expected 'uint8_t *' but argument is of
>> >> > > type 'int'
>> >> > > drivers/power/as3722.c:45: error: too few arguments to function
>> >> > 'i2c_write'
>> >> > > drivers/power/as3722.c: In function 'as3722_init':
>> >> > > drivers/power/as3722.c:245: warning: implicit declaration of
>> >> > > function
>> >> > 'i2c_get_chip_for_busnum'
>> >> > > make[1]: *** [drivers/power/as3722.o] Error 1
>> >> > > make: *** [drivers/power] Error 2
>> >> > > make: *** Waiting for unfinished jobs....
>> >> > >
>> >> > >> -----Original Message-----
>> >> > >> From: Tom Warren
>> >> > >> Sent: Wednesday, December 10, 2014 8:46 AM
>> >> > >> To: Simon Glass; U-Boot Mailing List
>> >> > >> Cc: Allen Martin; Albert Aribaud; Stephen Warren; Stephen Warren
>> >> > >> Subject: RE: [PATCH v5 3/3] ARM: tegra: Add support for nyan-big
>> >> > >> board
>> >> > >>
>> >> > >> Simon,
>> >> > >>
>> >> > >> > -----Original Message-----
>> >> > >> > From: sjg at google.com [mailto:sjg at google.com] On Behalf Of
>> >> > >> > Simon Glass
>> >> > >> > Sent: Wednesday, December 10, 2014 8:01 AM
>> >> > >> > To: U-Boot Mailing List
>> >> > >> > Cc: Allen Martin; Simon Glass; Albert Aribaud; Tom Warren;
>> >> > >> > Stephen Warren; Stephen Warren
>> >> > >> > Subject: Re: [PATCH v5 3/3] ARM: tegra: Add support for
>> >> > >> > nyan-big board
>> >> > >> >
>> >> > >> > Hi,
>> >> > >> >
>> >> > >> > On 4 December 2014 at 06:36, Simon Glass <sjg at chromium.org>
>> wrote:
>> >> > >> > > From: Allen Martin <amartin at nvidia.com>
>> >> > >> > >
>> >> > >> > > Nyan-big is a Tegra124 clamshell board that is very similar
>> >> > >> > > to venice2, but it has a different panel, the sdcard cd and
>> >> > >> > > wp sense are flipped, and it has a different revision of the AS3722
>> PMIC.
>> >> > >> > >
>> >> > >> > > This is the Acer Chromebook 13 CB5-311-T7NN (13.3-inch HD,
>> >> > >> > > NVIDIA Tegra K1, 2GB). The display is not currently
>> >> > >> > > supported, so it should boot on other nyan-based Chromebooks
>> >> > >> > > also, but only the device tree for nyan-big is provided here.
>> >> > >> > >
>> >> > >> > > The device tree file is from Linux but with features removed
>> >> > >> > > which are unlikely to be supported in U-Boot soon
>> >> > >> > > (regulators,
>> >> > pinmux).
>> >> > >> > > Also the addresses are updated to 32-bit.
>> >> > >> > >
>> >> > >> > > Signed-off-by: Allen Martin <amartin at nvidia.com>
>> >> > >> > > Signed-off-by: Simon Glass <sjg at chromium.org> (rebase,
>> >> > >> > > change to 'nyan-big', fix pinmux that resets nyan-big)
>> >> > >> > >
>> >> > >> > > ---
>> >> > >> > >
>> >> > >> > > Changes in v5:
>> >> > >> > > - Remove call to pinmux_set_tristate_input_clamping()
>> >> > >> > >
>> >> > >> >
>> >> > >> > Any further comments on v5 please?
>> >> > >> >
>> >> > >> > I would like to apply this patch before the DM I2C series, so
>> >> > >> > that I2C works correct for nyan-big also.
>> >> > >> >
>> >> > >> > Tom are you looking at the rest of the PCI-e series? I resent
>> >> > >> > it so would like to get that in soon - the patches originally
>> >> > >> > date from August.
>> >> > >> I was waiting for Thierry or Stephen to Ack the series, or
>> >> > >> provide other feedback. I don't have time/boards to test this right
>> now.
>> >> > >>
>> >> > >> If someone can say it looks good, or has been tested on X board, etc.
>> >> > >> I can apply it.
>> >> > >>
>> >> > >> Tom
>> >> > >> >
>> >> > >> > Regards,
>> >> > >> > Simon
>> >> > >> --
>> >> > >> nvpublic