Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-tegra

Browse source 
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-06-14 12:28:58 -04:00
commit c1d9020cc7
8 changed files with 89 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/mach-tegra/xusb-padctl-common.c
View file

@ -84,7 +84,7 @@ tegra_xusb_padctl_group_parse_dt(struct tegra_xusb_padctl *padctl,
len = ofnode_read_string_count(node, "nvidia,lanes");
if (len < 0) {
pr_err("failed to parse \"nvidia,lanes\" property");
pr_err("failed to parse \"nvidia,lanes\" property\n");
return -EINVAL;
}
@ -94,7 +94,7 @@ tegra_xusb_padctl_group_parse_dt(struct tegra_xusb_padctl *padctl,
ret = ofnode_read_string_index(node, "nvidia,lanes", i,
&group->pins[i]);
if (ret) {
pr_err("failed to read string from \"nvidia,lanes\" property");
pr_err("failed to read string from \"nvidia,lanes\" property\n");
return -EINVAL;
}
}
@ -104,7 +104,7 @@ tegra_xusb_padctl_group_parse_dt(struct tegra_xusb_padctl *padctl,
ret = ofnode_read_string_index(node, "nvidia,function", 0,
&group->func);
if (ret) {
pr_err("failed to parse \"nvidia,func\" property");
pr_err("failed to parse \"nvidia,func\" property\n");
return -EINVAL;
}
@ -232,7 +232,7 @@ tegra_xusb_padctl_config_parse_dt(struct tegra_xusb_padctl *padctl,
err = tegra_xusb_padctl_group_parse_dt(padctl, group, subnode);
if (err < 0) {
pr_err("failed to parse group %s", group->name);
pr_err("failed to parse group %s\n", group->name);
return err;
}
@ -261,7 +261,7 @@ static int tegra_xusb_padctl_parse_dt(struct tegra_xusb_padctl *padctl,
err = tegra_xusb_padctl_config_parse_dt(padctl, config,
subnode);
if (err < 0) {
pr_err("failed to parse entry %s: %d",
pr_err("failed to parse entry %s: %d\n",
config->name, err);
continue;
}
@ -289,7 +289,7 @@ int tegra_xusb_process_nodes(ofnode nodes[], unsigned int count,
err = tegra_xusb_padctl_parse_dt(&padctl, nodes[i]);
if (err < 0) {
pr_err("failed to parse DT: %d", err);
pr_err("failed to parse DT: %d\n", err);
continue;
}

19
board/toradex/apalis-tk1/apalis-tk1.c
View file

@ -14,6 +14,7 @@
#include <asm/arch/gpio.h>
#include <asm/arch/pinmux.h>
#include <env_internal.h>
#include <fdt_support.h>
#include <pci_tegra.h>
#include <linux/delay.h>
#include <power/as3722.h>
@ -99,6 +100,24 @@ int checkboard(void)
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{
u8 enetaddr[6];
/* MAC addr */
if (eth_env_get_enetaddr("ethaddr", enetaddr)) {
int err = fdt_find_and_setprop(blob,
"/pcie@1003000/pci@2,0/ethernet@0,0",
"local-mac-address", enetaddr, 6, 0);
/* Older device trees might have used a different node name */
if (err < 0)
err = fdt_find_and_setprop(blob,
"/pcie@1003000/pci@2,0/pcie@0",
"local-mac-address", enetaddr, 6, 0);
if (err >= 0)
puts(" MAC address updated...\n");
}
return ft_common_board_setup(blob, bd);
}
#endif

20
board/toradex/apalis_t30/apalis_t30.c
View file

@ -5,6 +5,7 @@
*/
#include <common.h>
#include <env.h>
#include <init.h>
#include <log.h>
#include <asm/arch/gp_padctrl.h>
@ -16,6 +17,7 @@
#include <asm/io.h>
#include <dm.h>
#include <i2c.h>
#include <fdt_support.h>
#include <pci_tegra.h>
#include <linux/delay.h>
#include "../common/tdx-common.h"
@ -54,6 +56,24 @@ int checkboard(void)
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{
u8 enetaddr[6];
/* MAC addr */
if (eth_env_get_enetaddr("ethaddr", enetaddr)) {
int err = fdt_find_and_setprop(blob,
"/pcie@3000/pci@3,0/ethernet@0,0",
"local-mac-address", enetaddr, 6, 0);
/* Older device trees might have used a different node name */
if (err < 0)
err = fdt_find_and_setprop(blob,
"/pcie@3000/pci@3,0/pcie@0",
"local-mac-address", enetaddr, 6, 0);
if (err >= 0)
puts(" MAC address updated...\n");
}
return ft_common_board_setup(blob, bd);
}
#endif

20
board/toradex/colibri_t20/colibri_t20.c
View file

@ -4,6 +4,8 @@
*/
#include <common.h>
#include <env.h>
#include <fdt_support.h>
#include <init.h>
#include <log.h>
#include <asm/arch/clock.h>
@ -81,6 +83,24 @@ int checkboard(void)
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{
u8 enetaddr[6];
/* MAC addr */
if (eth_env_get_enetaddr("ethaddr", enetaddr)) {
int err = fdt_find_and_setprop(blob,
"/usb@7d004000/ethernet@1",
"local-mac-address", enetaddr, 6, 0);
/* Older device trees might have used a different node name */
if (err < 0)
err = fdt_find_and_setprop(blob,
"/usb@7d004000/asix@1",
"local-mac-address", enetaddr, 6, 0);
if (err >= 0)
puts(" MAC address updated...\n");
}
return ft_common_board_setup(blob, bd);
}
#endif

20
board/toradex/colibri_t30/colibri_t30.c
View file

@ -5,6 +5,7 @@
*/
#include <common.h>
#include <env.h>
#include <init.h>
#include <asm/arch/gp_padctrl.h>
#include <asm/arch/pinmux.h>
@ -12,6 +13,7 @@
#include <asm/arch-tegra/tegra.h>
#include <asm/gpio.h>
#include <asm/io.h>
#include <fdt_support.h>
#include <i2c.h>
#include <linux/delay.h>
#include "pinmux-config-colibri_t30.h"
@ -36,6 +38,24 @@ int checkboard(void)
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{
u8 enetaddr[6];
/* MAC addr */
if (eth_env_get_enetaddr("ethaddr", enetaddr)) {
int err = fdt_find_and_setprop(blob,
"/usb@7d004000/ethernet@1",
"local-mac-address", enetaddr, 6, 0);
/* Older device trees might have used a different node name */
if (err < 0)
err = fdt_find_and_setprop(blob,
"/usb@7d004000/asix@1",
"local-mac-address", enetaddr, 6, 0);
if (err >= 0)
puts(" MAC address updated...\n");
}
return ft_common_board_setup(blob, bd);
}
#endif

1
drivers/i2c/tegra_i2c.c
View file

@ -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 },
{ }

4
drivers/pci/pci_tegra.c
View file

@ -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;
}

1
drivers/video/tegra124/dp.c
View file

@ -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" },
{ }
};