dts: Bring in Chrome OS keyboard device tree definition
Subsystems (5)
PATCH v5 1/3 dts: Bring in Chrome OS keyboard device tree definition
This will be used by nyan-big, but bring it in in a separate patch since it will be common to other boards.
---
Changes in v5: None
Changes in v4: None
Changes in v3:
- Add patch to bring in cros-ec-keyboard.dtsi
Changes in v2: None
arch/arm/dts/cros-ec-keyboard.dtsi | 105 +++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 arch/arm/dts/cros-ec-keyboard.dtsi
arch/arm/dts/cros-ec-keyboard.dtsi new file +105 -0
@@ -0,0 +1,105 @@ +/* + * Keyboard dts fragment for devices that use cros-ec-keyboard + * + * Copyright (c) 2014 Google, Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#include <dt-bindings/input/input.h> + +&cros_ec { + keyboard-controller { + compatible = "google,cros-ec-keyb"; + keypad,num-rows = <8>; + keypad,num-columns = <13>; + google,needs-ghost-filter; + + linux,keymap = < + MATRIX_KEY(0x00, 0x01, KEY_LEFTMETA) + MATRIX_KEY(0x00, 0x02, KEY_F1) + MATRIX_KEY(0x00, 0x03, KEY_B) + MATRIX_KEY(0x00, 0x04, KEY_F10) + MATRIX_KEY(0x00, 0x06, KEY_N) + MATRIX_KEY(0x00, 0x08, KEY_EQUAL) + MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT) + + MATRIX_KEY(0x01, 0x01, KEY_ESC) + MATRIX_KEY(0x01, 0x02, KEY_F4) + MATRIX_KEY(0x01, 0x03, KEY_G) + MATRIX_KEY(0x01, 0x04, KEY_F7) + MATRIX_KEY(0x01, 0x06, KEY_H) + MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE) + MATRIX_KEY(0x01, 0x09, KEY_F9) + MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE) + + MATRIX_KEY(0x02, 0x00, KEY_LEFTCTRL) + MATRIX_KEY(0x02, 0x01, KEY_TAB) + MATRIX_KEY(0x02, 0x02, KEY_F3) + MATRIX_KEY(0x02, 0x03, KEY_T) + MATRIX_KEY(0x02, 0x04, KEY_F6) + MATRIX_KEY(0x02, 0x05, KEY_RIGHTBRACE) + MATRIX_KEY(0x02, 0x06, KEY_Y) + MATRIX_KEY(0x02, 0x07, KEY_102ND) + MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE) + MATRIX_KEY(0x02, 0x09, KEY_F8) + + MATRIX_KEY(0x03, 0x01, KEY_GRAVE) + MATRIX_KEY(0x03, 0x02, KEY_F2) + MATRIX_KEY(0x03, 0x03, KEY_5) + MATRIX_KEY(0x03, 0x04, KEY_F5) + MATRIX_KEY(0x03, 0x06, KEY_6) + MATRIX_KEY(0x03, 0x08, KEY_MINUS) + MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH) + + MATRIX_KEY(0x04, 0x00, KEY_RIGHTCTRL) + MATRIX_KEY(0x04, 0x01, KEY_A) + MATRIX_KEY(0x04, 0x02, KEY_D) + MATRIX_KEY(0x04, 0x03, KEY_F) + MATRIX_KEY(0x04, 0x04, KEY_S) + MATRIX_KEY(0x04, 0x05, KEY_K) + MATRIX_KEY(0x04, 0x06, KEY_J) + MATRIX_KEY(0x04, 0x08, KEY_SEMICOLON) + MATRIX_KEY(0x04, 0x09, KEY_L) + MATRIX_KEY(0x04, 0x0a, KEY_BACKSLASH) + MATRIX_KEY(0x04, 0x0b, KEY_ENTER) + + MATRIX_KEY(0x05, 0x01, KEY_Z) + MATRIX_KEY(0x05, 0x02, KEY_C) + MATRIX_KEY(0x05, 0x03, KEY_V) + MATRIX_KEY(0x05, 0x04, KEY_X) + MATRIX_KEY(0x05, 0x05, KEY_COMMA) + MATRIX_KEY(0x05, 0x06, KEY_M) + MATRIX_KEY(0x05, 0x07, KEY_LEFTSHIFT) + MATRIX_KEY(0x05, 0x08, KEY_SLASH) + MATRIX_KEY(0x05, 0x09, KEY_DOT) + MATRIX_KEY(0x05, 0x0b, KEY_SPACE) + + MATRIX_KEY(0x06, 0x01, KEY_1) + MATRIX_KEY(0x06, 0x02, KEY_3) + MATRIX_KEY(0x06, 0x03, KEY_4) + MATRIX_KEY(0x06, 0x04, KEY_2) + MATRIX_KEY(0x06, 0x05, KEY_8) + MATRIX_KEY(0x06, 0x06, KEY_7) + MATRIX_KEY(0x06, 0x08, KEY_0) + MATRIX_KEY(0x06, 0x09, KEY_9) + MATRIX_KEY(0x06, 0x0a, KEY_LEFTALT) + MATRIX_KEY(0x06, 0x0b, KEY_DOWN) + MATRIX_KEY(0x06, 0x0c, KEY_RIGHT) + + MATRIX_KEY(0x07, 0x01, KEY_Q) + MATRIX_KEY(0x07, 0x02, KEY_E) + MATRIX_KEY(0x07, 0x03, KEY_R) + MATRIX_KEY(0x07, 0x04, KEY_W) + MATRIX_KEY(0x07, 0x05, KEY_I) + MATRIX_KEY(0x07, 0x06, KEY_U) + MATRIX_KEY(0x07, 0x07, KEY_RIGHTSHIFT) + MATRIX_KEY(0x07, 0x08, KEY_P) + MATRIX_KEY(0x07, 0x09, KEY_O) + MATRIX_KEY(0x07, 0x0b, KEY_UP) + MATRIX_KEY(0x07, 0x0c, KEY_LEFT) + >; + }; +};
Signature · 1 line
2.2.0.rc0.207.ga3a616c
PATCH v5 2/3 tegra: dts: Sync tegra124.dtsi with linux kernel
Sync this up with Linux v3.18-rc5. Exclude features that are unlikely to supported in U-Boot soon (regulators, pinmux). Also the addresses are updated to 32-bit. Otherwise it is the same. Also bring in the dt-bindings for pinctrl.
---
Changes in v5: None
Changes in v4: None
Changes in v3:
- Add patch to update tegra124.dtsi from Linux v3.18-rc5
Changes in v2: None
arch/arm/dts/tegra124.dtsi | 114 ++++++++++++++++++++++++++++ include/dt-bindings/pinctrl/pinctrl-tegra.h | 45 +++++++++++ 2 files changed, 159 insertions(+) create mode 100644 include/dt-bindings/pinctrl/pinctrl-tegra.h
arch/arm/dts/tegra124.dtsi +114 -0
@@ -1,5 +1,6 @@ #include <dt-bindings/clock/tegra124-car.h> #include <dt-bindings/gpio/tegra-gpio.h> +#include <dt-bindings/pinctrl/pinctrl-tegra.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include "skeleton.dtsi"
@@ -192,6 +193,16 @@ status = "disabled"; }; + pwm: pwm at 7000a000 { + compatible = "nvidia,tegra124-pwm", "nvidia,tegra20-pwm"; + reg = <0x7000a000 0x100>; + #pwm-cells = <2>; + clocks = <&tegra_car TEGRA124_CLK_PWM>; + resets = <&tegra_car 17>; + reset-names = "pwm"; + status = "disabled"; + }; + spi at 7000d400 { compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi"; reg = <0x7000d400 0x200>;
@@ -290,6 +301,109 @@ status = "disabled"; }; + ahub at 70300000 { + compatible = "nvidia,tegra124-ahub"; + reg = <0x70300000 0x200>, + <0x70300800 0x800>, + <0x70300200 0x600>; + interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&tegra_car TEGRA124_CLK_D_AUDIO>, + <&tegra_car TEGRA124_CLK_APBIF>; + clock-names = "d_audio", "apbif"; + resets = <&tegra_car 106>, /* d_audio */ + <&tegra_car 107>, /* apbif */ + <&tegra_car 30>, /* i2s0 */ + <&tegra_car 11>, /* i2s1 */ + <&tegra_car 18>, /* i2s2 */ + <&tegra_car 101>, /* i2s3 */ + <&tegra_car 102>, /* i2s4 */ + <&tegra_car 108>, /* dam0 */ + <&tegra_car 109>, /* dam1 */ + <&tegra_car 110>, /* dam2 */ + <&tegra_car 10>, /* spdif */ + <&tegra_car 153>, /* amx */ + <&tegra_car 185>, /* amx1 */ + <&tegra_car 154>, /* adx */ + <&tegra_car 180>, /* adx1 */ + <&tegra_car 186>, /* afc0 */ + <&tegra_car 187>, /* afc1 */ + <&tegra_car 188>, /* afc2 */ + <&tegra_car 189>, /* afc3 */ + <&tegra_car 190>, /* afc4 */ + <&tegra_car 191>; /* afc5 */ + reset-names = "d_audio", "apbif", "i2s0", "i2s1", "i2s2", + "i2s3", "i2s4", "dam0", "dam1", "dam2", + "spdif", "amx", "amx1", "adx", "adx1", + "afc0", "afc1", "afc2", "afc3", "afc4", "afc5"; + dmas = <&apbdma 1>, <&apbdma 1>, + <&apbdma 2>, <&apbdma 2>, + <&apbdma 3>, <&apbdma 3>, + <&apbdma 4>, <&apbdma 4>, + <&apbdma 6>, <&apbdma 6>, + <&apbdma 7>, <&apbdma 7>, + <&apbdma 12>, <&apbdma 12>, + <&apbdma 13>, <&apbdma 13>, + <&apbdma 14>, <&apbdma 14>, + <&apbdma 29>, <&apbdma 29>; + dma-names = "rx0", "tx0", "rx1", "tx1", "rx2", "tx2", + "rx3", "tx3", "rx4", "tx4", "rx5", "tx5", + "rx6", "tx6", "rx7", "tx7", "rx8", "tx8", + "rx9", "tx9"; + ranges; + #address-cells = <1>; + #size-cells = <1>; + + tegra_i2s0: i2s at 70301000 { + compatible = "nvidia,tegra124-i2s"; + reg = <0x70301000 0x100>; + nvidia,ahub-cif-ids = <4 4>; + clocks = <&tegra_car TEGRA124_CLK_I2S0>; + resets = <&tegra_car 30>; + reset-names = "i2s"; + status = "disabled"; + }; + + tegra_i2s1: i2s at 70301100 { + compatible = "nvidia,tegra124-i2s"; + reg = <0x70301100 0x100>; + nvidia,ahub-cif-ids = <5 5>; + clocks = <&tegra_car TEGRA124_CLK_I2S1>; + resets = <&tegra_car 11>; + reset-names = "i2s"; + status = "disabled"; + }; + + tegra_i2s2: i2s at 70301200 { + compatible = "nvidia,tegra124-i2s"; + reg = <0x70301200 0x100>; + nvidia,ahub-cif-ids = <6 6>; + clocks = <&tegra_car TEGRA124_CLK_I2S2>; + resets = <&tegra_car 18>; + reset-names = "i2s"; + status = "disabled"; + }; + + tegra_i2s3: i2s at 70301300 { + compatible = "nvidia,tegra124-i2s"; + reg = <0x70301300 0x100>; + nvidia,ahub-cif-ids = <7 7>; + clocks = <&tegra_car TEGRA124_CLK_I2S3>; + resets = <&tegra_car 101>; + reset-names = "i2s"; + status = "disabled"; + }; + + tegra_i2s4: i2s at 70301400 { + compatible = "nvidia,tegra124-i2s"; + reg = <0x70301400 0x100>; + nvidia,ahub-cif-ids = <8 8>; + clocks = <&tegra_car TEGRA124_CLK_I2S4>; + resets = <&tegra_car 102>; + reset-names = "i2s"; + status = "disabled"; + }; + }; + usb at 7d000000 { compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci"; reg = <0x7d000000 0x4000>;
include/dt-bindings/pinctrl/pinctrl-tegra.h new file +45 -0
45 lines not on this page · raw message
Signature · 1 line
2.2.0.rc0.207.ga3a616c
PATCH v5 2/3 tegra: dts: Sync tegra124.dtsi with linux kernel
Quoted 14 lines · Simon Glass
Sync this up with Linux v3.18-rc5. Exclude features that are unlikely to supported in U-Boot soon (regulators, pinmux). Also the addresses are updated to 32-bit. Otherwise it is the same. Also bring in the dt-bindings for pinctrl.
Signed-off-by Simon Glass <[email protected]>Acked-by Stephen Warren <[email protected]>---
Changes in v5: None
Changes in v4: None
Changes in v3:
- Add patch to updatetegra124.dtsifrom Linux v3.18-rc5
Quoted 6 lines
Changes in v2: None
arch/arm/dts/tegra124.dtsi | 114 ++++++++++++++++++++++++++++ include/dt-bindings/pinctrl/pinctrl-tegra.h | 45 +++++++++++ 2 files changed, 159 insertions(+) create mode 100644 include/dt-bindings/pinctrl/pinctrl-tegra.h
As discussed with Tom Warren:
Applied to u-boot-dm.
PATCH v5 3/3 ARM: tegra: Add support for nyan-big board
In reply to Simon GlassFrom: Allen Martin <[email protected]>
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.
(rebase, change to 'nyan-big', fix pinmux that resets nyan-big)
---
Changes in v5:
- Remove call to pinmux_set_tristate_input_clamping()
Changes in v4:
- Move FIT support to nyan-big only
- Rename nyan to nyan-big everywhere
Changes in v3:
- Rename to nyan from norrin
- Bring in device tree file from Linux v3.18-rc5
- Generate pinmux file from tegra-pinmux-scripts
Changes in v2:
- Rebase and adjust for Kconfig
- Fix up pinmux that reset norrin
- Add note as to the Chromebook's retail name, since it is now released
arch/arm/cpu/armv7/tegra124/Kconfig | 10 + arch/arm/dts/Makefile | 1 + arch/arm/dts/tegra124-nyan-big.dts | 365 +++++++++++++++++++++++++ board/nvidia/nyan-big/Kconfig | 24 ++ board/nvidia/nyan-big/MAINTAINERS | 6 + board/nvidia/nyan-big/Makefile | 9 + board/nvidia/nyan-big/nyan-big.c | 27 ++ board/nvidia/nyan-big/pinmux-config-nyan-big.h | 287 +++++++++++++++++++ board/nvidia/venice2/as3722_init.h | 2 +- configs/nyan-big_defconfig | 5 + include/configs/nyan-big.h | 79 ++++++ 11 files changed, 814 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/tegra124-nyan-big.dts create mode 100644 board/nvidia/nyan-big/Kconfig create mode 100644 board/nvidia/nyan-big/MAINTAINERS create mode 100644 board/nvidia/nyan-big/Makefile create mode 100644 board/nvidia/nyan-big/nyan-big.c create mode 100644 board/nvidia/nyan-big/pinmux-config-nyan-big.h create mode 100644 configs/nyan-big_defconfig create mode 100644 include/configs/nyan-big.h
arch/arm/cpu/armv7/tegra124/Kconfig +10 -0
@@ -6,6 +6,15 @@ choice config TARGET_JETSON_TK1 bool "NVIDIA Tegra124 Jetson TK1 board" +config TARGET_NYAN_BIG + bool "Google/NVIDIA Nyan-big Chrombook" + help + 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. The retail name is the Acer Chromebook 13 CB5-311-T7NN + (13.3-inch HD, NVIDIA Tegra K1, 2GB). + config TARGET_VENICE2 bool "NVIDIA Tegra124 Venice2"
@@ -15,6 +24,7 @@ config SYS_SOC default "tegra124" source "board/nvidia/jetson-tk1/Kconfig" +source "board/nvidia/nyan-big/Kconfig" source "board/nvidia/venice2/Kconfig" endif
arch/arm/dts/Makefile +1 -0
@@ -31,6 +31,7 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ tegra30-tec-ng.dtb \ tegra114-dalmore.dtb \ tegra124-jetson-tk1.dtb \ + tegra124-nyan-big.dtb \ tegra124-venice2.dtb dtb-$(CONFIG_ARCH_UNIPHIER) += \ uniphier-ph1-pro4-ref.dtb \
arch/arm/dts/tegra124-nyan-big.dts new file +365 -0
365 lines not on this page · raw message
board/nvidia/nyan-big/Kconfig new file +24 -0
@@ -0,0 +1,24 @@ +if TARGET_NYAN_BIG + +config SYS_CPU + string + default "arm720t" if SPL_BUILD + default "armv7" if !SPL_BUILD + +config SYS_BOARD + string + default "nyan-big" + +config SYS_VENDOR + string + default "nvidia" + +config SYS_SOC + string + default "tegra124" + +config SYS_CONFIG_NAME + string + default "nyan-big" + +endif
board/nvidia/nyan-big/MAINTAINERS new file +6 -0
@@ -0,0 +1,6 @@ +NORRIN BOARD +M: Allen Martin <[email protected]> +S: Maintained +F: board/nvidia/nyan-big/ +F: include/configs/nyan-big.h +F: configs/nyan-big_defconfig
board/nvidia/nyan-big/Makefile new file +9 -0
@@ -0,0 +1,9 @@ +# +# (C) Copyright 2014 +# NVIDIA Corporation <www.nvidia.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += ../venice2/as3722_init.o +obj-y += nyan-big.o
board/nvidia/nyan-big/nyan-big.c new file +27 -0
@@ -0,0 +1,27 @@ +/* +* (C) Copyright 2014 +* NVIDIA Corporation <www.nvidia.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <asm/arch/gpio.h> +#include <asm/arch/pinmux.h> +#include "pinmux-config-nyan-big.h" + +/* +* Routine: pinmux_init +* Description: Do individual peripheral pinmux configs +*/ +void pinmux_init (void ) +{ +gpio_config_table (nyan_big_gpio_inits, +ARRAY_SIZE (nyan_big_gpio_inits)); + +pinmux_config_pingrp_table (nyan_big_pingrps, +ARRAY_SIZE (nyan_big_pingrps)); + +pinmux_config_drvgrp_table (nyan_big_drvgrps, +ARRAY_SIZE (nyan_big_drvgrps)); +}
board/nvidia/nyan-big/pinmux-config-nyan-big.h new file +287 -0
287 lines not on this page · raw message
board/nvidia/venice2/as3722_init.h +1 -1
@@ -18,7 +18,7 @@#define AS3722_LDO6VOLTAGE_REG 0x16/* VDD_SDMMC */ #define AS3722_LDCONTROL_REG 0x4E -#ifdef CONFIG_TARGET_JETSON_TK1 +#if defined(CONFIG_TARGET_JETSON_TK1 ) || defined(CONFIG_TARGET_NYAN_BIG )#define AS3722_SD0VOLTAGE_DATA (0x3C00 | AS3722_SD0VOLTAGE_REG)#else #define AS3722_SD0VOLTAGE_DATA (0x2800 | AS3722_SD0VOLTAGE_REG)
configs/nyan-big_defconfig new file +5 -0
@@ -0,0 +1,5 @@ ++S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA124=y ++S:CONFIG_TARGET_NYAN_BIG=y +CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
include/configs/nyan-big.h new file +79 -0
79 lines not on this page · raw message
Signature · 1 line
2.2.0.rc0.207.ga3a616c
PATCH v5 3/3 ARM: tegra: Add support for nyan-big board
Hi,
Quoted 15 lines · Simon Glass
From: Allen Martin <[email protected]>
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.
Quoted 9 lines
Signed-off-by Allen Martin <[email protected]>Signed-off-by Simon Glass <[email protected]>(rebase, change to 'nyan-big', fix pinmux that resets nyan-big)
---
Changes in v5:
- Remove call topinmux_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.
Regards,
Simon
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v5 3/3 ARM: tegra: Add support for nyan-big board
Hi Tom,
Quoted 10 lines · Tom Warren
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=32fdf0e4d82bdca5d64d86330e461e59685f9959branch 'master' ofgit://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.
Regards,
Simon
Quoted 87 lines
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 castinclude/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 castinclude/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 castinclude/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 castinclude/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 castinclude/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 castinclude/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....Quoted 64 lines
-----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 boardSimon,
Quoted 36 lines
-----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 boardHi,
Quoted 15 lines · Simon Glass
From: Allen Martin <[email protected]>
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.
Quoted 9 lines
Signed-off-by Allen Martin <[email protected]>Signed-off-by Simon Glass <[email protected]> (rebase, change to'nyan-big', fix pinmux that resets nyan-big)
---
Changes in v5:
- Remove call topinmux_set_tristate_input_clamping()Quoted 7 lines
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
Quoted 3 lines
Regards,
Simon--
nvpublic
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v5 3/3 ARM: tegra: Add support for nyan-big board
Hi Tom,
Quoted 19 lines · Tom Warren
Simon,
Quoted 16 lines
-----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 boardHi Tom,
Quoted 3 lines · Tom Warren
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.
Quoted 5 lines
Quoted 5 lines
FETCH_HEAD=Quoted 1 line
32fdf0e4d82bdca5d64d86330e461e59685f9959branch 'master' of
git://git.denx.de/u-boot). 3 - 4 patches fail when using git am.Quoted 2 lines
I worked thru the conflicts for both branches (my master rebased
against
Quoted 2 lines
Quoted 2 lines
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
Quoted 3 lines
Quoted 3 lines
with your DM I2C series in place?
Quoted 2 lines
To submit a PR from the Tegra repo, I need to either rebase first
against
Quoted 1 line
Quoted 1 line
ARM master (my SOP), or against U-Boot 'master'. So you patches, if
they're
Quoted 5 lines
Quoted 5 lines
bound for the Tegra repo, need to work in one of those scenarios.
Quoted 2 lines
Tom
Thanks for looking at it. This series depends on the I2C driver model
series.
Quoted 1 line
Quoted 1 line
It's available at u-boot-dm/i2c-working if you want to check it out. I
plan to
Quoted 3 lines
Quoted 3 lines
apply that very soon.
I'm sorry I didn't make that clear in this series. I mentioned it on
the list at
Quoted 1 line
Quoted 1 line
one point but should have added it here. If you like, you could ack it
and I can
Quoted 2 lines
Quoted 1 line
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.
Quoted 1 line
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.
Regards,
Simon
Quoted 9 lines
Tom
Quoted 8 lines
Regards,
SimonQuoted 5 lines
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 castinclude/i2c.h:235: note: expected 'uint8_t' but argument is of type
'struct
Quoted 7 lines
Quoted 7 lines
udevice *'
Quoted 6 lines
drivers/power/as3722.c:34: warning: passing argument 3 of 'i2c_read' makes integer from pointer without a castinclude/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 castinclude/i2c.h:235: note: expected 'uint8_t*' but argument is of type
'int'
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/power/as3722.c:34: error: too few arguments to function
'i2c_read'
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
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 castinclude/i2c.h:238: note: expected 'uint8_t' but argument is of type
'struct
Quoted 7 lines
Quoted 7 lines
udevice *'
Quoted 6 lines
drivers/power/as3722.c:45: warning: passing argument 3 of 'i2c_write' makes integer from pointer without a castinclude/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 castinclude/i2c.h:238: note: expected 'uint8_t*' but argument is of type
'int'
Quoted 58 lines
Quoted 58 lines
Quoted 1 line
drivers/power/as3722.c:45: error: too few arguments to function'
i2c_write'Quoted 2 lines
drivers/power/as3722.c: In function 'as3722_init':drivers/power/as3722.c:245: warning: implicit declaration of function'
i2c_get_chip_for_busnum'Quoted 40 lines
make[1]: *** [
drivers/power/as3722.o] Error 1
make: *** [drivers/power] Error 2
make: *** Waiting for unfinished jobs....Quoted 36 lines
-----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 boardSimon,
Quoted 26 lines
-----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 boardHi,
Quoted 13 lines · Simon Glass
From: Allen Martin <[email protected]>
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).
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 11 lines
Also the addresses are updated to 32-bit.
Signed-off-by Allen Martin <[email protected]>Signed-off-by Simon Glass <[email protected]> (rebase, change to'nyan-big', fix pinmux that resets nyan-big)
---
Changes in v5:
- Remove call topinmux_set_tristate_input_clamping()
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
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.
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
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
Quoted 3 lines
Regards,
Simon--
nvpublic
PATCH v5 3/3 ARM: tegra: Add support for nyan-big board
Hi Tom,
Quoted 60 lines · Simon Glass
Hi Tom,
Quoted 50 lines · Tom Warren
Simon,
Quoted 42 lines
-----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 boardHi Tom,
Quoted 3 lines · Tom Warren
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=Quoted 1 line
32fdf0e4d82bdca5d64d86330e461e59685f9959branch 'master' of
git://git.denx.de/u-boot). 3 - 4 patches fail when using git am.Quoted 3 lines
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?Quoted 3 lines
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.Quoted 2 lines
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.Quoted 5 lines
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.Quoted 6 lines
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.
Quoted 3 lines
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
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
Quoted 115 lines
Regards,
SimonQuoted 111 lines
Tom
Quoted 110 lines
Regards,
SimonQuoted 6 lines
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 castinclude/i2c.h:235: note: expected 'uint8_t' but argument is of type 'structudevice *'
Quoted 6 lines
drivers/power/as3722.c:34: warning: passing argument 3 of 'i2c_read' makes integer from pointer without a castinclude/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 castinclude/i2c.h:235: note: expected 'uint8_t*' but argument is of typeQuoted 8 lines
'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 castinclude/i2c.h:238: note: expected 'uint8_t' but argument is of type 'structudevice *'
Quoted 8 lines
drivers/power/as3722.c:45: warning: passing argument 3 of 'i2c_write' makes integer from pointer without a castinclude/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 castinclude/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'Quoted 2 lines
drivers/power/as3722.c: In function 'as3722_init':drivers/power/as3722.c:245: warning: implicit declaration of function'
i2c_get_chip_for_busnum'Quoted 40 lines
make[1]: *** [
drivers/power/as3722.o] Error 1
make: *** [drivers/power] Error 2
make: *** Waiting for unfinished jobs....Quoted 36 lines
-----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 boardSimon,
Quoted 26 lines
-----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 boardHi,
Quoted 13 lines · Simon Glass
From: Allen Martin <[email protected]>
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).
Quoted 32 lines
Quoted 32 lines
Quoted 12 lines
Quoted 11 lines
Also the addresses are updated to 32-bit.
Signed-off-by Allen Martin <[email protected]>Signed-off-by Simon Glass <[email protected]> (rebase, change to'nyan-big', fix pinmux that resets nyan-big)
---
Changes in v5:
- Remove call topinmux_set_tristate_input_clamping()Quoted 8 lines
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
Quoted 3 lines
Regards,
Simon--
nvpublic
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v5 3/3 ARM: tegra: Add support for nyan-big board
Hi Tom,
Quoted 97 lines · Tom Warren
Simon,
Quoted 95 lines
-----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 boardHi Tom,
Quoted 20 lines · Simon Glass
Hi Tom,
Quoted 17 lines · Tom Warren
Simon,
Quoted 14 lines
-----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 boardHi Tom,
On 10 December 2014 at 10:39, Tom Warren <[email protected]>
Quoted 41 lines · wrote:
Quoted 33 lines
Quoted 29 lines
Quoted 4 lines
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=Quoted 1 line
32fdf0e4d82bdca5d64d86330e461e59685f9959branch 'master' of
git://git.denx.de/u-boot). 3 - 4 patches fail when using git am.Quoted 3 lines
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?
Quoted 3 lines
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.
Quoted 2 lines
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.Quoted 4 lines
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.
Quoted 7 lines
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.Quoted 3 lines
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)
Quoted 6 lines
Quoted 3 lines
Then if you have time:
- Tom - apply PCIe to Tegra tree
- Pull request to mainlineThe 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@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/Makefileboard/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
Quoted 128 lines
Quoted 128 lines
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,
SimonQuoted 70 lines
Regards,
SimonQuoted 66 lines
Tom
Quoted 65 lines
Regards,
SimonQuoted 6 lines
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 castinclude/i2c.h:235: note: expected 'uint8_t' but argument is of type 'structudevice *'
Quoted 6 lines
drivers/power/as3722.c:34: warning: passing argument 3 of 'i2c_read' makes integer from pointer without a castinclude/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 castinclude/i2c.h:235: note: expected 'uint8_t*' but argument is ofQuoted 8 lines
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 castinclude/i2c.h:238: note: expected 'uint8_t' but argument is of type 'structudevice *'
Quoted 8 lines
drivers/power/as3722.c:45: warning: passing argument 3 of 'i2c_write' makes integer from pointer without a castinclude/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 castinclude/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'Quoted 3 lines
drivers/power/as3722.c: In function 'as3722_init':drivers/power/as3722.c:245: warning: implicit declaration of function'
i2c_get_chip_for_busnum'Quoted 27 lines
make[1]: *** [
drivers/power/as3722.o] Error 1
make: *** [drivers/power] Error 2
make: *** Waiting for unfinished jobs....Quoted 23 lines
-----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 boardSimon,
Quoted 13 lines
-----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 boardHi,
On 4 December 2014 at 06:36, Simon Glass <[email protected]>
Quoted 5 lines · wrote:
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
From: Allen Martin <[email protected]>
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.
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
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).
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 11 lines
Also the addresses are updated to 32-bit.
Signed-off-by Allen Martin <[email protected]>Signed-off-by Simon Glass <[email protected]> (rebase,change to 'nyan-big', fix pinmux that resets nyan-big)
---
Changes in v5:
- Remove call topinmux_set_tristate_input_clamping()Any further comments on v5 please?
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
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.
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
If someone can say it looks good, or has been tested on X board, etc. I can apply it.
Tom
Quoted 3 lines
Regards,
Simon--
nvpublic
PATCH v5 3/3 ARM: tegra: Add support for nyan-big board
Hi Tom,
Quoted 157 lines · Simon Glass
Hi Tom,
Quoted 97 lines · Tom Warren
Simon,
Quoted 95 lines
-----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 boardHi Tom,
Quoted 20 lines · Simon Glass
Hi Tom,
Quoted 17 lines · Tom Warren
Simon,
Quoted 14 lines
-----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 boardHi Tom,
On 10 December 2014 at 10:39, Tom Warren <[email protected]>
Quoted 41 lines · wrote:
Quoted 33 lines
Quoted 29 lines
Quoted 4 lines
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=Quoted 1 line
32fdf0e4d82bdca5d64d86330e461e59685f9959branch 'master' of
git://git.denx.de/u-boot). 3 - 4 patches fail when using git am.Quoted 3 lines
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?
Quoted 3 lines
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.
Quoted 2 lines
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.Quoted 4 lines
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.
Quoted 7 lines
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.Quoted 3 lines
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)Quoted 6 lines
Quoted 3 lines
Then if you have time:
- Tom - apply PCIe to Tegra tree
- Pull request to mainlineThe 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: Synctegra124.dtsiwith linux kernel
Applying: tegra: dts: Synctegra124.dtsiwith 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 filearch/arm/cpu/armv7/tegra124/Kconfig
patching filearch/arm/dts/Makefile
Hunk #1 succeeded at 29 with fuzz 2 (offset -2 lines).
patching filearch/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 fileboard/nvidia/nyan-big/nyan-big.c
patching fileboard/nvidia/nyan-big/pinmux-config-nyan-big.hpatching fileboard/nvidia/venice2/as3722_init.h
patching file configs/nyan-big_defconfig
patching fileinclude/configs/nyan-big.hThen:
git add
arch/arm/cpu/armv7/tegra124/Kconfigarch/arm/dts/Makefileboard/nvidia/venice2/as3722_init.harch/arm/dts/tegra124-nyan-big.dtsboard/nvidia/nyan-big/ configs/nyan-big_defconfiginclude/configs/nyan-big.h
git am --resolved
Quoted 6 lines
I've pushed it to u-boot-dm/for-tom.
It all builds cleanly for me.
Regards,
Simon
Further to this, the I2C patches are in u-boot-dm/master now, except for this Tegra I2C conversion, which depends on the nyan-big series:
http://patchwork.ozlabs.org/patch/419730/
So I would like to bring in the nyan-big series to the DM tree, add this Tegra I2C patch and then we are ready to sort out the PCIe series. What do you think of that plan? Or if you prefer, I can issue a pull request to mainline for the DM stuff to date and you can do the rest?
Regards,
Simon
Quoted 129 lines
Quoted 129 lines
Quoted 129 lines
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,
SimonQuoted 70 lines
Regards,
SimonQuoted 66 lines
Tom
Quoted 65 lines
Regards,
SimonQuoted 6 lines
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 castinclude/i2c.h:235: note: expected 'uint8_t' but argument is of type 'structudevice *'
Quoted 6 lines
drivers/power/as3722.c:34: warning: passing argument 3 of 'i2c_read' makes integer from pointer without a castinclude/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 castinclude/i2c.h:235: note: expected 'uint8_t*' but argument is ofQuoted 8 lines
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 castinclude/i2c.h:238: note: expected 'uint8_t' but argument is of type 'structudevice *'
Quoted 8 lines
drivers/power/as3722.c:45: warning: passing argument 3 of 'i2c_write' makes integer from pointer without a castinclude/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 castinclude/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'Quoted 3 lines
drivers/power/as3722.c: In function 'as3722_init':drivers/power/as3722.c:245: warning: implicit declaration of function'
i2c_get_chip_for_busnum'Quoted 27 lines
make[1]: *** [
drivers/power/as3722.o] Error 1
make: *** [drivers/power] Error 2
make: *** Waiting for unfinished jobs....Quoted 23 lines
-----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 boardSimon,
Quoted 13 lines
-----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 boardHi,
On 4 December 2014 at 06:36, Simon Glass <[email protected]>
Quoted 5 lines · wrote:
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
From: Allen Martin <[email protected]>
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.
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
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).
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 11 lines
Also the addresses are updated to 32-bit.
Signed-off-by Allen Martin <[email protected]>Signed-off-by Simon Glass <[email protected]> (rebase,change to 'nyan-big', fix pinmux that resets nyan-big)
---
Changes in v5:
- Remove call topinmux_set_tristate_input_clamping()Any further comments on v5 please?
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
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.
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
If someone can say it looks good, or has been tested on X board, etc. I can apply it.
Tom
Quoted 3 lines
Regards,
Simon--
nvpublic
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v5 3/3 ARM: tegra: Add support for nyan-big board
Hi Tom,
Quoted 3 lines · Tom Warren
Simon,
Feel free to do everything in the DM tree. Once DM makes it to mainline, and hence to ARM and Tegra, we'll be better able to add Tegra things into the Tegra repo.
OK, I'll pull in the nyan-big patches to DM then I2C and retest.
- Simon
Quoted 352 lines
Tom
Quoted 349 lines
-----Original Message-----
From: sjg at google.com [mailto:sjg at google.com] On Behalf Of Simon Glass
Sent: Thursday, December 11, 2014 7:22 AM
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 boardHi Tom,
Quoted 4 lines · Simon Glass
Hi Tom,
On 10 December 2014 at 14:09, Tom Warren <[email protected]>
Quoted 15 lines · wrote:
Quoted 15 lines
Simon,
Quoted 13 lines
-----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 boardHi Tom,
On 10 December 2014 at 12:36, Simon Glass <[email protected]>
Quoted 3 lines · wrote:
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Hi Tom,
On Dec 10, 2014 12:05 PM, "Tom Warren" <[email protected]>
Quoted 13 lines · wrote:
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Simon,
Quoted 10 lines
-----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 boardQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Hi Tom,
On 10 December 2014 at 10:39, Tom Warren
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines · wrote:
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
Simon,
The v4 PCIE patch series fails to apply to
u-boot-tegra/master afterrebasing my repo against both ARM master and U-Boot 'master' master (i.e.
FETCH_HEAD=Quoted 1 line
32fdf0e4d82bdca5d64d86330e461e59685f9959branch'master' of
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
git://git.denx.de/u-boot). 3 - 4 patches fail when using git am.Quoted 3 lines
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?
Quoted 32 lines
Quoted 32 lines
Quoted 32 lines
Quoted 26 lines
Quoted 18 lines
Quoted 14 lines
Quoted 3 lines
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.
Quoted 2 lines
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.Quoted 4 lines
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.
Quoted 7 lines
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.Quoted 3 lines
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:
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
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.
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
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)Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
Then if you have time:
- Tom - apply PCIe to Tegra tree
- Pull request to mainlineThe 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.
Quoted 2 lines
Quoted 2 lines
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.
Quoted 51 lines
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: Synctegra124.dtsiwith linux kernel
Applying: tegra: dts: Synctegra124.dtsiwith 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/patchpatching filearch/arm/cpu/armv7/tegra124/Kconfig
patching filearch/arm/dts/Makefile
Hunk #1 succeeded at 29 with fuzz 2 (offset -2 lines). patching filearch/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 fileboard/nvidia/nyan-big/nyan-big.cpatching fileboard/nvidia/nyan-big/pinmux-config-nyan-big.h
patching fileboard/nvidia/venice2/as3722_init.h
patching file configs/nyan-big_defconfig patching fileinclude/configs/nyan-big.hThen:
git add
arch/arm/cpu/armv7/tegra124/Kconfigarch/arm/dts/Makefileboard/nvidia/venice2/as3722_init.harch/arm/dts/tegra124-nyan-big.dtsboard/nvidia/nyan-big/ configs/nyan-big_defconfiginclude/configs/nyan-big.hgit am --resolvedQuoted 6 lines
I've pushed it to u-boot-dm/for-tom.
It all builds cleanly for me.
Regards,
SimonFurther to this, the I2C patches are in u-boot-dm/master now, except for this Tegra I2C conversion, which depends on the nyan-big series:
http://patchwork.ozlabs.org/patch/419730/
So I would like to bring in the nyan-big series to the DM tree, add this Tegra I2C patch and then we are ready to sort out the PCIe series. What do you think of that plan? Or if you prefer, I can issue a pull request to mainline for the DM stuff to date and you can do the rest?
Regards,
SimonQuoted 5 lines
Quoted 5 lines
Quoted 5 lines
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.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Regards,
SimonQuoted 4 lines
Regards,
SimonQuoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Tom
Quoted 6 lines
Regards,
SimonQuoted 3 lines
drivers/power/as3722.c: In function 'as3722_read':drivers/power/as3722.c:34: warning: passing argument 1 of'
i2c_read'Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines
makes integer from pointer without a cast
include/i2c.h:235: note: expected 'uint8_t' but argument is of type 'structudevice *'
Quoted 1 line
drivers/power/as3722.c:34: warning: passing argument 3 of'
i2c_read'Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
makes integer from pointer without a cast
include/i2c.h:235: note: expected 'int' but argument is of type 'u8*'
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/power/as3722.c:34: warning: passing argument 4 of'
i2c_read'Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
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'Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines
makes integer from pointer without a cast
include/i2c.h:238: note: expected 'uint8_t' but argument is of type 'structudevice *'
Quoted 1 line
drivers/power/as3722.c:45: warning: passing argument 3 of'
i2c_write'Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
makes integer from pointer without a cast
include/i2c.h:238: note: expected 'int' but argument is of type 'u8*'
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/power/as3722.c:45: warning: passing argument 4 of'
i2c_write'Quoted 46 lines
Quoted 46 lines
Quoted 46 lines
Quoted 39 lines
Quoted 39 lines
Quoted 39 lines
Quoted 5 lines
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'Quoted 3 lines
drivers/power/as3722.c: In function 'as3722_init':drivers/power/as3722.c:245: warning: implicit declaration of function'
i2c_get_chip_for_busnum'Quoted 29 lines
make[1]: *** [
drivers/power/as3722.o] Error 1
make: *** [drivers/power] Error 2
make: *** Waiting for unfinished jobs....Quoted 25 lines
-----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 boardSimon,
Quoted 14 lines
-----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 boardHi,
On 4 December 2014 at 06:36, Simon Glass
<[email protected]>Quoted 6 lines · wrote:
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
From: Allen Martin <[email protected]>
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
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
PMIC.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
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.
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
The device tree file is from Linux but with features removed which are unlikely to be supported in U-Boot soon (regulators,
pinmux).
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
Quoted 11 lines
Also the addresses are updated to 32-bit.
Signed-off-by Allen Martin <[email protected]>Signed-off-by Simon Glass <[email protected]> (rebase,change to 'nyan-big', fix pinmux that resets nyan-big)
---
Changes in v5:
- Remove call topinmux_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.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
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.
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
If someone can say it looks good, or has been tested on X
board, etc.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
I can apply it.
Tom
Quoted 3 lines
Regards,
Simon--
nvpublic
PATCH v5 3/3 ARM: tegra: Add support for nyan-big board
Quoted 8 lines · Simon Glass
Hi Tom,
Quoted 3 lines · Tom Warren
Simon,
Feel free to do everything in the DM tree. Once DM makes it to mainline, and hence to ARM and Tegra, we'll be better able to add Tegra things into the Tegra repo.
OK, I'll pull in the nyan-big patches to DM then I2C and retest.
Applied to u-boot-dm.
Quoted 353 lines
Quoted 353 lines
Tom
Quoted 349 lines
-----Original Message-----
From: sjg at google.com [mailto:sjg at google.com] On Behalf Of Simon Glass
Sent: Thursday, December 11, 2014 7:22 AM
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 boardHi Tom,
Quoted 4 lines · Simon Glass
Hi Tom,
On 10 December 2014 at 14:09, Tom Warren <[email protected]>
Quoted 15 lines · wrote:
Quoted 15 lines
Simon,
Quoted 13 lines
-----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 boardHi Tom,
On 10 December 2014 at 12:36, Simon Glass <[email protected]>
Quoted 3 lines · wrote:
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Hi Tom,
On Dec 10, 2014 12:05 PM, "Tom Warren" <[email protected]>
Quoted 13 lines · wrote:
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Simon,
Quoted 10 lines
-----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 boardQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Hi Tom,
On 10 December 2014 at 10:39, Tom Warren
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines · wrote:
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
Simon,
The v4 PCIE patch series fails to apply to
u-boot-tegra/master afterrebasing my repo against both ARM master and U-Boot 'master' master (i.e.
FETCH_HEAD=Quoted 1 line
32fdf0e4d82bdca5d64d86330e461e59685f9959branch'master' of
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
git://git.denx.de/u-boot). 3 - 4 patches fail when using git am.Quoted 3 lines
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?
Quoted 32 lines
Quoted 32 lines
Quoted 32 lines
Quoted 26 lines
Quoted 18 lines
Quoted 14 lines
Quoted 3 lines
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.
Quoted 2 lines
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.Quoted 4 lines
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.
Quoted 7 lines
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.Quoted 3 lines
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:
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
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.
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
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)Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
Then if you have time:
- Tom - apply PCIe to Tegra tree
- Pull request to mainlineThe 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.
Quoted 2 lines
Quoted 2 lines
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.
Quoted 51 lines
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: Synctegra124.dtsiwith linux kernel
Applying: tegra: dts: Synctegra124.dtsiwith 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/patchpatching filearch/arm/cpu/armv7/tegra124/Kconfig
patching filearch/arm/dts/Makefile
Hunk #1 succeeded at 29 with fuzz 2 (offset -2 lines). patching filearch/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 fileboard/nvidia/nyan-big/nyan-big.cpatching fileboard/nvidia/nyan-big/pinmux-config-nyan-big.h
patching fileboard/nvidia/venice2/as3722_init.h
patching file configs/nyan-big_defconfig patching fileinclude/configs/nyan-big.hThen:
git add
arch/arm/cpu/armv7/tegra124/Kconfigarch/arm/dts/Makefileboard/nvidia/venice2/as3722_init.harch/arm/dts/tegra124-nyan-big.dtsboard/nvidia/nyan-big/ configs/nyan-big_defconfiginclude/configs/nyan-big.hgit am --resolvedQuoted 6 lines
I've pushed it to u-boot-dm/for-tom.
It all builds cleanly for me.
Regards,
SimonFurther to this, the I2C patches are in u-boot-dm/master now, except for this Tegra I2C conversion, which depends on the nyan-big series:
http://patchwork.ozlabs.org/patch/419730/
So I would like to bring in the nyan-big series to the DM tree, add this Tegra I2C patch and then we are ready to sort out the PCIe series. What do you think of that plan? Or if you prefer, I can issue a pull request to mainline for the DM stuff to date and you can do the rest?
Regards,
SimonQuoted 5 lines
Quoted 5 lines
Quoted 5 lines
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.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Regards,
SimonQuoted 4 lines
Regards,
SimonQuoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Tom
Quoted 6 lines
Regards,
SimonQuoted 3 lines
drivers/power/as3722.c: In function 'as3722_read':drivers/power/as3722.c:34: warning: passing argument 1 of'
i2c_read'Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines
makes integer from pointer without a cast
include/i2c.h:235: note: expected 'uint8_t' but argument is of type 'structudevice *'
Quoted 1 line
drivers/power/as3722.c:34: warning: passing argument 3 of'
i2c_read'Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
makes integer from pointer without a cast
include/i2c.h:235: note: expected 'int' but argument is of type 'u8*'
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/power/as3722.c:34: warning: passing argument 4 of'
i2c_read'Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
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'Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines
makes integer from pointer without a cast
include/i2c.h:238: note: expected 'uint8_t' but argument is of type 'structudevice *'
Quoted 1 line
drivers/power/as3722.c:45: warning: passing argument 3 of'
i2c_write'Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
makes integer from pointer without a cast
include/i2c.h:238: note: expected 'int' but argument is of type 'u8*'
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/power/as3722.c:45: warning: passing argument 4 of'
i2c_write'Quoted 46 lines
Quoted 46 lines
Quoted 46 lines
Quoted 39 lines
Quoted 39 lines
Quoted 39 lines
Quoted 5 lines
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'Quoted 3 lines
drivers/power/as3722.c: In function 'as3722_init':drivers/power/as3722.c:245: warning: implicit declaration of function'
i2c_get_chip_for_busnum'Quoted 29 lines
make[1]: *** [
drivers/power/as3722.o] Error 1
make: *** [drivers/power] Error 2
make: *** Waiting for unfinished jobs....Quoted 25 lines
-----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 boardSimon,
Quoted 14 lines
-----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 boardHi,
On 4 December 2014 at 06:36, Simon Glass
<[email protected]>Quoted 6 lines · wrote:
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
From: Allen Martin <[email protected]>
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 AS3722Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
PMIC.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
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 isprovided here.
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
The device tree file is from Linux but with features
removed which are unlikely to be supported in U-Boot
soon (regulators,pinmux).
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
Quoted 11 lines
Also the addresses are updated to 32-bit.
Signed-off-by: Allen Martin <[email protected]>
Signed-off-by: Simon Glass <[email protected]> (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.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
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.
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
If someone can say it looks good, or has been tested on X
board, etc.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
I can apply it.
Tom
Quoted 3 lines
Regards,
Simon--
nvpublic
PATCH v5 1/3 dts: Bring in Chrome OS keyboard device tree definition
In reply to Simon GlassHey Simon,
Quoted 4 lines · Simon Glass
This will be used by nyan-big, but bring it in in a separate patch since it will be common to other boards.
Signed-off-by Simon Glass <[email protected]>
This will clash with the patch i sent last week to pull (sorry i didn't see your v3 for this earlier) in this dtsi & its documentation & fix the existing exynos users/code to correctly use it..
I'm not very familiar with how the u-boot merging process works, so i wonder how to best get these patches merged without unnecessary conflicts between e.g. the samsung/tegra trees.
Quoted 113 lines
Changes in v5: None
Changes in v4: None
Changes in v3:
- Add patch to bring incros-ec-keyboard.dtsiChanges in v2: None
arch/arm/dts/cros-ec-keyboard.dtsi | 105 +++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 arch/arm/dts/cros-ec-keyboard.dtsiarch/arm/dts/cros-ec-keyboard.dtsi new file +95
-0@@ -0,0 +1,105 @@ +/* + * Keyboard dts fragment for devices that use cros-ec-keyboard + * + * Copyright (c) 2014 Google, Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#include <dt-bindings/input/input.h> + +&cros_ec { + keyboard-controller { + compatible = "google,cros-ec-keyb"; + keypad,num-rows = <8>; + keypad,num-columns = <13>; + google,needs-ghost-filter; + + linux,keymap = < + MATRIX_KEY(0x00, 0x01, KEY_LEFTMETA) + MATRIX_KEY(0x00, 0x02, KEY_F1) + MATRIX_KEY(0x00, 0x03, KEY_B) + MATRIX_KEY(0x00, 0x04, KEY_F10) + MATRIX_KEY(0x00, 0x06, KEY_N) + MATRIX_KEY(0x00, 0x08, KEY_EQUAL) + MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT) + + MATRIX_KEY(0x01, 0x01, KEY_ESC) + MATRIX_KEY(0x01, 0x02, KEY_F4) + MATRIX_KEY(0x01, 0x03, KEY_G) + MATRIX_KEY(0x01, 0x04, KEY_F7) + MATRIX_KEY(0x01, 0x06, KEY_H) + MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE) + MATRIX_KEY(0x01, 0x09, KEY_F9) + MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE) + + MATRIX_KEY(0x02, 0x00, KEY_LEFTCTRL) + MATRIX_KEY(0x02, 0x01, KEY_TAB) + MATRIX_KEY(0x02, 0x02, KEY_F3) + MATRIX_KEY(0x02, 0x03, KEY_T) + MATRIX_KEY(0x02, 0x04, KEY_F6) + MATRIX_KEY(0x02, 0x05, KEY_RIGHTBRACE) + MATRIX_KEY(0x02, 0x06, KEY_Y) + MATRIX_KEY(0x02, 0x07, KEY_102ND) + MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE) + MATRIX_KEY(0x02, 0x09, KEY_F8) + + MATRIX_KEY(0x03, 0x01, KEY_GRAVE) + MATRIX_KEY(0x03, 0x02, KEY_F2) + MATRIX_KEY(0x03, 0x03, KEY_5) + MATRIX_KEY(0x03, 0x04, KEY_F5) + MATRIX_KEY(0x03, 0x06, KEY_6) + MATRIX_KEY(0x03, 0x08, KEY_MINUS) + MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH) + + MATRIX_KEY(0x04, 0x00, KEY_RIGHTCTRL) + MATRIX_KEY(0x04, 0x01, KEY_A) + MATRIX_KEY(0x04, 0x02, KEY_D) + MATRIX_KEY(0x04, 0x03, KEY_F) + MATRIX_KEY(0x04, 0x04, KEY_S) + MATRIX_KEY(0x04, 0x05, KEY_K) + MATRIX_KEY(0x04, 0x06, KEY_J) + MATRIX_KEY(0x04, 0x08, KEY_SEMICOLON) + MATRIX_KEY(0x04, 0x09, KEY_L) + MATRIX_KEY(0x04, 0x0a, KEY_BACKSLASH) + MATRIX_KEY(0x04, 0x0b, KEY_ENTER) + + MATRIX_KEY(0x05, 0x01, KEY_Z) + MATRIX_KEY(0x05, 0x02, KEY_C) + MATRIX_KEY(0x05, 0x03, KEY_V) + MATRIX_KEY(0x05, 0x04, KEY_X) + MATRIX_KEY(0x05, 0x05, KEY_COMMA) + MATRIX_KEY(0x05, 0x06, KEY_M) + MATRIX_KEY(0x05, 0x07, KEY_LEFTSHIFT) + MATRIX_KEY(0x05, 0x08, KEY_SLASH) + MATRIX_KEY(0x05, 0x09, KEY_DOT) + MATRIX_KEY(0x05, 0x0b, KEY_SPACE) + + MATRIX_KEY(0x06, 0x01, KEY_1) + MATRIX_KEY(0x06, 0x02, KEY_3) + MATRIX_KEY(0x06, 0x03, KEY_4) + MATRIX_KEY(0x06, 0x04, KEY_2) + MATRIX_KEY(0x06, 0x05, KEY_8) + MATRIX_KEY(0x06, 0x06, KEY_7) + MATRIX_KEY(0x06, 0x08, KEY_0) + MATRIX_KEY(0x06, 0x09, KEY_9) + MATRIX_KEY(0x06, 0x0a, KEY_LEFTALT) + MATRIX_KEY(0x06, 0x0b, KEY_DOWN) + MATRIX_KEY(0x06, 0x0c, KEY_RIGHT) + + MATRIX_KEY(0x07, 0x01, KEY_Q) + MATRIX_KEY(0x07, 0x02, KEY_E) + MATRIX_KEY(0x07, 0x03, KEY_R) + MATRIX_KEY(0x07, 0x04, KEY_W)
arch/arm/dts/cros-ec-keyboard.dtsi line 105
Quoted 10 lines
arch/arm/dts/cros-ec-keyboard.dtsi new file +10
-0+ MATRIX_KEY(0x07, 0x05, KEY_I) + MATRIX_KEY(0x07, 0x06, KEY_U) + MATRIX_KEY(0x07, 0x07, KEY_RIGHTSHIFT) + MATRIX_KEY(0x07, 0x08, KEY_P) + MATRIX_KEY(0x07, 0x09, KEY_O) + MATRIX_KEY(0x07, 0x0b, KEY_UP) + MATRIX_KEY(0x07, 0x0c, KEY_LEFT) + >; + }; +};
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 6170 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141205/91d59b42/attachment.bin>
PATCH v5 1/3 dts: Bring in Chrome OS keyboard device tree definition
Hi,
Quoted 9 lines · Sjoerd Simons
Hey Simon,
Quoted 4 lines · Simon Glass
This will be used by nyan-big, but bring it in in a separate patch since it will be common to other boards.
Signed-off-by Simon Glass <[email protected]>
Quoted 7 lines
This will clash with the patch i sent last week to pull (sorry i didn't see your v3 for this earlier) in this dtsi & its documentation & fix the existing exynos users/code to correctly use it..
I'm not very familiar with how the u-boot merging process works, so i wonder how to best get these patches merged without unnecessary conflicts between e.g. the samsung/tegra trees.
It's a race! It will be pretty easy to drop whichever one we need to. I haven't heard anything on the Tegra side.
Regards,
Simon
PATCH v5 1/3 dts: Bring in Chrome OS keyboard device tree definition
Quoted 21 lines · Simon Glass
Hi,
Quoted 9 lines · Sjoerd Simons
Hey Simon,
Quoted 4 lines · Simon Glass
This will be used by nyan-big, but bring it in in a separate patch since it will be common to other boards.
Signed-off-by Simon Glass <[email protected]>Quoted 7 lines
This will clash with the patch i sent last week to pull (sorry i didn't see your v3 for this earlier) in this dtsi & its documentation & fix the existing exynos users/code to correctly use it..
I'm not very familiar with how the u-boot merging process works, so i wonder how to best get these patches merged without unnecessary conflicts between e.g. the samsung/tegra trees.
Quoted 5 lines
It's a race! It will be pretty easy to drop whichever one we need to. I haven't heard anything on the Tegra side.
Regards,
Simon
As discussed with Tom Warren:
Applied to u-boot-dm.