dm: tegra: Move nyan-big and beaver to livetree
Subsystems (12)
v2 cover dm: tegra: Move nyan-big and beaver to livetree
This moves an entire board to use a live device tree as an example of the impact.
Nyan-big was chosen because I can easily and boot U-Boot without any media swapping, etc. Beaver is enabled as well since it failed to boot with serial v1 due to a disabled console node.
Total code size impact on this board is approximately 9KB on U-Boot and 64 bytes on SPL:
27: dm: tegra: nyan-big: Move to livetree
arm: (for 1/1 boards) all +9264.0 bss -16.0 data +44.0 rodata +92.0
spl/u-boot-spl:all +326.0 spl/u-boot-spl:rodata +262.0
spl/u-boot-spl:text +64.0 text +9144.0Tegra does not use Thumb2, which would likely reduce the code size by about 25%, indicating a code-size impact of perhaps 7KB.
Boot time is affected slightly. For nyan-big the times with flat tree are:
2,108 dm_r
7,924 dm_spl
120,724 dm_f
171,816 lcdWith the livetree:
721 dm_r
3,764 of_live
7,990 dm_spl
120,736 dm_f
168,215 lcdAs expected the spl and pre-relocation times are not affected. In the post-relocation case, the live tree must be built, which here takes about 3.8ms. Driver-model device creation takes a bit of 1ms less time with the livetree, so all up the cost is about 2.4ms. After DM init there appears to be a slight reduction in the time taken to set up devices (from 327ms to 319ms) so overall the live tree does not appear to be any slower. This is because pre-parsing the device tree makes reading it later faster.
The use of livetree is controlled by a the CONFIG_OF_LIVE option. When enabled, U-Boot builds a livetree immediately after relocation and uses it from then on.
This series is available at u-boot-dm/livet-working
Changes in v2:
- Add new patch to enable bootstage for nyan-big
- Add new patch to ensure that the console UART is enabled
- Enable livetree for beaver also
- Add timing information
Simon Glass (31):
tegra: video: Time the LCD init
tegra: nyan-big: Enable the debug UART
dm: Fix error handling when unflattening the DT
tegra: nyan-big: Enable bootstage
dm: video: Sync display on backspace
dm: video: Update pwm_backlight to support livetree
video: simple-panel: Add a little more debugging
tegra: Fix up include file ordering
tegra: spl: Enable debug UART
tegra: nyan: Add a PMC syscon driver
dm: tegra: Convert USB setup to livetree
dm: tegra: Convert clock_decode_periph_id() to support livetree
dm: video: tegra124: Convert to livetree
tegra: Don't set up the UART clocks again in U-Boot
tegra: dts: Move stdout-path to /chosen
dm: tegra: gpio: Convert to support livetree
dm: tegra: usb: Convert to livetree
dm: tegra: spi: Convert to livetree
dm: tegra: i2c: Convert to livetree
dm: tegra: pwm: Convert to livetree
dm: tegra: mmc: Convert to livetree
power: Add a regulator driver for the as3722 PMIC
power: Add a GPIO driver for the as3722 PMIC
dm: power: Convert as3722 to driver model
dm: serial: ns16550: Convert to livetree
dm: serial: Separate out the core serial-device finding code
dm: serial: Add livetree support
tegra: Show a debug message if the LCD PMIC fails to start
fdtdec: Drop old compatible values
tegra: fdt: Ensure that the console UART is enabled
dm: tegra: Move nyan-big and beaver to livetree
arch/arm/dts/tegra114-dalmore.dts | 4 + arch/arm/dts/tegra124-cei-tk1-som.dts | 4 + arch/arm/dts/tegra124-jetson-tk1.dts | 4 + arch/arm/dts/tegra124-nyan-big.dts | 5 +- arch/arm/dts/tegra124-venice2.dts | 4 + arch/arm/dts/tegra186-p2771-0000.dtsi | 4 + arch/arm/dts/tegra20-colibri.dts | 4 + arch/arm/dts/tegra20-harmony.dts | 4 + arch/arm/dts/tegra20-trimslice.dts | 4 + arch/arm/dts/tegra20-whistler.dts | 4 + arch/arm/dts/tegra210-e2220-1170.dts | 4 + arch/arm/dts/tegra210-p2371-0000.dts | 4 + arch/arm/dts/tegra210-p2371-2180.dts | 4 + arch/arm/dts/tegra210-p2571.dts | 4 + arch/arm/dts/tegra30-apalis.dts | 4 + arch/arm/dts/tegra30-beaver.dts | 4 + arch/arm/dts/tegra30-cardhu.dts | 4 + arch/arm/dts/tegra30-colibri.dts | 4 + arch/arm/dts/tegra30-tec-ng.dts | 4 + arch/arm/include/asm/arch-tegra/clock.h | 2 +- arch/arm/include/asm/arch-tegra/tegra.h | 5 + arch/arm/include/asm/arch-tegra/xusb-padctl.h | 2 +- arch/arm/mach-tegra/board.c | 2 + arch/arm/mach-tegra/board2.c | 34 ++- arch/arm/mach-tegra/clock.c | 9 +- arch/arm/mach-tegra/spl.c | 4 + arch/arm/mach-tegra/tegra124/Makefile | 1 + arch/arm/mach-tegra/tegra124/pmc.c | 19 ++ arch/arm/mach-tegra/tegra124/xusb-padctl.c | 36 +++- arch/arm/mach-tegra/tegra210/xusb-padctl.c | 40 +++- arch/arm/mach-tegra/xusb-padctl-common.c | 84 ++++---- arch/arm/mach-tegra/xusb-padctl-common.h | 11 +- arch/arm/mach-tegra/xusb-padctl-dummy.c | 2 +- board/cei/cei-tk1-som/cei-tk1-som.c | 2 + board/nvidia/jetson-tk1/jetson-tk1.c | 2 + board/nvidia/nyan-big/nyan-big.c | 22 +- board/toradex/apalis-tk1/apalis-tk1.c | 6 + configs/apalis-tk1_defconfig | 3 + configs/beaver_defconfig | 1 + configs/cei-tk1-som_defconfig | 3 + configs/jetson-tk1_defconfig | 3 + configs/nyan-big_defconfig | 13 ++ drivers/gpio/tegra_gpio.c | 10 +- drivers/i2c/tegra_i2c.c | 6 +- drivers/mmc/tegra_mmc.c | 17 +- drivers/power/pmic/Makefile | 2 +- drivers/power/pmic/as3722.c | 292 +++++++++----------------- drivers/power/pmic/as3722_gpio.c | 120 +++++++++++ drivers/power/regulator/Kconfig | 9 + drivers/power/regulator/Makefile | 1 + drivers/power/regulator/as3722_regulator.c | 149 +++++++++++++ drivers/pwm/tegra_pwm.c | 2 +- drivers/serial/ns16550.c | 15 +- drivers/serial/serial-uclass.c | 92 ++++---- drivers/spi/tegra114_spi.c | 15 +- drivers/spi/tegra20_sflash.c | 2 +- drivers/spi/tegra20_slink.c | 2 +- drivers/spi/tegra210_qspi.c | 2 +- drivers/usb/host/ehci-tegra.c | 36 ++-- drivers/video/pwm_backlight.c | 22 +- drivers/video/simple_panel.c | 2 + drivers/video/tegra124/display.c | 10 +- drivers/video/tegra124/dp.c | 3 +- drivers/video/tegra124/sor.c | 25 +-- drivers/video/vidconsole-uclass.c | 1 + include/fdtdec.h | 6 - include/power/as3722.h | 27 ++- lib/fdtdec.c | 6 - lib/of_live.c | 7 +- 69 files changed, 807 insertions(+), 457 deletions(-) create mode 100644 arch/arm/mach-tegra/tegra124/pmc.c create mode 100644 drivers/power/pmic/as3722_gpio.c create mode 100644 drivers/power/regulator/as3722_regulator.c
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 1/31 tegra: video: Time the LCD init
Calculate the time taken to set up the LCD.
---
Changes in v2: None
drivers/video/tegra124/display.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/video/tegra124/display.c +2 -0
@@ -471,7 +471,9 @@ static int tegra124_lcd_probe(struct udevice *dev)int ret; start =get_timer (0 ); +bootstage_start (BOOTSTAGE_ID_ACCUM_LCD ,"lcd" ); ret =tegra124_lcd_init (dev, (void *)plat->base,VIDEO_BPP16 ); +bootstage_accum (BOOTSTAGE_ID_ACCUM_LCD );debug ("LCD init took %lu ms\n" ,get_timer (start));if (ret)printf ("%s: Error %d\n" , __func__, ret);
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 2/31 tegra: nyan-big: Enable the debug UART
In reply to Simon GlassEnable this to allow debugging when the serial UART driver is misconfigured.
---
Changes in v2: None
configs/nyan-big_defconfig | 4 ++++ 1 file changed, 4 insertions(+)
configs/nyan-big_defconfig +4 -0
@@ -45,6 +45,10 @@ CONFIG_PMIC_AS3722=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_PWM_TEGRA=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_BASE=0x70006000 +CONFIG_DEBUG_UART_CLOCK=408000000 +CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_TEGRA114_SPI=y CONFIG_TPM_TIS_INFINEON=y
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 3/31 dm: Fix error handling when unflattening the DT
In reply to Simon GlassThe error handling code does not current detect an error right away. Adjust it to return immediately.
---
Changes in v2: None
lib/of_live.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
lib/of_live.c +6 -1
@@ -216,9 +216,12 @@ static void *unflatten_dt_node(const void *blob, void *mem, int *poffset, *poffset =fdt_next_node (blob, *poffset, &depth);if (depth <0 ) depth =0 ; -while (*poffset >0 && depth > old_depth) +while (*poffset >0 && depth > old_depth) { mem =unflatten_dt_node (blob, mem, poffset, np,NULL , fpsize, dryrun); +if (!mem) +return NULL ; + }if (*poffset <0 && *poffset != -FDT_ERR_NOTFOUND ) {debug ("unflatten: error %d processing FDT\n" , *poffset);
@@ -286,6 +289,8 @@ static int unflatten_device_tree(const void *blob, start =0 ; size = (unsigned long )unflatten_dt_node (blob,NULL , &start,NULL ,NULL ,0 , true); +if (!size) +return -EFAULT ; size =ALIGN (size,4 );debug (" size is %lx, allocating...\n" , size);
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 4/31 tegra: nyan-big: Enable bootstage
In reply to Simon GlassEnable full bootstage support so we can time SPL and U-Boot.
---
Changes in v2:
- Add new patch to enable bootstage for nyan-big
configs/nyan-big_defconfig | 5 +++++ 1 file changed, 5 insertions(+)
configs/nyan-big_defconfig +5 -0
@@ -6,6 +6,10 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big" CONFIG_FIT=y CONFIG_FIT_BEST_MATCH=y CONFIG_OF_SYSTEM_SETUP=y +CONFIG_BOOTSTAGE=y +CONFIG_SPL_BOOTSTAGE=y +CONFIG_BOOTSTAGE_STASH=y +CONFIG_BOOTSTAGE_STASH_ADDR=0x83000000 CONFIG_SYS_STDIO_DEREGISTER=y CONFIG_SYS_PROMPT="Tegra124 (Nyan-big) # " # CONFIG_CMD_IMI is not set
@@ -23,6 +27,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_CMD_BMP=y +CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_TPM=y
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 5/31 dm: video: Sync display on backspace
In reply to Simon GlassWe should sync the display (e.g. flush cache) when backspace is pressed to ensure that the character is erased correctly.
---
Changes in v2: None
drivers/video/vidconsole-uclass.c | 1 + 1 file changed, 1 insertion(+)
drivers/video/vidconsole-uclass.c +1 -0
@@ -77,6 +77,7 @@ static int vidconsole_back(struct udevice *dev)if (priv->ycur <0 ) priv->ycur =0 ; } +video_sync (dev->parent);return 0 ; }
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 6/31 dm: video: Update pwm_backlight to support livetree
In reply to Simon GlassUpdate this driver to support a live device tree.
---
Changes in v2: None
drivers/video/pwm_backlight.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/video/pwm_backlight.c +12 -10
@@ -28,11 +28,13 @@ struct pwm_backlight_priv {static int pwm_backlight_enable (struct udevice *dev) {struct pwm_backlight_priv *priv =dev_get_priv (dev); +struct dm_regulator_uclass_platdata *plat;uint duty_cycle;int ret; -debug ("%s: Enable '%s', regulator '%s'\n" , __func__, dev->name, - priv->reg->name); + plat =dev_get_uclass_platdata (priv->reg); +debug ("%s: Enable '%s', regulator '%s'/'%s'\n" , __func__, dev->name, + priv->reg->name, plat->name); ret =regulator_set_enable (priv->reg, true);if (ret) { debug("%s: Cannot enable regulator for PWM '%s'\n", __func__,
@@ -59,12 +61,11 @@ static int pwm_backlight_enable(struct udevice *dev)static int pwm_backlight_ofdata_to_platdata (struct udevice *dev) {struct pwm_backlight_priv *priv =dev_get_priv (dev); -struct fdtdec_phandle_args args; -const void *blob = gd->fdt_blob; -int node =dev_of_offset (dev); +struct ofnode_phandle_args args;int index, ret, count, len;const u32 *cell; +debug ("%s: start\n" , __func__); ret =uclass_get_device_by_phandle (UCLASS_REGULATOR , dev,"power-supply" , &priv->reg);if (ret) {
@@ -79,14 +80,14 @@ static int pwm_backlight_ofdata_to_platdata(struct udevice *dev)if (ret != -ENOENT )return ret; } - ret =fdtdec_parse_phandle_with_args (blob, node,"pwms" ,"#pwm-cells" , -0 ,0 , &args); + ret =dev_read_phandle_with_args (dev,"pwms" ,"#pwm-cells" ,0 ,0 , + &args);if (ret) {debug ("%s: Cannot get PWM phandle: ret=%d\n" , __func__, ret);return ret; } - ret =uclass_get_device_by_of_offset (UCLASS_PWM , args.node, &priv->pwm); + ret =uclass_get_device_by_ofnode (UCLASS_PWM , args.node, &priv->pwm);if (ret) {debug ("%s: Cannot get PWM: ret=%d\n" , __func__, ret);return ret;
@@ -94,8 +95,8 @@ static int pwm_backlight_ofdata_to_platdata(struct udevice *dev) priv->channel = args.args[0 ]; priv->period_ns = args.args[1 ]; - index =fdtdec_get_int (blob, node,"default-brightness-level" ,255 ); - cell =fdt_getprop (blob, node,"brightness-levels" , &len); + index =dev_read_u32_default (dev,"default-brightness-level" ,255 ); + cell =dev_read_prop (dev,"brightness-levels" , &len); count = len /sizeof (u32);if (cell && count > index) { priv->default_level =fdt32_to_cpu (cell[index]);
@@ -104,6 +105,7 @@ static int pwm_backlight_ofdata_to_platdata(struct udevice *dev) priv->default_level = index; priv->max_level =255 ; } +debug ("%s: done\n" , __func__);return 0 ;
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 7/31 video: simple-panel: Add a little more debugging
In reply to Simon GlassAdd some debugging to show when the backlight is enabled.
---
Changes in v2: None
drivers/video/simple_panel.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/video/simple_panel.c +2 -0
@@ -25,8 +25,10 @@ static int simple_panel_enable_backlight(struct udevice *dev)struct simple_panel_priv *priv =dev_get_priv (dev);int ret; +debug ("%s: start, backlight = '%s'\n" , __func__, priv->backlight->name);dm_gpio_set_value (&priv->enable,1 ); ret =backlight_enable (priv->backlight); +debug ("%s: done, ret = %d\n" , __func__, ret);if (ret)return ret;
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 8/31 tegra: Fix up include file ordering
In reply to Simon GlassUpdate these two files so include files in the right order.
---
Changes in v2: None
arch/arm/mach-tegra/board2.c | 22 ++++++++-------------- arch/arm/mach-tegra/clock.c | 4 ++-- 2 files changed, 10 insertions(+), 16 deletions(-)
arch/arm/mach-tegra/board2.c +8 -14
@@ -9,14 +9,8 @@#include <dm.h> #include <errno.h> #include <ns16550.h> -#include <linux/compiler.h> -#include <linux/sizes.h> +#include <usb.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/funcmux.h> -#include <asm/arch/pinmux.h> -#include <asm/arch/pmu.h> -#include <asm/arch/tegra.h> #include <asm/arch-tegra/ap.h> #include <asm/arch-tegra/board.h> #include <asm/arch-tegra/clk_rst.h>
@@ -25,17 +19,17 @@#include <asm/arch-tegra/uart.h> #include <asm/arch-tegra/warmboot.h> #include <asm/arch-tegra/gpu.h> +#include <asm/arch-tegra/usb.h> +#include <asm/arch-tegra/xusb-padctl.h> +#include <asm/arch/clock.h> +#include <asm/arch/funcmux.h> +#include <asm/arch/pinmux.h> +#include <asm/arch/pmu.h> +#include <asm/arch/tegra.h> #ifdef CONFIG_TEGRA_CLOCK_SCALING #include <asm/arch/emc.h> #endif -#include <asm/arch-tegra/usb.h> -#ifdef CONFIG_USB_EHCI_TEGRA -#include <usb.h> -#endif -#include <asm/arch-tegra/xusb-padctl.h> #include <power/as3722.h> -#include <i2c.h> -#include <spi.h> #include "emc.h" DECLARE_GLOBAL_DATA_PTR ;
arch/arm/mach-tegra/clock.c +2 -2
@@ -7,6 +7,8 @@/* Tegra SoC common clock control functions */ #include <common.h> +#include <div64.h> +#include <dm.h> #include <errno.h> #include <asm/io.h> #include <asm/arch/clock.h>
@@ -15,8 +17,6 @@#include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/timer.h> -#include <div64.h> -#include <fdtdec.h> /* * This is our record of the current clock rate of each clock. We don't
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 9/31 tegra: spl: Enable debug UART
In reply to Simon GlassEnable the debug UART in SPL to allow early serial output even if the standard UART does not work (e.g. due to driver model problem).
---
Changes in v2: None
arch/arm/mach-tegra/spl.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/mach-tegra/spl.c +4 -0
@@ -7,6 +7,7 @@* SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> +#include <debug_uart.h> #include <spl.h> #include <asm/io.h>
@@ -32,6 +33,9 @@ void spl_board_init(void)gpio_early_init_uart ();clock_early_init (); +#ifdef CONFIG_DEBUG_UART +debug_uart_init (); +#endif preloader_console_init (); }
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 10/31 tegra: nyan: Add a PMC syscon driver
In reply to Simon GlassThe PMC can be modelled as a syscon peripheral. Add a driver for this so that it can be accessed by drivers when needed.
---
Changes in v2: None
arch/arm/include/asm/arch-tegra/tegra.h | 5 +++++ arch/arm/mach-tegra/tegra124/Makefile | 1 + arch/arm/mach-tegra/tegra124/pmc.c | 19 +++++++++++++++++++ configs/nyan-big_defconfig | 2 ++ 4 files changed, 27 insertions(+) create mode 100644 arch/arm/mach-tegra/tegra124/pmc.c
arch/arm/include/asm/arch-tegra/tegra.h +5 -0
@@ -97,6 +97,11 @@ enum { TEGRA_SOC_UNKNOWN = -1, }; +/* Tegra system controller (SYSCON) devices */ +enum { +TEGRA_SYSCON_PMC , +}; +#else /* __ASSEMBLY__ */ #define PRM_RSTCTRL NV_PA_PMC_BASE#endif
arch/arm/mach-tegra/tegra124/Makefile +1 -0
@@ -10,6 +10,7 @@ obj-$(CONFIG_SPL_BUILD) += cpu.o obj-y += clock.o obj-y += funcmux.o obj-y += pinmux.o +obj-y += pmc.o obj-y += xusb-padctl.o obj-y += ../xusb-padctl-common.o
arch/arm/mach-tegra/tegra124/pmc.c new file +19 -0
@@ -0,0 +1,19 @@ +/* +* Copyright (C) 2017 Google, Inc +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <dm.h> +#include <syscon.h> + +static const struct udevice_id tegra124_syscon_ids[] = { + { .compatible ="nvidia,tegra124-pmc" , .data =TEGRA_SYSCON_PMC }, +}; + +U_BOOT_DRIVER (syscon_tegra124) = { + .name ="tegra124_syscon" , + .id =UCLASS_SYSCON , + .of_match = tegra124_syscon_ids, +};
configs/nyan-big_defconfig +2 -0
@@ -37,6 +37,8 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_DM=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 11/31 dm: tegra: Convert USB setup to livetree
In reply to Simon GlassAdjust this code to support a live device tree. This should be implemented as a PHY driver but that is left as an exercise for the maintainer.
---
Changes in v2: None
arch/arm/include/asm/arch-tegra/xusb-padctl.h | 2 +- arch/arm/mach-tegra/board2.c | 2 +- arch/arm/mach-tegra/tegra124/xusb-padctl.c | 36 +++++++++--- arch/arm/mach-tegra/tegra210/xusb-padctl.c | 40 +++++++++---- arch/arm/mach-tegra/xusb-padctl-common.c | 84 ++++++++++++++------------- arch/arm/mach-tegra/xusb-padctl-common.h | 11 ++-- arch/arm/mach-tegra/xusb-padctl-dummy.c | 2 +- 7 files changed, 112 insertions(+), 65 deletions(-)
arch/arm/include/asm/arch-tegra/xusb-padctl.h +1 -1
@@ -15,7 +15,7 @@ struct tegra_xusb_phy;*/ struct tegra_xusb_phy *tegra_xusb_phy_get (unsigned int type); -void tegra_xusb_padctl_init (const void *fdt); +void tegra_xusb_padctl_init (void );int tegra_xusb_phy_prepare (struct tegra_xusb_phy *phy);int tegra_xusb_phy_enable (struct tegra_xusb_phy *phy);int tegra_xusb_phy_disable (struct tegra_xusb_phy *phy);
arch/arm/mach-tegra/board2.c +1 -1
@@ -164,7 +164,7 @@ int board_init(void)pin_mux_nand ();#endif -tegra_xusb_padctl_init (gd->fdt_blob); +tegra_xusb_padctl_init ();#ifdef CONFIG_TEGRA_LP0 /* save Sdram params to PMC 2, 4, and 24 for WB0 */
arch/arm/mach-tegra/tegra124/xusb-padctl.c +29 -7
@@ -8,6 +8,8 @@#include <common.h> #include <errno.h> +#include <dm/of_access.h> +#include <dm/ofnode.h> #include "../xusb-padctl-common.h"
@@ -317,13 +319,33 @@ static const struct tegra_xusb_padctl_soc tegra124_socdata = { .num_phys = ARRAY_SIZE(tegra124_phys), }; -void tegra_xusb_padctl_init (const void *fdt) +void tegra_xusb_padctl_init (void ) { -int count, nodes[1 ]; +ofnode nodes[1 ]; +int count =0 ; +int ret; + +debug ("%s: start\n" , __func__); +if (of_live_active ()) { +struct device_node *np =of_find_compatible_node (NULL ,NULL , +"nvidia,tegra124-xusb-padctl" ); + +debug ("np=%p\n" , np); +if (np) { + nodes[0 ] =np_to_ofnode (np); + count =1 ; + } + }else { +int node_offsets[1 ]; +int i; + + count =fdtdec_find_aliases_for_id (gd->fdt_blob,"padctl" , +COMPAT_NVIDIA_TEGRA124_XUSB_PADCTL , + node_offsets,ARRAY_SIZE (node_offsets)); +for (i =0 ; i < count; i++) + nodes[i] =offset_to_ofnode (node_offsets[i]); + } - count =fdtdec_find_aliases_for_id (fdt,"padctl" , -COMPAT_NVIDIA_TEGRA124_XUSB_PADCTL , - nodes,ARRAY_SIZE (nodes)); -if (tegra_xusb_process_nodes (fdt, nodes, count, &tegra124_socdata)) -return ; + ret =tegra_xusb_process_nodes (nodes, count, &tegra124_socdata); +debug ("%s: done, ret=%d\n" , __func__, ret); }
arch/arm/mach-tegra/tegra210/xusb-padctl.c +29 -11
@@ -8,6 +8,8 @@#include <common.h> #include <errno.h> +#include <dm/of_access.h> +#include <dm/ofnode.h> #include "../xusb-padctl-common.h"
@@ -421,17 +423,33 @@ static const struct tegra_xusb_padctl_soc tegra210_socdata = { .num_phys = ARRAY_SIZE(tegra210_phys), }; -void tegra_xusb_padctl_init (const void *fdt) +void tegra_xusb_padctl_init (void ) { -int count, nodes[1 ]; - -debug ("> %s(fdt=%p)\n" , __func__, fdt); - - count =fdtdec_find_aliases_for_id (fdt,"padctl" , -COMPAT_NVIDIA_TEGRA210_XUSB_PADCTL , - nodes,ARRAY_SIZE (nodes)); -if (tegra_xusb_process_nodes (fdt, nodes, count, &tegra210_socdata)) -return ; +ofnode nodes[1 ]; +int count =0 ; +int ret; + +debug ("%s: start\n" , __func__); +if (of_live_active ()) { +struct device_node *np =of_find_compatible_node (NULL ,NULL , +"nvidia,tegra210-xusb-padctl" ); + +debug ("np=%p\n" , np); +if (np) { + nodes[0 ] =np_to_ofnode (np); + count =1 ; + } + }else { +int node_offsets[1 ]; +int i; + + count =fdtdec_find_aliases_for_id (gd->fdt_blob,"padctl" , +COMPAT_NVIDIA_TEGRA210_XUSB_PADCTL , + node_offsets,ARRAY_SIZE (node_offsets)); +for (i =0 ; i < count; i++) + nodes[i] =offset_to_ofnode (node_offsets[i]); + } -debug ("< %s()\n" , __func__); + ret =tegra_xusb_process_nodes (nodes, count, &tegra210_socdata); +debug ("%s: done, ret=%d\n" , __func__, ret); }
arch/arm/mach-tegra/xusb-padctl-common.c +45 -39
155 lines not on this page · raw message
arch/arm/mach-tegra/xusb-padctl-common.h +6 -5
@@ -9,6 +9,7 @@#include <common.h> #include <fdtdec.h> +#include <dm/ofnode.h> #include <asm/io.h> #include <asm/arch-tegra/xusb-padctl.h>
@@ -77,7 +78,7 @@ struct tegra_xusb_padctl_config {struct tegra_xusb_padctl {const struct tegra_xusb_padctl_soc *socdata;struct tegra_xusb_padctl_config config; -struct fdt_resource regs; +ulong regs;unsigned int enable; };
@@ -86,16 +87,16 @@ extern struct tegra_xusb_padctl padctl;static inline u32 padctl_readl (struct tegra_xusb_padctl *padctl,unsigned long offset) { -return readl (padctl->regs.start + offset); +return readl (padctl->regs + offset); }static inline void padctl_writel (struct tegra_xusb_padctl *padctl,u32 value,unsigned long offset) { -writel (value, padctl->regs.start + offset); +writel (value, padctl->regs + offset); } -int tegra_xusb_process_nodes (const void *fdt,int nodes[],unsigned int count, -const struct tegra_xusb_padctl_soc *socdata); +int tegra_xusb_process_nodes (ofnode nodes[],unsigned int count, +const struct tegra_xusb_padctl_soc *socdata);#endif
arch/arm/mach-tegra/xusb-padctl-dummy.c +1 -1
@@ -34,6 +34,6 @@ int __weak tegra_xusb_phy_unprepare(struct tegra_xusb_phy *phy)return -ENOSYS ; } -void __weak tegra_xusb_padctl_init (const void *fdt) +void __weak tegra_xusb_padctl_init (void ) { }
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 12/31 dm: tegra: Convert clock_decode_periph_id() to support livetree
In reply to Simon GlassAdjust this to take a device as a parameter instead of a node.
---
Changes in v2: None
arch/arm/include/asm/arch-tegra/clock.h | 2 +- arch/arm/mach-tegra/clock.c | 5 ++--- drivers/spi/tegra114_spi.c | 2 +- drivers/spi/tegra20_sflash.c | 2 +- drivers/spi/tegra20_slink.c | 2 +- drivers/spi/tegra210_qspi.c | 2 +- drivers/usb/host/ehci-tegra.c | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-)
arch/arm/include/asm/arch-tegra/clock.h +1 -1
@@ -266,7 +266,7 @@ void clock_ll_start_uart(enum periph_id periph_id);* @param node Node to look at * @return peripheral ID, or PERIPH_ID_NONE if none */ -enum periph_id clock_decode_periph_id (const void *blob,int node); +int clock_decode_periph_id (struct udevice *dev);/** * Checks if the oscillator bypass is enabled (XOBP bit)
arch/arm/mach-tegra/clock.c +2 -3
@@ -652,14 +652,13 @@ void clock_ll_start_uart(enum periph_id periph_id) }#if CONFIG_IS_ENABLED (OF_CONTROL ) -int clock_decode_periph_id (const void *blob,int node) +int clock_decode_periph_id (struct udevice *dev) {enum periph_id id;u32 cell[2 ];int err; - err =fdtdec_get_int_array (blob, node,"clocks" , cell, -ARRAY_SIZE (cell)); + err =dev_read_u32_array (dev,"clocks" , cell,ARRAY_SIZE (cell));if (err)return -1 ; id =clk_id_to_periph_id (cell[1 ]);
drivers/spi/tegra114_spi.c +1 -1
@@ -104,7 +104,7 @@ static int tegra114_spi_ofdata_to_platdata(struct udevice *bus)int node =dev_of_offset (bus); plat->base =devfdt_get_addr (bus); - plat->periph_id =clock_decode_periph_id (blob, node); + plat->periph_id =clock_decode_periph_id (bus);if (plat->periph_id ==PERIPH_ID_NONE ) { debug("%s: could not decode periph id %d\n", __func__,
drivers/spi/tegra20_sflash.c +1 -1
@@ -91,7 +91,7 @@ static int tegra20_sflash_ofdata_to_platdata(struct udevice *bus)int node =dev_of_offset (bus); plat->base =devfdt_get_addr (bus); - plat->periph_id =clock_decode_periph_id (blob, node); + plat->periph_id =clock_decode_periph_id (bus);if (plat->periph_id ==PERIPH_ID_NONE ) { debug("%s: could not decode periph id %d\n", __func__,
drivers/spi/tegra20_slink.c +1 -1
@@ -97,7 +97,7 @@ static int tegra30_spi_ofdata_to_platdata(struct udevice *bus)int node =dev_of_offset (bus); plat->base =devfdt_get_addr (bus); - plat->periph_id =clock_decode_periph_id (blob, node); + plat->periph_id =clock_decode_periph_id (bus);if (plat->periph_id ==PERIPH_ID_NONE ) { debug("%s: could not decode periph id %d\n", __func__,
drivers/spi/tegra210_qspi.c +1 -1
@@ -100,7 +100,7 @@ static int tegra210_qspi_ofdata_to_platdata(struct udevice *bus)int node =dev_of_offset (bus); plat->base =devfdt_get_addr (bus); - plat->periph_id =clock_decode_periph_id (blob, node); + plat->periph_id =clock_decode_periph_id (bus);if (plat->periph_id ==PERIPH_ID_NONE ) { debug("%s: could not decode periph id %d\n", __func__,
drivers/usb/host/ehci-tegra.c +1 -1
@@ -723,7 +723,7 @@ static int fdt_decode_usb(struct udevice *dev, struct fdt_usb *config) config->enabled =fdtdec_get_is_enabled (blob, node); config->has_legacy_mode =fdtdec_get_bool (blob, node,"nvidia,has-legacy-mode" ); - config->periph_id =clock_decode_periph_id (blob, node); + config->periph_id =clock_decode_periph_id (dev);if (config->periph_id ==PERIPH_ID_NONE ) {debug ("%s: Missing/invalid peripheral ID\n" , __func__);return -EINVAL ;
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 13/31 dm: video: tegra124: Convert to livetree
In reply to Simon GlassUpdate these drives to support a live device tree.
---
Changes in v2: None
drivers/video/tegra124/display.c | 8 +++----- drivers/video/tegra124/dp.c | 3 +-- drivers/video/tegra124/sor.c | 25 +++++++------------------ 3 files changed, 11 insertions(+), 25 deletions(-)
drivers/video/tegra124/display.c +3 -5
@@ -12,7 +12,6 @@#include <errno.h> #include <display.h> #include <edid.h> -#include <fdtdec.h> #include <lcd.h> #include <video.h> #include <asm/gpio.h>
@@ -334,7 +333,6 @@ static int display_init(struct udevice *dev, void *lcdbase, {struct display_plat *disp_uc_plat;struct dc_ctlr *dc_ctlr; -const void *blob = gd->fdt_blob;struct udevice *dp_dev;const int href_to_sync =1 , vref_to_sync =1 ;int panel_bpp =18 ;/* default 18 bits per pixel */
@@ -363,9 +361,8 @@ static int display_init(struct udevice *dev, void *lcdbase,return ret; } - dc_ctlr = (struct dc_ctlr *)fdtdec_get_addr (blob,dev_of_offset (dev), -"reg" ); -if (fdtdec_decode_display_timing (blob,dev_of_offset (dev),0 , timing)) { + dc_ctlr = (struct dc_ctlr *)dev_read_addr (dev); +if (ofnode_decode_display_timing (dev_ofnode (dev),0 , timing)) {debug ("%s: Failed to decode display timing\n" , __func__);return -EINVAL ; }
@@ -416,6 +413,7 @@ static int display_init(struct udevice *dev, void *lcdbase,debug ("dc: failed to update window\n" );return ret; } +debug ("%s: ready\n" , __func__);return 0 ; }
drivers/video/tegra124/dp.c +1 -2
@@ -10,7 +10,6 @@#include <dm.h> #include <div64.h> #include <errno.h> -#include <fdtdec.h> #include <video_bridge.h> #include <asm/io.h> #include <asm/arch-tegra/dc.h>
@@ -1572,7 +1571,7 @@ static int tegra_dp_ofdata_to_platdata(struct udevice *dev) {struct tegra_dp_plat *plat =dev_get_platdata (dev); - plat->base =devfdt_get_addr (dev); + plat->base =dev_read_addr (dev);return 0 ; }
drivers/video/tegra124/sor.c +7 -18
@@ -7,9 +7,9 @@#include <common.h> #include <dm.h> #include <errno.h> -#include <fdtdec.h> #include <malloc.h> #include <panel.h> +#include <syscon.h> #include <video_bridge.h> #include <asm/io.h> #include <asm/arch/clock.h>
@@ -750,15 +750,12 @@ int tegra_dc_sor_attach(struct udevice *dc_dev, struct udevice *dev, const struct display_timing *timing) {struct tegra_dc_sor_data *sor =dev_get_priv (dev); -const void *blob = gd->fdt_blob;struct dc_ctlr *disp_ctrl;u32 reg_val; -int node;/* Use the first display controller */ debug ("%s\n" , __func__); - node =dev_of_offset (dc_dev); - disp_ctrl = (struct dc_ctlr *)fdtdec_get_addr (blob, node,"reg" ); + disp_ctrl = (struct dc_ctlr *)dev_read_addr (dc_dev);tegra_dc_sor_enable_dc (disp_ctrl);tegra_dc_sor_config_panel (sor,0 , link_cfg, timing);
@@ -965,16 +962,13 @@ int tegra_dc_sor_detach(struct udevice *dc_dev, struct udevice *dev) {struct tegra_dc_sor_data *sor =dev_get_priv (dev);int dc_reg_ctx[DC_REG_SAVE_SPACE ]; -const void *blob = gd->fdt_blob;struct dc_ctlr *disp_ctrl;unsigned long dc_int_mask; -int node;int ret;debug ("%s\n" , __func__);/* Use the first display controller */ - node =dev_of_offset (dc_dev); - disp_ctrl = (struct dc_ctlr *)fdtdec_get_addr (blob, node,"reg" ); + disp_ctrl = (struct dc_ctlr *)dev_read_addr (dev);/* Sleep mode */ tegra_sor_writel(sor, SUPER_STATE1, SUPER_STATE1_ASY_HEAD_OP_SLEEP |
@@ -1041,18 +1035,13 @@ static int tegra_sor_set_backlight(struct udevice *dev, int percent)static int tegra_sor_ofdata_to_platdata (struct udevice *dev) {struct tegra_dc_sor_data *priv =dev_get_priv (dev); -const void *blob = gd->fdt_blob; -int node;int ret; - priv->base = (void *)fdtdec_get_addr (blob,dev_of_offset (dev),"reg" ); + priv->base = (void *)dev_read_addr (dev); - node =fdtdec_next_compatible (blob,0 ,COMPAT_NVIDIA_TEGRA124_PMC ); -if (node <0 ) { -debug ("%s: Cannot find PMC\n" , __func__); -return -ENOENT ; - } - priv->pmc_base = (void *)fdtdec_get_addr (blob, node,"reg" ); + priv->pmc_base = (void *)syscon_get_first_range (TEGRA_SYSCON_PMC ); +if (IS_ERR (priv->pmc_base)) +return PTR_ERR (priv->pmc_base); ret =uclass_get_device_by_phandle (UCLASS_PANEL , dev,"nvidia,panel" , &priv->panel);
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 14/31 tegra: Don't set up the UART clocks again in U-Boot
In reply to Simon GlassThis UART clocks are already set up in SPL so we don't need to do it again in U-Boot. This seems to cause a hang on Nyan.
---
Changes in v2: None
arch/arm/mach-tegra/board.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-tegra/board.c +2 -0
@@ -187,7 +187,9 @@ static void setup_uarts(int uart_ids)enum periph_id id = id_for_uart[i];funcmux_select (id, uart_configs[i]); +#ifdef CONFIG_SPL_BUILD clock_ll_start_uart (id); +#endif } } }
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 15/31 tegra: dts: Move stdout-path to /chosen
In reply to Simon GlassThis property should be in the /chosen node, not /aliases.
---
Changes in v2: None
arch/arm/dts/tegra124-nyan-big.dts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm/dts/tegra124-nyan-big.dts +4 -1
@@ -8,7 +8,6 @@ aliases { console = &uarta; - stdout-path = &uarta; i2c0 = "/i2c at 7000d000"; i2c1 = "/i2c at 7000c000"; i2c2 = "/i2c at 7000c400";
@@ -26,6 +25,10 @@ usb2 = "/usb at 7d004000"; }; + chosen { + stdout-path = &uarta; + }; + host1x at 50000000 { dc at 54200000 { display-timings {
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 16/31 dm: tegra: gpio: Convert to support livetree
In reply to Simon GlassUpdate the GPIO driver to support a live device tree.
---
Changes in v2: None
drivers/gpio/tegra_gpio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpio/tegra_gpio.c +6 -4
@@ -337,11 +337,13 @@ static int gpio_tegra_bind(struct udevice *parent)* This driver does not make use of interrupts, other than to figure * out the number of GPIO banks */ -if (!fdt_getprop (gd->fdt_blob,dev_of_offset (parent),"interrupts" , - &len)) -return -EINVAL ; + len =dev_read_size (parent,"interrupts" ); +if (len <0 ) +return len; bank_count = len /3 /sizeof (u32); - ctlr = (struct gpio_ctlr *)devfdt_get_addr(parent); + ctlr = (struct gpio_ctlr *)dev_read_addr (parent); +if ((ulong )ctlr ==FDT_ADDR_T_NONE ) + return -EINVAL; }#endif for (bank =0 ; bank < bank_count; bank++) {
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 17/31 dm: tegra: usb: Convert to livetree
In reply to Simon GlassUpdate the Tegra EHCI driver to support a live device tree.
---
Changes in v2: None
drivers/usb/host/ehci-tegra.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-)
drivers/usb/host/ehci-tegra.c +14 -20
@@ -17,7 +17,6 @@#include <usb.h> #include <usb/ulpi.h> #include <libfdt.h> -#include <fdtdec.h> #include "ehci.h"
@@ -695,12 +694,11 @@ static void config_clock(const u32 timing[])static int fdt_decode_usb (struct udevice *dev,struct fdt_usb *config) { -const void *blob = gd->fdt_blob; -int node =dev_of_offset (dev);const char *phy, *mode; - config->reg = (struct usb_ctlr *)devfdt_get_addr (dev); - mode =fdt_getprop (blob, node,"dr_mode" ,NULL ); + config->reg = (struct usb_ctlr *)dev_read_addr (dev); +debug ("reg=%p\n" , config->reg); + mode =dev_read_string (dev,"dr_mode" );if (mode) {if (0 ==strcmp (mode,"host" )) config->dr_mode =DR_MODE_HOST ;
@@ -717,28 +715,24 @@ static int fdt_decode_usb(struct udevice *dev, struct fdt_usb *config) config->dr_mode =DR_MODE_HOST ; } - phy =fdt_getprop (blob, node,"phy_type" ,NULL ); + phy =dev_read_string (dev,"phy_type" ); config->utmi = phy &&0 ==strcmp ("utmi" , phy); config->ulpi = phy &&0 ==strcmp ("ulpi" , phy); - config->enabled =fdtdec_get_is_enabled (blob, node); - config->has_legacy_mode =fdtdec_get_bool (blob, node, -"nvidia,has-legacy-mode" ); + config->has_legacy_mode =dev_read_bool (dev,"nvidia,has-legacy-mode" ); config->periph_id =clock_decode_periph_id (dev);if (config->periph_id ==PERIPH_ID_NONE ) {debug ("%s: Missing/invalid peripheral ID\n" , __func__);return -EINVAL ; } -gpio_request_by_name_nodev (offset_to_ofnode (node),"nvidia,vbus-gpio" , -0 , &config->vbus_gpio,GPIOD_IS_OUT ); -gpio_request_by_name_nodev (offset_to_ofnode (node), -"nvidia,phy-reset-gpio" ,0 , - &config->phy_reset_gpio,GPIOD_IS_OUT ); -debug ("enabled=%d, legacy_mode=%d, utmi=%d, ulpi=%d, periph_id=%d, " -"vbus=%d, phy_reset=%d, dr_mode=%d\n" , - config->enabled, config->has_legacy_mode, config->utmi, - config->ulpi, config->periph_id, -gpio_get_number (&config->vbus_gpio), -gpio_get_number (&config->phy_reset_gpio), config->dr_mode); +gpio_request_by_name (dev,"nvidia,vbus-gpio" ,0 , &config->vbus_gpio, +GPIOD_IS_OUT ); +gpio_request_by_name (dev,"nvidia,phy-reset-gpio" ,0 , + &config->phy_reset_gpio,GPIOD_IS_OUT ); +debug ("legacy_mode=%d, utmi=%d, ulpi=%d, periph_id=%d, vbus=%d, phy_reset=%d, dr_mode=%d, reg=%p\n" , + config->has_legacy_mode, config->utmi, config->ulpi, + config->periph_id,gpio_get_number (&config->vbus_gpio), +gpio_get_number (&config->phy_reset_gpio), config->dr_mode, + config->reg);return 0 ; }
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 18/31 dm: tegra: spi: Convert to livetree
In reply to Simon GlassUpdate the tegra114 spi driver to support a live device tree.
---
Changes in v2: None
drivers/spi/tegra114_spi.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/spi/tegra114_spi.c +5 -8
@@ -12,7 +12,6 @@#include <asm/arch/clock.h> #include <asm/arch-tegra/clk_rst.h> #include <spi.h> -#include <fdtdec.h> #include "tegra_spi.h" DECLARE_GLOBAL_DATA_PTR ;
@@ -100,10 +99,8 @@ struct tegra114_spi_priv {static int tegra114_spi_ofdata_to_platdata (struct udevice *bus) {struct tegra_spi_platdata *plat = bus->platdata; -const void *blob = gd->fdt_blob; -int node =dev_of_offset (bus); - plat->base =devfdt_get_addr (bus); + plat->base =dev_read_addr (bus); plat->periph_id =clock_decode_periph_id (bus);if (plat->periph_id ==PERIPH_ID_NONE ) {
@@ -113,10 +110,10 @@ static int tegra114_spi_ofdata_to_platdata(struct udevice *bus) }/* Use 500KHz as a suitable default */ - plat->frequency =fdtdec_get_int (blob, node,"spi-max-frequency" , -500000 ); - plat->deactivate_delay_us =fdtdec_get_int (blob, node, -"spi-deactivate-delay" ,0 ); + plat->frequency =dev_read_u32_default (bus,"spi-max-frequency" , +500000 ); + plat->deactivate_delay_us =dev_read_u32_default (bus, +"spi-deactivate-delay" ,0 );debug ("%s: base=%#08lx, periph_id=%d, max-frequency=%d, deactivate_delay=%d\n" , __func__, plat->base, plat->periph_id, plat->frequency, plat->deactivate_delay_us);
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 19/31 dm: tegra: i2c: Convert to livetree
In reply to Simon GlassUpdate the tegra i2c driver to support a live device tree.
---
Changes in v2: None
drivers/i2c/tegra_i2c.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/i2c/tegra_i2c.c +5 -1
@@ -365,7 +365,11 @@ static int tegra_i2c_probe(struct udevice *dev) i2c_bus->id = dev->seq; i2c_bus->type =dev_get_driver_data (dev); - i2c_bus->regs = (struct i2c_ctlr *)devfdt_get_addr (dev); + i2c_bus->regs = (struct i2c_ctlr *)dev_read_addr (dev); +if ((ulong )i2c_bus->regs ==FDT_ADDR_T_NONE ) { +debug ("%s: Cannot get regs address\n" , __func__); +return -EINVAL ; + } ret =reset_get_by_name (dev,"i2c" , &i2c_bus->reset_ctl);if (ret) {
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 20/31 dm: tegra: pwm: Convert to livetree
In reply to Simon GlassUpdate the tegra pwm driver to support a live device tree.
---
Changes in v2: None
drivers/pwm/tegra_pwm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pwm/tegra_pwm.c +1 -1
@@ -59,7 +59,7 @@ static int tegra_pwm_ofdata_to_platdata(struct udevice *dev) {struct tegra_pwm_priv *priv =dev_get_priv (dev); - priv->regs = (struct pwm_ctlr *)devfdt_get_addr (dev); + priv->regs = (struct pwm_ctlr *)dev_read_addr (dev);return 0 ; }
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 21/31 dm: tegra: mmc: Convert to livetree
In reply to Simon GlassUpdate the tegra mmc driver to support a live device tree.
---
Changes in v2: None
drivers/mmc/tegra_mmc.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
drivers/mmc/tegra_mmc.c +7 -10
@@ -11,10 +11,10 @@#include <common.h> #include <dm.h> #include <errno.h> +#include <mmc.h> #include <asm/gpio.h> #include <asm/io.h> #include <asm/arch-tegra/tegra_mmc.h> -#include <mmc.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -599,8 +599,7 @@ static int tegra_mmc_probe(struct udevice *dev) cfg->name = dev->name; - bus_width =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev), -"bus-width" ,1 ); + bus_width =dev_read_u32_default (dev,"bus-width" ,1 ); cfg->voltages =MMC_VDD_32_33 |MMC_VDD_33_34 |MMC_VDD_165_195 ; cfg->host_caps =0 ;
@@ -621,7 +620,7 @@ static int tegra_mmc_probe(struct udevice *dev) cfg->b_max =CONFIG_SYS_MMC_MAX_BLK_COUNT ; - priv->reg = (void *)devfdt_get_addr (dev); + priv->reg = (void *)dev_read_addr (dev); ret =reset_get_by_name (dev,"sdhci" , &priv->reset_ctl);if (ret) {
@@ -648,12 +647,10 @@ static int tegra_mmc_probe(struct udevice *dev)return ret;/* These GPIOs are optional */ -gpio_request_by_name (dev,"cd-gpios" ,0 , &priv->cd_gpio, -GPIOD_IS_IN ); -gpio_request_by_name (dev,"wp-gpios" ,0 , &priv->wp_gpio, -GPIOD_IS_IN ); -gpio_request_by_name (dev,"power-gpios" ,0 , - &priv->pwr_gpio,GPIOD_IS_OUT ); +gpio_request_by_name (dev,"cd-gpios" ,0 , &priv->cd_gpio,GPIOD_IS_IN ); +gpio_request_by_name (dev,"wp-gpios" ,0 , &priv->wp_gpio,GPIOD_IS_IN ); +gpio_request_by_name (dev,"power-gpios" ,0 , &priv->pwr_gpio, +GPIOD_IS_OUT );if (dm_gpio_is_valid (&priv->pwr_gpio))dm_gpio_set_value (&priv->pwr_gpio,1 );
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 22/31 power: Add a regulator driver for the as3722 PMIC
In reply to Simon GlassThis pmic includes regulators which should have their own driver. Add a driver to support these.
---
Changes in v2: None
drivers/power/regulator/Kconfig | 9 ++ drivers/power/regulator/Makefile | 1 + drivers/power/regulator/as3722_regulator.c | 149 +++++++++++++++++++++++++++++ include/power/as3722.h | 8 ++ 4 files changed, 167 insertions(+) create mode 100644 drivers/power/regulator/as3722_regulator.c
drivers/power/regulator/Kconfig +9 -0
@@ -34,6 +34,15 @@ config REGULATOR_ACT8846 by the PMIC device. This driver is controlled by a device tree node which includes voltage limits. +config REGULATOR_AS3722 + bool "Enable driver for AS7322 regulator" + depends on DM_REGULATOR && PMIC_AS3722 + help + Enable support for the regulator functions of the AS3722. The + driver implements enable/disable for step-down bucks and LDOs, + but does not yet support change voltages. Currently this must be + done using direct register writes to the PMIC. + config DM_REGULATOR_PFUZE100 bool "Enable Driver Model for REGULATOR PFUZE100" depends on DM_REGULATOR && DM_PMIC_PFUZE100
drivers/power/regulator/Makefile +1 -0
@@ -7,6 +7,7 @@ obj-$(CONFIG_$(SPL_)DM_REGULATOR) += regulator-uclass.o obj-$(CONFIG_REGULATOR_ACT8846) += act8846.o +obj-$(CONFIG_REGULATOR_AS3722) += as3722_regulator.o obj-$(CONFIG_DM_REGULATOR_MAX77686) += max77686.o obj-$(CONFIG_DM_REGULATOR_PFUZE100) += pfuze100.o obj-$(CONFIG_REGULATOR_PWM) += pwm_regulator.o
drivers/power/regulator/as3722_regulator.c new file +149 -0
149 lines not on this page · raw message
include/power/as3722.h +8 -0
@@ -12,6 +12,14 @@#define AS3722_GPIO_OUTPUT_VDDH (1 << 0)#define AS3722_GPIO_INVERT (1 << 1) +#define AS3722_DEVICE_ID 0x0c +#define AS3722_SD_VOLTAGE (n) (0x00 + (n)) +#define AS3722_LDO_VOLTAGE (n) (0x10 + (n)) +#define AS3722_SD_CONTROL 0x4d +#define AS3722_LDO_CONTROL 0x4e +#define AS3722_ASIC_ID1 0x90 +#define AS3722_ASIC_ID2 0x91 +struct udevice ;int as3722_init (struct udevice **devp);
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 23/31 power: Add a GPIO driver for the as3722 PMIC
In reply to Simon GlassThis pmic includes GPIOs which should have their own driver. Add a driver to support these.
---
Changes in v2: None
drivers/power/pmic/as3722_gpio.c | 120 +++++++++++++++++++++++++++++++++++++++ include/power/as3722.h | 5 ++ 2 files changed, 125 insertions(+) create mode 100644 drivers/power/pmic/as3722_gpio.c
drivers/power/pmic/as3722_gpio.c new file +120 -0
@@ -0,0 +1,120 @@ +/* +* Copyright (C) 2014 NVIDIA Corporation +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <dm.h> +#include <asm/gpio.h> +#include <power/as3722.h> +#include <power/pmic.h> + +#define NUM_GPIOS 8 + +int as3722_gpio_configure (struct udevice *pmic,unsigned int gpio, +unsigned long flags) +{ +u8 value =0 ; +int err; + +if (flags &AS3722_GPIO_OUTPUT_VDDH ) + value |=AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDH ; + +if (flags &AS3722_GPIO_INVERT ) + value |=AS3722_GPIO_CONTROL_INVERT ; + + err =pmic_reg_write (pmic,AS3722_GPIO_CONTROL (gpio), value); +if (err) { +error ("failed to configure GPIO#%u: %d" , gpio, err); +return err; + } + +return 0 ; +} + +static int as3722_gpio_set_value (struct udevice *dev,unsigned int gpio, +int level) +{ +struct udevice *pmic =dev_get_parent (dev); +const char *l; +u8 value; +int err; + +if (gpio >=NUM_GPIOS ) +return -EINVAL ; + + err =pmic_reg_read (pmic,AS3722_GPIO_SIGNAL_OUT ); +if (err <0 ) { +error ("failed to read GPIO signal out register: %d" , err); +return err; + } + value = err; + +if (level ==0 ) { + value &= ~(1 << gpio); + l ="low" ; + }else { + value |=1 << gpio; + l ="high" ; + } + + err =pmic_reg_write (pmic,AS3722_GPIO_SIGNAL_OUT , value); +if (err) { +error ("failed to set GPIO#%u %s: %d" , gpio, l, err); +return err; + } + +return 0 ; +} + +int as3722_gpio_direction_output (struct udevice *dev,unsigned int gpio, +int value) +{ +struct udevice *pmic =dev_get_parent (dev); +int err; + +if (gpio >7 ) +return -EINVAL ; + +if (value ==0 ) + value =AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDL ; +else + value =AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDH ; + + err =pmic_reg_write (pmic,AS3722_GPIO_CONTROL (gpio), value); +if (err) { +error ("failed to configure GPIO#%u as output: %d" , gpio, err); +return err; + } + + err =as3722_gpio_set_value (pmic, gpio, value); +if (err <0 ) { +error ("failed to set GPIO#%u high: %d" , gpio, err); +return err; + } + +return 0 ; +} + +static int as3722_gpio_probe (struct udevice *dev) +{ +struct gpio_dev_priv *uc_priv =dev_get_uclass_priv (dev); + + uc_priv->gpio_count =NUM_GPIOS ; + uc_priv->bank_name ="as3722_" ; + +return 0 ; +} + +static const struct dm_gpio_ops gpio_as3722_ops = { + .direction_output = as3722_gpio_direction_output, + .set_value = as3722_gpio_set_value, +}; + +U_BOOT_DRIVER (gpio_as3722) = { + .name ="gpio_as3722" , + .id =UCLASS_GPIO , + .ops = &gpio_as3722_ops, + .probe = as3722_gpio_probe, +};
include/power/as3722.h +5 -0
@@ -20,6 +20,11 @@#define AS3722_ASIC_ID1 0x90#define AS3722_ASIC_ID2 0x91 +#define AS3722_GPIO_CONTROL (n) (0x08 + (n)) +#define AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDH (1 << 0) +#define AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDL (7 << 0) +#define AS3722_GPIO_CONTROL_INVERT (1 << 7) +struct udevice ;int as3722_init (struct udevice **devp);
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 24/31 dm: power: Convert as3722 to driver model
In reply to Simon GlassConvert this PMIC driver to driver model and fix up other users. The regulator and GPIO functions are now handled by separate drivers.
Update nyan-big to work correct. Three boards will need to be updated by the maintainers: apalis-tk1, jetson-tk1, cei-tk1-som
---
Changes in v2: None
arch/arm/mach-tegra/board2.c | 6 - board/cei/cei-tk1-som/cei-tk1-som.c | 2 + board/nvidia/jetson-tk1/jetson-tk1.c | 2 + board/nvidia/nyan-big/nyan-big.c | 22 +-- board/toradex/apalis-tk1/apalis-tk1.c | 6 + configs/apalis-tk1_defconfig | 3 + configs/cei-tk1-som_defconfig | 3 + configs/jetson-tk1_defconfig | 3 + configs/nyan-big_defconfig | 1 + drivers/power/pmic/Makefile | 2 +- drivers/power/pmic/as3722.c | 292 ++++++++++++---------------------- include/power/as3722.h | 18 +-- 12 files changed, 133 insertions(+), 227 deletions(-)
arch/arm/mach-tegra/board2.c +0 -6
@@ -29,7 +29,6 @@#ifdef CONFIG_TEGRA_CLOCK_SCALING #include <asm/arch/emc.h> #endif -#include <power/as3722.h> #include "emc.h" DECLARE_GLOBAL_DATA_PTR ;
@@ -142,11 +141,6 @@ int board_init(void)debug ("Memory controller init failed: %d\n" , err);# endif # endif /* CONFIG_TEGRA_PMU */ -#ifdef CONFIG_PMIC_AS3722 - err =as3722_init (NULL ); -if (err && err != -ENODEV ) -return err; -#endif #endif /* CONFIG_SYS_I2C_TEGRA */ #ifdef CONFIG_USB_EHCI_TEGRA
board/cei/cei-tk1-som/cei-tk1-som.c +2 -0
@@ -39,6 +39,7 @@ void pinmux_init(void)#ifdef CONFIG_PCI_TEGRA int tegra_pcie_board_init (void ) { +/* TODO: Convert to driver model struct udevice *pmic; int err;
@@ -59,6 +60,7 @@ int tegra_pcie_board_init(void)error("failed to set SD4 voltage: %d\n", err); return err; } +*/ return 0 ; }
board/nvidia/jetson-tk1/jetson-tk1.c +2 -0
@@ -39,6 +39,7 @@ void pinmux_init(void)#ifdef CONFIG_PCI_TEGRA int tegra_pcie_board_init (void ) { +/* TODO: Convert to driver model struct udevice *pmic; int err;
@@ -59,6 +60,7 @@ int tegra_pcie_board_init(void)error("failed to set SD4 voltage: %d\n", err); return err; } +*/ return 0 ; }
board/nvidia/nyan-big/nyan-big.c +13 -9
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <dm.h> #include <errno.h> #include <asm/gpio.h> #include <asm/io.h>
@@ -46,20 +47,23 @@ int tegra_board_id(void)int tegra_lcd_pmic_init (int board_id) { -struct udevice *pmic; +struct udevice *dev;int ret; - ret =as3722_get (&pmic); -if (ret) -return -ENOENT ; + ret =uclass_get_device_by_driver (UCLASS_PMIC , +DM_GET_DRIVER (pmic_as3722), &dev); +if (ret) { +debug ("%s: Failed to find PMIC\n" , __func__); +return ret; + }if (board_id ==0 ) -as3722_write (pmic,0x00 ,0x3c ); +pmic_reg_write (dev,0x00 ,0x3c );else -as3722_write (pmic,0x00 ,0x50 ); -as3722_write (pmic,0x12 ,0x10 ); -as3722_write (pmic,0x0c ,0x07 ); -as3722_write (pmic,0x20 ,0x10 ); +pmic_reg_write (dev,0x00 ,0x50 ); +pmic_reg_write (dev,0x12 ,0x10 ); +pmic_reg_write (dev,0x0c ,0x07 ); +pmic_reg_write (dev,0x20 ,0x10 );return 0 ; }
board/toradex/apalis-tk1/apalis-tk1.c +6 -0
@@ -61,6 +61,7 @@ void pinmux_init(void)#ifdef CONFIG_PCI_TEGRA int tegra_pcie_board_init (void ) { +/* TODO: Convert to driver model struct udevice *pmic; int err;
@@ -94,6 +95,7 @@ int tegra_pcie_board_init(void)error("failed to set GPIO#2 high: %d\n", err); return err; } +*/ /* Reset I210 Gigabit Ethernet Controller */ gpio_request (LAN_RESET_N ,"LAN_RESET_N" );
@@ -110,6 +112,7 @@ int tegra_pcie_board_init(void)gpio_direction_output (TEGRA_GPIO (O ,6 ),0 );/* Make sure LDO9 and LDO10 are initially enabled @ 0V */ +/* TODO: Convert to driver model err = as3722_ldo_enable(pmic, 9); if (err < 0) { error("failed to enable LDO9: %d\n", err);
@@ -130,6 +133,7 @@ int tegra_pcie_board_init(void)error("failed to set LDO10 voltage: %d\n", err); return err; } +*/ mdelay (100 );
@@ -137,6 +141,7 @@ int tegra_pcie_board_init(void)gpio_set_value (TEGRA_GPIO (O ,6 ),1 );/* Enable LDO9 and LDO10 for +V3.3_ETH on patched prototypes */ +/* TODO: Convert to driver model err = as3722_ldo_set_voltage(pmic, 9, 0xff); if (err < 0) { error("failed to set LDO9 voltage: %d\n", err);
@@ -147,6 +152,7 @@ int tegra_pcie_board_init(void)error("failed to set LDO10 voltage: %d\n", err); return err; } +*/ mdelay (100 );gpio_set_value (LAN_RESET_N ,1 );
configs/apalis-tk1_defconfig +3 -0
@@ -32,7 +32,10 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_TEGRA=y +CONFIG_DM_PMIC=y CONFIG_PMIC_AS3722=y +CONFIG_DM_REGULATOR=y +CONFIG_REGULATOR_AS3722=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y
configs/cei-tk1-som_defconfig +3 -0
@@ -36,7 +36,10 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_TEGRA=y +CONFIG_DM_PMIC=y CONFIG_PMIC_AS3722=y +CONFIG_DM_REGULATOR=y +CONFIG_REGULATOR_AS3722=y CONFIG_SYS_NS16550=y CONFIG_TEGRA114_SPI=y CONFIG_USB=y
configs/jetson-tk1_defconfig +3 -0
@@ -36,7 +36,10 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_TEGRA=y +CONFIG_DM_PMIC=y CONFIG_PMIC_AS3722=y +CONFIG_DM_REGULATOR=y +CONFIG_REGULATOR_AS3722=y CONFIG_SYS_NS16550=y CONFIG_TEGRA114_SPI=y CONFIG_USB=y
configs/nyan-big_defconfig +1 -0
@@ -50,6 +50,7 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_DM_PMIC=y CONFIG_PMIC_AS3722=y CONFIG_DM_REGULATOR=y +CONFIG_REGULATOR_AS3722=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_PWM_TEGRA=y CONFIG_DEBUG_UART=y
drivers/power/pmic/Makefile +1 -1
@@ -12,7 +12,7 @@ obj-$(CONFIG_DM_PMIC_PFUZE100) += pfuze100.o obj-$(CONFIG_PMIC_S2MPS11) += s2mps11.o obj-$(CONFIG_DM_PMIC_SANDBOX) += sandbox.o i2c_pmic_emul.o obj-$(CONFIG_PMIC_ACT8846) += act8846.o -obj-$(CONFIG_PMIC_AS3722) += as3722.o +obj-$(CONFIG_PMIC_AS3722) += as3722.o as3722_gpio.o obj-$(CONFIG_PMIC_MAX8997) += max8997.o obj-$(CONFIG_PMIC_PM8916) += pm8916.o obj-$(CONFIG_PMIC_RK8XX) += rk8xx.o
drivers/power/pmic/as3722.c +98 -194
362 lines not on this page · raw message
include/power/as3722.h +1 -17
@@ -7,8 +7,6 @@#ifndef __POWER_AS3722_H__#define __POWER_AS3722_H__ -#include <asm/types.h> -#define AS3722_GPIO_OUTPUT_VDDH (1 << 0)#define AS3722_GPIO_INVERT (1 << 1)
@@ -21,23 +19,9 @@#define AS3722_ASIC_ID2 0x91#define AS3722_GPIO_CONTROL (n) (0x08 + (n)) +#define AS3722_GPIO_SIGNAL_OUT 0x20#define AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDH (1 << 0)#define AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDL (7 << 0)#define AS3722_GPIO_CONTROL_INVERT (1 << 7) -struct udevice ; - -int as3722_init (struct udevice **devp); -int as3722_sd_enable (struct udevice *pmic,unsigned int sd); -int as3722_sd_set_voltage (struct udevice *pmic,unsigned int sd,u8 value); -int as3722_ldo_enable (struct udevice *pmic,unsigned int ldo); -int as3722_ldo_set_voltage (struct udevice *pmic,unsigned int ldo,u8 value); -int as3722_gpio_configure (struct udevice *pmic,unsigned int gpio, -unsigned long flags); -int as3722_gpio_direction_output (struct udevice *pmic,unsigned int gpio, -unsigned int level); -int as3722_read (struct udevice *pmic,u8 reg,u8 *value); -int as3722_write (struct udevice *pmic,u8 reg,u8 value); -int as3722_get (struct udevice **devp); -#endif /* __POWER_AS3722_H__ */
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 25/31 dm: serial: ns16550: Convert to livetree
In reply to Simon GlassUpdate this driver to support a live device tree.
---
Changes in v2: None
drivers/serial/ns16550.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/serial/ns16550.c +5 -10
@@ -8,7 +8,6 @@#include <clk.h> #include <dm.h> #include <errno.h> -#include <fdtdec.h> #include <ns16550.h> #include <serial.h> #include <watchdog.h>
@@ -395,7 +394,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)int err;/* try Processor Local Bus device first */ - addr =devfdt_get_addr (dev); + addr =dev_read_addr (dev);#if defined(CONFIG_PCI ) && defined(CONFIG_DM_PCI )if (addr ==FDT_ADDR_T_NONE ) {/* then try pci device */
@@ -434,11 +433,8 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) plat->base = (unsigned long )map_physmem (addr,0 ,MAP_NOCACHE );#endif - plat->reg_offset =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev), -"reg-offset" ,0 ); - plat->reg_shift =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev), -"reg-shift" ,0 ); - + plat->reg_offset =dev_read_u32_default (dev,"reg-offset" ,0 ); + plat->reg_shift =dev_read_u32_default (dev,"reg-shift" ,0 ); err =clk_get_by_index (dev,0 , &clk);if (!err) { err =clk_get_rate (&clk);
@@ -450,9 +446,8 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) }if (!plat->clock) - plat->clock =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev), -"clock-frequency" , -CONFIG_SYS_NS16550_CLK ); + plat->clock =dev_read_u32_default (dev,"clock-frequency" , +CONFIG_SYS_NS16550_CLK );if (!plat->clock) {debug ("ns16550 clock not defined\n" );return -EINVAL ;
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 26/31 dm: serial: Separate out the core serial-device finding code
In reply to Simon GlassThis function is quite long. Move the core code into a separate function in preparation for adding livetree support.
---
Changes in v2: None
drivers/serial/serial-uclass.c | 84 ++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 40 deletions(-)
drivers/serial/serial-uclass.c +44 -40
@@ -8,7 +8,6 @@#include <dm.h> #include <environment.h> #include <errno.h> -#include <fdtdec.h> #include <os.h> #include <serial.h> #include <stdio_dev.h>
@@ -27,11 +26,53 @@ static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;#error "Serial is required before relocation - define CONFIG_SYS_MALLOC_F_LEN to make this work"#endif +static int serial_check_stdout (const void *blob,struct udevice **devp) +{ +int node; + +/* Check for a chosen console */ + node =fdtdec_get_chosen_node (blob,"stdout-path" ); +if (node <0 ) { +const char *str, *p, *name; + +/* +* Deal with things like +* stdout-path = "serial0:115200n8"; +* +* We need to look up the alias and then follow it to the +* correct node. +*/ + str =fdtdec_get_chosen_prop (blob,"stdout-path" ); +if (str) { + p =strchr (str,':' ); + name =fdt_get_alias_namelen (blob, str, + p ? p - str :strlen (str)); +if (name) + node =fdt_path_offset (blob, name); + } + } +if (node <0 ) + node =fdt_path_offset (blob,"console" ); +if (!uclass_get_device_by_of_offset (UCLASS_SERIAL , node, devp)) +return 0 ; + +/* +* If the console is not marked to be bound before relocation, bind it +* anyway. +*/ +if (node >0 && !lists_bind_fdt (gd->dm_root,offset_to_ofnode (node), + devp)) { +if (!device_probe (*devp)) +return 0 ; + } + +return -ENODEV ; +} +static void serial_find_console_or_panic (void ) {const void *blob = gd->fdt_blob;struct udevice *dev; -int node;if (CONFIG_IS_ENABLED (OF_PLATDATA )) {uclass_first_device (UCLASS_SERIAL , &dev);
@@ -40,47 +81,10 @@ static void serial_find_console_or_panic(void)return ; } }else if (CONFIG_IS_ENABLED (OF_CONTROL ) && blob) { -/* Check for a chosen console */ - node =fdtdec_get_chosen_node (blob,"stdout-path" ); -if (node <0 ) { -const char *str, *p, *name; - -/* -* Deal with things like -* stdout-path = "serial0:115200n8"; -* -* We need to look up the alias and then follow it to -* the correct node. -*/ - str =fdtdec_get_chosen_prop (blob,"stdout-path" ); -if (str) { - p =strchr (str,':' ); - name =fdt_get_alias_namelen (blob, str, - p ? p - str :strlen (str)); -if (name) - node =fdt_path_offset (blob, name); - } - } -if (node <0 ) - node =fdt_path_offset (blob,"console" ); -if (!uclass_get_device_by_of_offset (UCLASS_SERIAL , node, - &dev)) { +if (!serial_check_stdout (blob, &dev)) { gd->cur_serial_dev = dev;return ; } - -/* -* If the console is not marked to be bound before relocation, -* bind it anyway. -*/ -if (node >0 && - !lists_bind_fdt (gd->dm_root,offset_to_ofnode (node), - &dev)) { -if (!device_probe (dev)) { - gd->cur_serial_dev = dev; -return ; - } - } }if (!SPL_BUILD || !CONFIG_IS_ENABLED (OF_CONTROL ) || !blob) {/*
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 27/31 dm: serial: Add livetree support
In reply to Simon GlassAdd support for a live device tree to the core serial uclass.
---
Changes in v2: None
drivers/serial/serial-uclass.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/serial/serial-uclass.c +15 -3
@@ -14,6 +14,7 @@#include <watchdog.h> #include <dm/lists.h> #include <dm/device-internal.h> +#include <dm/of_access.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -81,9 +82,20 @@ static void serial_find_console_or_panic(void)return ; } }else if (CONFIG_IS_ENABLED (OF_CONTROL ) && blob) { -if (!serial_check_stdout (blob, &dev)) { - gd->cur_serial_dev = dev; -return ; +/* Live tree has support for stdout */ +if (of_live_active ()) { +struct device_node *np =of_get_stdout (); + +if (np && !uclass_get_device_by_ofnode (UCLASS_SERIAL , +np_to_ofnode (np), &dev)) { + gd->cur_serial_dev = dev; +return ; + } + }else { +if (!serial_check_stdout (blob, &dev)) { + gd->cur_serial_dev = dev; +return ; + } } }if (!SPL_BUILD || !CONFIG_IS_ENABLED (OF_CONTROL ) || !blob) {
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 28/31 tegra: Show a debug message if the LCD PMIC fails to start
In reply to Simon GlassThis error condition should have a debug() message. Add it.
---
Changes in v2: None
arch/arm/mach-tegra/board2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-tegra/board2.c +3 -1
@@ -150,8 +150,10 @@ int board_init(void)#if defined(CONFIG_DM_VIDEO ) board_id =tegra_board_id (); err =tegra_lcd_pmic_init (board_id); -if (err) +if (err) { +debug ("Failed to set up LCD PMIC\n" );return err; + }#endif #ifdef CONFIG_TEGRA_NAND
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 29/31 fdtdec: Drop old compatible values
In reply to Simon GlassThese are not needed now since the drivers now use driver model. Drop them.
---
Changes in v2: None
include/fdtdec.h | 6 ------ lib/fdtdec.c | 6 ------ 2 files changed, 12 deletions(-)
include/fdtdec.h +0 -6
@@ -119,12 +119,6 @@ enum fdt_compat_id {COMPAT_NVIDIA_TEGRA20_EMC ,/* Tegra20 memory controller */ COMPAT_NVIDIA_TEGRA20_EMC_TABLE ,/* Tegra20 memory timing table */ COMPAT_NVIDIA_TEGRA20_NAND ,/* Tegra2 NAND controller */ -COMPAT_NVIDIA_TEGRA124_PMC ,/* Tegra 124 power mgmt controller */ -COMPAT_NVIDIA_TEGRA186_SDMMC ,/* Tegra186 SDMMC controller */ -COMPAT_NVIDIA_TEGRA210_SDMMC ,/* Tegra210 SDMMC controller */ -COMPAT_NVIDIA_TEGRA124_SDMMC ,/* Tegra124 SDMMC controller */ -COMPAT_NVIDIA_TEGRA30_SDMMC ,/* Tegra30 SDMMC controller */ -COMPAT_NVIDIA_TEGRA20_SDMMC ,/* Tegra20 SDMMC controller */ COMPAT_NVIDIA_TEGRA124_XUSB_PADCTL ,/* Tegra124 XUSB pad controller */ COMPAT_NVIDIA_TEGRA210_XUSB_PADCTL,
lib/fdtdec.c +0 -6
@@ -33,12 +33,6 @@ static const char * const compat_names[COMPAT_COUNT] = {COMPAT (NVIDIA_TEGRA20_EMC ,"nvidia,tegra20-emc" ),COMPAT (NVIDIA_TEGRA20_EMC_TABLE ,"nvidia,tegra20-emc-table" ),COMPAT (NVIDIA_TEGRA20_NAND ,"nvidia,tegra20-nand" ), -COMPAT (NVIDIA_TEGRA124_PMC ,"nvidia,tegra124-pmc" ), -COMPAT (NVIDIA_TEGRA186_SDMMC ,"nvidia,tegra186-sdhci" ), -COMPAT (NVIDIA_TEGRA210_SDMMC ,"nvidia,tegra210-sdhci" ), -COMPAT (NVIDIA_TEGRA124_SDMMC ,"nvidia,tegra124-sdhci" ), -COMPAT (NVIDIA_TEGRA30_SDMMC ,"nvidia,tegra30-sdhci" ), -COMPAT (NVIDIA_TEGRA20_SDMMC ,"nvidia,tegra20-sdhci" ),COMPAT (NVIDIA_TEGRA124_XUSB_PADCTL ,"nvidia,tegra124-xusb-padctl" ),COMPAT (NVIDIA_TEGRA210_XUSB_PADCTL ,"nvidia,tegra210-xusb-padctl" ), COMPAT(SMSC_LAN9215, "smsc,lan9215"),
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 30/31 tegra: fdt: Ensure that the console UART is enabled
In reply to Simon GlassMany tegra boards have the console UART node disabled. With livetree this prevents serial from working since it does not 'force' the console to be bound. Updates the affected boards to fix this error.
The boards were checked with:
for b in $(grep tegra boards.cfg |grep -v integrator | \
awk '{print $7}' | sort); do
echo $b;
fdtgrep -c nvidia,tegra20-uart b/$b/u-boot.dtb |grep okay;done
---
Changes in v2:
- Add new patch to ensure that the console UART is enabled
arch/arm/dts/tegra114-dalmore.dts | 4 ++++ arch/arm/dts/tegra124-cei-tk1-som.dts | 4 ++++ arch/arm/dts/tegra124-jetson-tk1.dts | 4 ++++ arch/arm/dts/tegra124-venice2.dts | 4 ++++ arch/arm/dts/tegra186-p2771-0000.dtsi | 4 ++++ arch/arm/dts/tegra20-colibri.dts | 4 ++++ arch/arm/dts/tegra20-harmony.dts | 4 ++++ arch/arm/dts/tegra20-trimslice.dts | 4 ++++ arch/arm/dts/tegra20-whistler.dts | 4 ++++ arch/arm/dts/tegra210-e2220-1170.dts | 4 ++++ arch/arm/dts/tegra210-p2371-0000.dts | 4 ++++ arch/arm/dts/tegra210-p2371-2180.dts | 4 ++++ arch/arm/dts/tegra210-p2571.dts | 4 ++++ arch/arm/dts/tegra30-apalis.dts | 4 ++++ arch/arm/dts/tegra30-beaver.dts | 4 ++++ arch/arm/dts/tegra30-cardhu.dts | 4 ++++ arch/arm/dts/tegra30-colibri.dts | 4 ++++ arch/arm/dts/tegra30-tec-ng.dts | 4 ++++ 18 files changed, 72 insertions(+)
arch/arm/dts/tegra114-dalmore.dts +4 -0
@@ -93,3 +93,7 @@ }; }; }; + +&uartd { + status = "okay"; +};
arch/arm/dts/tegra124-cei-tk1-som.dts +4 -0
@@ -475,3 +475,7 @@ }; }; }; + +&uartd { + status = "okay"; +};
arch/arm/dts/tegra124-jetson-tk1.dts +4 -0
@@ -480,3 +480,7 @@ }; }; }; + +&uartd { + status = "okay"; +};
arch/arm/dts/tegra124-venice2.dts +4 -0
@@ -109,3 +109,7 @@ }; }; + +&uarta { + status = "okay"; +};
arch/arm/dts/tegra186-p2771-0000.dtsi +4 -0
@@ -76,3 +76,7 @@ }; }; }; + +&uarta { + status = "okay"; +};
arch/arm/dts/tegra20-colibri.dts +4 -0
@@ -162,3 +162,7 @@ }; }; }; + +&uarta { + status = "okay"; +};
arch/arm/dts/tegra20-harmony.dts +4 -0
@@ -812,3 +812,7 @@ clock-names = "pll_a", "pll_a_out0", "mclk"; }; }; + +&uartd { + status = "okay"; +};
arch/arm/dts/tegra20-trimslice.dts +4 -0
@@ -129,3 +129,7 @@ }; }; + +&uarta { + status = "okay"; +};
arch/arm/dts/tegra20-whistler.dts +4 -0
@@ -75,3 +75,7 @@ }; }; + +&uarta { + status = "okay"; +};
arch/arm/dts/tegra210-e2220-1170.dts +4 -0
@@ -57,3 +57,7 @@ }; }; }; + +&uarta { + status = "okay"; +};
arch/arm/dts/tegra210-p2371-0000.dts +4 -0
@@ -58,3 +58,7 @@ }; }; }; + +&uarta { + status = "okay"; +};
arch/arm/dts/tegra210-p2371-2180.dts +4 -0
@@ -109,3 +109,7 @@ }; }; }; + +&uarta { + status = "okay"; +};
arch/arm/dts/tegra210-p2571.dts +4 -0
@@ -105,3 +105,7 @@ }; }; }; + +&uarta { + status = "okay"; +};
arch/arm/dts/tegra30-apalis.dts +4 -0
@@ -332,3 +332,7 @@ }; }; }; + +&uarta { + status = "okay"; +};
arch/arm/dts/tegra30-beaver.dts +4 -0
@@ -346,3 +346,7 @@ }; }; }; + +&uarta { + status = "okay"; +};
arch/arm/dts/tegra30-cardhu.dts +4 -0
@@ -451,3 +451,7 @@ }; }; }; + +&uarta { + status = "okay"; +};
arch/arm/dts/tegra30-colibri.dts +4 -0
@@ -106,3 +106,7 @@ }; }; }; + +&uarta { + status = "okay"; +};
arch/arm/dts/tegra30-tec-ng.dts +4 -0
@@ -20,3 +20,7 @@ status = "okay"; }; }; + +&uartd { + status = "okay"; +};
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
PATCH v2 31/31 dm: tegra: Move nyan-big and beaver to livetree
In reply to Simon GlassChange these board to use a live device tree after relocation.
---
Changes in v2:
- Enable livetree for beaver also
- Add timing information
configs/beaver_defconfig | 1 + configs/nyan-big_defconfig | 1 + 2 files changed, 2 insertions(+)
configs/beaver_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_OF_LIVE=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y
configs/nyan-big_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set +CONFIG_OF_LIVE=y CONFIG_SPL_DM=y CONFIG_REGMAP=y CONFIG_SYSCON=y
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
v2 cover dm: tegra: Move nyan-big and beaver to livetree
In reply to Simon GlassHi Tom (Warren) / Marcel,
Quoted 8 lines · Simon Glass
This moves an entire board to use a live device tree as an example of the impact.
Nyan-big was chosen because I can easily and boot U-Boot without any media swapping, etc. Beaver is enabled as well since it failed to boot with serial v1 due to a disabled console node.
Have you been able to test this v2 series? Some problems were reported with v1 and I have found a few more since I discovered my jetson-tk1 board. I'm planning to send a v3 soon, but please let me know if you see any issues.
Regards,
Simon
v2 cover dm: tegra: Move nyan-big and beaver to livetree
Hi,
Quoted 12 lines · Simon Glass
Hi Tom (Warren) / Marcel,
Quoted 8 lines · Simon Glass
This moves an entire board to use a live device tree as an example of the impact.
Nyan-big was chosen because I can easily and boot U-Boot without any media swapping, etc. Beaver is enabled as well since it failed to boot with serial v1 due to a disabled console node.
Quoted 4 lines
Have you been able to test this v2 series? Some problems were reported with v1 and I have found a few more since I discovered my jetson-tk1 board. I'm planning to send a v3 soon, but please let me know if you see any issues.
One more note - I pushed a v3 series to u-boot-dm/livet-working but have not sent the patches. Let me know if you find anything.
Regards,
Simon
v2 cover dm: tegra: Move nyan-big and beaver to livetree
Hi Simon
Quoted 26 lines · Simon Glass
Hi,
Quoted 15 lines · Simon Glass
Hi Tom (Warren) / Marcel,
Quoted 11 lines · Simon Glass
This moves an entire board to use a live device tree as an example of the
impact.Nyan-big was chosen because I can easily and boot U-Boot without any
media swapping, etc. Beaver is enabled as well since it failed to boot
with serial v1 due to a disabled console node.Quoted 7 lines
Have you been able to test this v2 series? Some problems were reported
with v1 and I have found a few more since I discovered my jetson- tk1
board. I'm planning to send a v3 soon, but please let me know if you
see any issues.
Quoted 2 lines
One more note - I pushed a v3 series to u-boot-dm/livet-working but have not sent the patches. Let me know if you find anything.
While Apalis TK1 now at least boots without any GPIO driver issues I still saw the following few glitches:
Apalis TK1 # gpio status -a
Bank A:
A0: func
A1: input: 1 [ ]
A2: func
...
FF7: func
Bank as3722_:as3722_0: unknownas3722_1: unknownas3722_2: unknownas3722_3: unknownas3722_4: unknownas3722_5: unknownas3722_6: unknownas3722_7: unknown
Apalis TK1 # mmc dev 0tegra_mmc_send_cmd_bounced: MMC Timeout
Interrupt status 0x00000001
Interrupt status enable 0xffff003b
Interrupt signal enable 0xffff0002
Present status 0x01fb02f6mmc_init: -1, time 8066
While PCIe enumeration does not error out it seems not to detect the Ethernet chip:
Apalis TK1 # pci enum
Apalis TK1 # dm tree
Class Probed Name
----------------------------------------
root [ + ] root_driver
pci [ + ] |-- pcie-controller at 01003000
...
That's how it should look (e.g. with older working U-Boot):
Apalis TK1 # ver
U-Boot 2016.11-2.7.2+g60021a4 (Apr 10 2017 - 07:55:49 +0200) arm-angstrom-linux-gnueabi-gcc (Linaro GCC 6.2-2016.11) 6.2.1 20161016 GNU ld (GNU Binutils) 2.27.0.20160806
Apalis TK1 # pci enum
Apalis TK1 # dm tree
Class Probed Name
----------------------------------------
root [ + ] root_driver
pci [ + ] |-- pcie-controller at 01003000
pci [ + ] | `-- pci_0:2.0
eth [ ] | `-- e1000#0
After enabling CONFIG_OF_LIVE I noticed the following additional issue:
Apalis TK1 # pci enum
ERROR: tegra-pcie: resource "pads" not found
at u-boot.git/drivers/pci/pci_tegra.c:499/tegra_pcie_parse_dt()
Trying to use a vanilla mainline Linux kernel device tree also did not help:
U-Boot 2017.07-rc1-00150-gf325a89-dirty (Jun 09 2017 - 14:33:21 +0200)
TEGRA124
DRAM: 2 GiB
ERROR: tegra-xusb-padctl: failed to parse "nvidia,lanes" property at /run/media/zim/Build/Sources/u-boot.git/arch/arm/mach- tegra/tegra124/../xusb-padctl- common.c:87/tegra_xusb_padctl_group_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse group usb2
at /run/media/zim/Build/Sources/u-boot.git/arch/arm/mach- tegra/tegra124/../xusb-padctl- common.c:237/tegra_xusb_padctl_config_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse entry pads: -22
at /run/media/zim/Build/Sources/u-boot.git/arch/arm/mach- tegra/tegra124/../xusb-padctl-common.c:270/tegra_xusb_padctl_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse "nvidia,lanes" property at /run/media/zim/Build/Sources/u-boot.git/arch/arm/mach- tegra/tegra124/../xusb-padctl- common.c:87/tegra_xusb_padctl_group_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse group usb2-0
at /run/media/zim/Build/Sources/u-boot.git/arch/arm/mach- tegra/tegra124/../xusb-padctl- common.c:237/tegra_xusb_padctl_config_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse entry ports: -22 at /run/media/zim/Build/Sources/u-boot.git/arch/arm/mach- tegra/tegra124/../xusb-padctl-common.c:270/tegra_xusb_padctl_parse_dt()
Just the order of the SDHCI controllers changed:
Apalis TK1 # mmc dev 2; mmc infotegra_mmc_send_cmd_bounced: MMC Timeout
Interrupt status 0x00000001
Interrupt status enable 0xffff003b
Interrupt signal enable 0xffff0002
Present status 0x01fb02f6mmc_init: -1, time 8066
But PCIe enumeration still fails:
Apalis TK1 # pci enum
ERROR: tegra-pcie: resource "pads" not found
at /run/media/zim/Build/Sources/u- boot.git/drivers/pci/pci_tegra.c:499/tegra_pcie_parse_dt()
Let me know should you require any additional information.
Quoted 2 lines
Regards,
Simon
Cheers
Marcel
v2 cover dm: tegra: Move nyan-big and beaver to livetree
Hi Marcel,
Quoted 89 lines · Marcel Ziswiler
Hi Simon
Quoted 26 lines · Simon Glass
Hi,
Quoted 15 lines · Simon Glass
Hi Tom (Warren) / Marcel,
Quoted 11 lines · Simon Glass
This moves an entire board to use a live device tree as an example of the
impact.Nyan-big was chosen because I can easily and boot U-Boot without any
media swapping, etc. Beaver is enabled as well since it failed to boot
with serial v1 due to a disabled console node.Quoted 7 lines
Have you been able to test this v2 series? Some problems were reported
with v1 and I have found a few more since I discovered my jetson- tk1
board. I'm planning to send a v3 soon, but please let me know if you
see any issues.Quoted 2 lines
One more note - I pushed a v3 series to u-boot-dm/livet-working but have not sent the patches. Let me know if you find anything.
While Apalis TK1 now at least boots without any GPIO driver issues I still saw the following few glitches:
Apalis TK1 # gpio status -a
Bank A:
A0: func
A1: input: 1 [ ]
A2: func
...
FF7: funcBank
as3722_:as3722_0: unknownas3722_1: unknownas3722_2: unknownas3722_3: unknownas3722_4: unknownas3722_5: unknownas3722_6: unknownas3722_7: unknownApalis TK1 # mmc dev 0
tegra_mmc_send_cmd_bounced: MMC TimeoutInterrupt status 0x00000001 Interrupt status enable 0xffff003b Interrupt signal enable 0xffff0002 Present status 0x01fb02f6
mmc_init: -1, time 8066While PCIe enumeration does not error out it seems not to detect the Ethernet chip:
Apalis TK1 # pci enum
Apalis TK1 # dm tree
Class Probed Name
----------------------------------------root [ + ] root_driver pci [ + ] |-- pcie-controller at 01003000...
That's how it should look (e.g. with older working U-Boot):
Apalis TK1 # ver
U-Boot 2016.11-2.7.2+g60021a4 (Apr 10 2017 - 07:55:49 +0200) arm-angstrom-linux-gnueabi-gcc (Linaro GCC 6.2-2016.11) 6.2.1 20161016 GNU ld (GNU Binutils) 2.27.0.20160806
Apalis TK1 # pci enum
Apalis TK1 # dm tree
Class Probed Name
----------------------------------------root [ + ] root_driver pci [ + ] |-- pcie-controller at 01003000 pci [ + ] | `-- pci_0:2.0 eth [ ] | `-- e1000#0
Quoted 5 lines
After enabling
CONFIG_OF_LIVEI noticed the following additional issue:Apalis TK1 # pci enum
ERROR: tegra-pcie: resource "pads" not found
at u-boot.git/drivers/pci/pci_tegra.c:499/tegra_pcie_parse_dt()
OK that sounds like a new problem, I'll take a look.
Quoted 22 lines
Trying to use a vanilla mainline Linux kernel device tree also did not help:
U-Boot 2017.07-rc1-00150-gf325a89-dirty (Jun 09 2017 - 14:33:21 +0200)
TEGRA124
DRAM: 2 GiB ERROR: tegra-xusb-padctl: failed to parse "nvidia,lanes" propertyat
/run/media/zim/Build/Sources/u-boot.git/arch/arm/mach-tegra/tegra124/../xusb-padctl- common.c:87/tegra_xusb_padctl_group_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse group usb2
at/run/media/zim/Build/Sources/u-boot.git/arch/arm/mach-tegra/tegra124/../xusb-padctl- common.c:237/tegra_xusb_padctl_config_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse entry pads: -22
at/run/media/zim/Build/Sources/u-boot.git/arch/arm/mach-tegra/tegra124/../xusb-padctl-common.c:270/tegra_xusb_padctl_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse "nvidia,lanes" property at/run/media/zim/Build/Sources/u-boot.git/arch/arm/mach-tegra/tegra124/../xusb-padctl-
Quoted 8 lines
common.c:87/tegra_xusb_padctl_group_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse group usb2-0
at/run/media/zim/Build/Sources/u-boot.git/arch/arm/mach-tegra/tegra124/../xusb-padctl- common.c:237/tegra_xusb_padctl_config_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse entry ports: -22 at/run/media/zim/Build/Sources/u-boot.git/arch/arm/mach-tegra/tegra124/../xusb-padctl-common.c:270/tegra_xusb_padctl_parse_dt()
This should be fixed by u-boot-dm/livet-working - can you please check you have the latest version?
Quoted 10 lines
Just the order of the SDHCI controllers changed:
Apalis TK1 # mmc dev 2; mmc info
tegra_mmc_send_cmd_bounced: MMC TimeoutInterrupt status 0x00000001 Interrupt status enable 0xffff003b Interrupt signal enable 0xffff0002 Present status 0x01fb02f6
mmc_init: -1, time 8066
It could be this:
http://patchwork.ozlabs.org/patch/772771/
So the ordering has changed?
Quoted 9 lines
But PCIe enumeration still fails:
Apalis TK1 # pci enum
ERROR: tegra-pcie: resource "pads" not found
at/run/media/zim/Build/Sources/u-boot.git/drivers/pci/pci_tegra.c:499/tegra_pcie_parse_dt()Let me know should you require any additional information.
Much appreciated.
As above can you please confirm the git hash you tested?
Regards,
Simon
v2 cover dm: tegra: Move nyan-big and beaver to livetree
Hi Marcel,
Quoted 160 lines · Simon Glass
Hi Marcel,
Quoted 89 lines · Marcel Ziswiler
Hi Simon
Quoted 26 lines · Simon Glass
Hi,
Quoted 15 lines · Simon Glass
Hi Tom (Warren) / Marcel,
Quoted 11 lines · Simon Glass
This moves an entire board to use a live device tree as an example of the
impact.Nyan-big was chosen because I can easily and boot U-Boot without any
media swapping, etc. Beaver is enabled as well since it failed to boot
with serial v1 due to a disabled console node.Quoted 7 lines
Have you been able to test this v2 series? Some problems were reported
with v1 and I have found a few more since I discovered my jetson- tk1
board. I'm planning to send a v3 soon, but please let me know if you
see any issues.Quoted 2 lines
One more note - I pushed a v3 series to u-boot-dm/livet-working but have not sent the patches. Let me know if you find anything.
While Apalis TK1 now at least boots without any GPIO driver issues I still saw the following few glitches:
Apalis TK1 # gpio status -a
Bank A:
A0: func
A1: input: 1 [ ]
A2: func
...
FF7: funcBank
as3722_:as3722_0: unknownas3722_1: unknownas3722_2: unknownas3722_3: unknownas3722_4: unknownas3722_5: unknownas3722_6: unknownas3722_7: unknownApalis TK1 # mmc dev 0
tegra_mmc_send_cmd_bounced: MMC TimeoutInterrupt status 0x00000001 Interrupt status enable 0xffff003b Interrupt signal enable 0xffff0002 Present status 0x01fb02f6
mmc_init: -1, time 8066While PCIe enumeration does not error out it seems not to detect the Ethernet chip:
Apalis TK1 # pci enum
Apalis TK1 # dm tree
Class Probed Name
----------------------------------------root [ + ] root_driver pci [ + ] |-- pcie-controller at 01003000...
That's how it should look (e.g. with older working U-Boot):
Apalis TK1 # ver
U-Boot 2016.11-2.7.2+g60021a4 (Apr 10 2017 - 07:55:49 +0200) arm-angstrom-linux-gnueabi-gcc (Linaro GCC 6.2-2016.11) 6.2.1 20161016 GNU ld (GNU Binutils) 2.27.0.20160806
Apalis TK1 # pci enum
Apalis TK1 # dm tree
Class Probed Name
----------------------------------------root [ + ] root_driver pci [ + ] |-- pcie-controller at 01003000 pci [ + ] | `-- pci_0:2.0 eth [ ] | `-- e1000#0Quoted 5 lines
After enabling
CONFIG_OF_LIVEI noticed the following additional issue:Apalis TK1 # pci enum
ERROR: tegra-pcie: resource "pads" not found
at u-boot.git/drivers/pci/pci_tegra.c:499/tegra_pcie_parse_dt()OK that sounds like a new problem, I'll take a look.
Quoted 22 lines
Trying to use a vanilla mainline Linux kernel device tree also did not help:
U-Boot 2017.07-rc1-00150-gf325a89-dirty (Jun 09 2017 - 14:33:21 +0200)
TEGRA124
DRAM: 2 GiB ERROR: tegra-xusb-padctl: failed to parse "nvidia,lanes" propertyat
/run/media/zim/Build/Sources/u-boot.git/arch/arm/mach-tegra/tegra124/../xusb-padctl- common.c:87/tegra_xusb_padctl_group_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse group usb2
at/run/media/zim/Build/Sources/u-boot.git/arch/arm/mach-tegra/tegra124/../xusb-padctl- common.c:237/tegra_xusb_padctl_config_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse entry pads: -22
at/run/media/zim/Build/Sources/u-boot.git/arch/arm/mach-tegra/tegra124/../xusb-padctl-common.c:270/tegra_xusb_padctl_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse "nvidia,lanes" property at/run/media/zim/Build/Sources/u-boot.git/arch/arm/mach-tegra/tegra124/../xusb-padctl-Quoted 8 lines
common.c:87/tegra_xusb_padctl_group_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse group usb2-0
at/run/media/zim/Build/Sources/u-boot.git/arch/arm/mach-tegra/tegra124/../xusb-padctl- common.c:237/tegra_xusb_padctl_config_parse_dt()
ERROR: tegra-xusb-padctl: failed to parse entry ports: -22 at/run/media/zim/Build/Sources/u-boot.git/arch/arm/mach-tegra/tegra124/../xusb-padctl-common.c:270/tegra_xusb_padctl_parse_dt()This should be fixed by u-boot-dm/livet-working - can you please check you have the latest version?
Quoted 10 lines
Just the order of the SDHCI controllers changed:
Apalis TK1 # mmc dev 2; mmc info
tegra_mmc_send_cmd_bounced: MMC TimeoutInterrupt status 0x00000001 Interrupt status enable 0xffff003b Interrupt signal enable 0xffff0002 Present status 0x01fb02f6
mmc_init: -1, time 8066It could be this:
http://patchwork.ozlabs.org/patch/772771/
So the ordering has changed?
Quoted 8 lines
But PCIe enumeration still fails:
Apalis TK1 # pci enum
ERROR: tegra-pcie: resource "pads" not found
at/run/media/zim/Build/Sources/u-boot.git/drivers/pci/pci_tegra.c:499/tegra_pcie_parse_dt()
Quoted 5 lines
Quoted 1 line
Let me know should you require any additional information.
Much appreciated.
As above can you please confirm the git hash you tested?
I found the tegra's PCI was not ported to livetree and also there was a bug in the PCI uclass (which suggests that the PCI test coverage is not so great).
I've pushed a new version to u-boot-dm/livet-working and will send v3 patches if they pass buildman.
My tegra-TK1 PCI does not work. I think it is because I accidentally corrupted the PMIC register values at one point. Is there a way to restore it?
Regards,
Simon
v2 cover dm: tegra: Move nyan-big and beaver to livetree
In reply to Simon GlassSimon,
Quoted 23 lines
-----Original Message-----
From: sjg at google.com [mailto:sjg at google.com] On Behalf Of Simon Glass
Sent: Thursday, June 08, 2017 8:06 PM
To: U-Boot Mailing List <[email protected]>
Cc: Tom Rini <[email protected]>; Marcel Ziswiler <[email protected]>; Simon Glass <[email protected]>; Heiko Schocher <[email protected]>; Tom Warren <[email protected]>; Jagannadha Sutradharudu Teki <[email protected]>; Stephen Warren <[email protected]>; Jagan Teki <[email protected]>; Marek Vasut <[email protected]>; Marek Vasut <[email protected]>; Anatolij Gustschin <[email protected]>; Lukasz Majewski <[email protected]>; Jerry Van Baren <[email protected]>; Pavel Herrmann <[email protected]>; Jaehoon Chung <[email protected]>; Stephen Warren <[email protected]>
Subject: Re: [PATCH v2 00/31] dm: tegra: Move nyan-big and beaver to livetreeHi Tom (Warren) / Marcel,
Quoted 4 lines · Simon Glass
This moves an entire board to use a live device tree as an example of the impact.
Quoted 9 lines
Quoted 4 lines
Nyan-big was chosen because I can easily and boot U-Boot without any media swapping, etc. Beaver is enabled as well since it failed to boot with serial v1 due to a disabled console node.
Have you been able to test this v2 series? Some problems were reported with v1 and I have found a few more since I discovered my jetson-tk1 board. I'm planning to send a v3 soon, but please let me know if you see any issues.
I have neither a nyan-big setup right now, nor an beaver boards. Stephen's test harness should catch any gross build/boot failures if you apply it to a repo he supports (dm, etc.)
Tom
Quoted 2 lines
Regards,
Simon
--
nvpublic