diff options
| author | Tom Rini <[email protected]> | 2022-06-14 12:28:58 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-06-14 12:59:12 -0400 |
| commit | c1d9020cc7f249a27d117ef6c69a53f5fe0d1407 (patch) | |
| tree | 9bbcd5319f9770f74c44770cdffdafb0cc6cb652 /drivers | |
| parent | 92a8bc6b419f548230f10a924db2b3ef10a5edad (diff) | |
| parent | 8f27bf114ef48e681f00fcb38ad48d4ab581d0ca (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-tegra
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/tegra_i2c.c | 1 | ||||
| -rw-r--r-- | drivers/pci/pci_tegra.c | 4 | ||||
| -rw-r--r-- | drivers/video/tegra124/dp.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c index 1e744845423..2394e9d0fb4 100644 --- a/drivers/i2c/tegra_i2c.c +++ b/drivers/i2c/tegra_i2c.c @@ -514,6 +514,7 @@ static const struct dm_i2c_ops tegra_i2c_ops = { static const struct udevice_id tegra_i2c_ids[] = { { .compatible = "nvidia,tegra114-i2c", .data = TYPE_114 }, + { .compatible = "nvidia,tegra124-i2c", .data = TYPE_114 }, { .compatible = "nvidia,tegra20-i2c", .data = TYPE_STD }, { .compatible = "nvidia,tegra20-i2c-dvc", .data = TYPE_DVC }, { } diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c index f8d66c0e1c6..bc489d5ec85 100644 --- a/drivers/pci/pci_tegra.c +++ b/drivers/pci/pci_tegra.c @@ -455,7 +455,7 @@ static int tegra_pcie_parse_port_info(ofnode node, uint *index, uint *lanes) err = ofnode_read_u32_default(node, "nvidia,num-lanes", -1); if (err < 0) { - pr_err("failed to parse \"nvidia,num-lanes\" property"); + pr_err("failed to parse \"nvidia,num-lanes\" property\n"); return err; } @@ -463,7 +463,7 @@ static int tegra_pcie_parse_port_info(ofnode node, uint *index, uint *lanes) err = ofnode_read_pci_addr(node, 0, "reg", &addr); if (err < 0) { - pr_err("failed to parse \"reg\" property"); + pr_err("failed to parse \"reg\" property\n"); return err; } diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c index 8f5116fe7c8..ee4f09a0c49 100644 --- a/drivers/video/tegra124/dp.c +++ b/drivers/video/tegra124/dp.c @@ -1609,6 +1609,7 @@ static int dp_tegra_probe(struct udevice *dev) static const struct udevice_id tegra_dp_ids[] = { { .compatible = "nvidia,tegra124-dpaux" }, + { .compatible = "nvidia,tegra210-dpaux" }, { } }; |