mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-11-29 14:41:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

imx: ventana: fix usage of dt paths with leading 0s (Linux 4.15+)

Browse Source 
device-tree paths should never be used that reference node addresses
making an assumption about leading zeros. They should not be there per
the device-tree specification however they have been there until Linux
4.15 when they were removed via kernel commit
8dccafaa281aa1d240a58bbcdff338aec114a021.

This fixes various issues which will occur when using Linux 4.15+
that are being fixed up on a per model per PCB revision basis such as:
 - enabling MMC UHS-I on board revisions that support it
 - enabling PWM based on hwconfig
 - fixing PCIe reset on GW552x
 - removing cpu external watchdog reset on boards that do not support it
 - populate PCI dt nodes based on PCI scan in order to fix GW16082
   interrupt mapping and inject MAC address for PCI based GbE

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
This commit is contained in:
Tim Harvey 2019-02-04 13:11:00 -08:00 committed by Stefano Babic
parent ad2efa3a28
commit 1d23f7b1ae
1 changed files with 41 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
board/gateworks/gw_ventana/gw_ventana.c
View File

@ -879,34 +879,12 @@ static int ft_sethdmiinfmt(void *blob, char *mode)
return 0; return 0;
} }
/* enable a property of a node if the node is found */
static inline void ft_enable_path(void *blob, const char *path)
{
int i = fdt_path_offset(blob, path);
if (i >= 0) {
debug("enabling %s\n", path);
fdt_status_okay(blob, i);
}
}
/* remove a property of a node if the node is found */
static inline void ft_delprop_path(void *blob, const char *path,
const char *name)
{
int i = fdt_path_offset(blob, path);
if (i) {
debug("removing %s/%s\n", path, name);
fdt_delprop(blob, i, name);
}
}
#if defined(CONFIG_CMD_PCI) #if defined(CONFIG_CMD_PCI)
#define PCI_ID(x) ( \ #define PCI_ID(x) ( \
(PCI_BUS(x->devfn)<<16)| \ (PCI_BUS(x->devfn)<<16)| \
(PCI_DEV(x->devfn)<<11)| \ (PCI_DEV(x->devfn)<<11)| \
(PCI_FUNC(x->devfn)<<8) \ (PCI_FUNC(x->devfn)<<8) \
) )
#define PCIE_PATH "/soc/pcie@0x01000000"
int fdt_add_pci_node(void *blob, int par, struct pci_dev *dev) int fdt_add_pci_node(void *blob, int par, struct pci_dev *dev)
{ {
uint32_t reg[5]; uint32_t reg[5];
@ -939,7 +917,7 @@ int fdt_add_pci_path(void *blob, struct pci_dev *dev)
int k, np; int k, np;
/* build list of parents */ /* build list of parents */
np = fdt_path_offset(blob, PCIE_PATH); np = fdt_node_offset_by_compatible(blob, -1, "fsl,imx6q-pcie");
if (np < 0) if (np < 0)
return np; return np;
@ -976,7 +954,7 @@ int fdt_fixup_gw16082(void *blob, int np, struct pci_dev *dev)
int i; int i;
/* build irq-map based on host controllers map */ /* build irq-map based on host controllers map */
host = fdt_path_offset(blob, PCIE_PATH); host = fdt_node_offset_by_compatible(blob, -1, "fsl,imx6q-pcie");
if (host < 0) { if (host < 0) {
printf(" %s failed: missing host\n", __func__); printf(" %s failed: missing host\n", __func__);
return host; return host;
@ -1118,10 +1096,14 @@ void ft_board_pci_fixup(void *blob, bd_t *bd)
} }
#endif /* if defined(CONFIG_CMD_PCI) */ #endif /* if defined(CONFIG_CMD_PCI) */
void ft_board_wdog_fixup(void *blob, const char *path) void ft_board_wdog_fixup(void *blob, phys_addr_t addr)
{ {
ft_delprop_path(blob, path, "ext-reset-output"); int off = fdt_node_offset_by_compat_reg(blob, "fsl,imx6q-wdt", addr);
ft_delprop_path(blob, path, "fsl,ext-reset-output");
if (off) {
fdt_delprop(blob, off, "ext-reset-output");
fdt_delprop(blob, off, "fsl,ext-reset-output");
}
} }
/* /*
@ -1133,10 +1115,11 @@ void ft_board_wdog_fixup(void *blob, const char *path)
* - board (full model from EEPROM) * - board (full model from EEPROM)
* - peripherals removed from DTB if not loaded on board (per EEPROM config) * - peripherals removed from DTB if not loaded on board (per EEPROM config)
*/ */
#define UART1_PATH "/soc/aips-bus@02100000/serial@021ec000" #define WDOG1_ADDR 0x20bc000
#define WDOG1_PATH "/soc/aips-bus@02000000/wdog@020bc000" #define WDOG2_ADDR 0x20c0000
#define WDOG2_PATH "/soc/aips-bus@02000000/wdog@020c0000" #define GPIO3_ADDR 0x20a4000
#define GPIO3_PATH "/soc/aips-bus@02000000/gpio@020a4000" #define USDHC3_ADDR 0x2198000
#define PWM0_ADDR 0x2080000
int ft_board_setup(void *blob, bd_t *bd) int ft_board_setup(void *blob, bd_t *bd)
{ {
struct ventana_board_info *info = &ventana_info; struct ventana_board_info *info = &ventana_info;
@ -1199,14 +1182,15 @@ int ft_board_setup(void *blob, bd_t *bd)
* errata causing wdog timer to be unreliable. * errata causing wdog timer to be unreliable.
*/ */
if (rev >= 'A' && rev < 'C') { if (rev >= 'A' && rev < 'C') {
i = fdt_path_offset(blob, WDOG1_PATH); i = fdt_node_offset_by_compat_reg(blob, "fsl,imx6q-wdt",
WDOG1_ADDR);
if (i) if (i)
fdt_status_disabled(blob, i); fdt_status_disabled(blob, i);
} }
/* GW51xx-E adds WDOG1_B external reset */ /* GW51xx-E adds WDOG1_B external reset */
if (rev < 'E') if (rev < 'E')
ft_board_wdog_fixup(blob, WDOG1_PATH); ft_board_wdog_fixup(blob, WDOG1_ADDR);
break; break;
case GW52xx: case GW52xx:
@ -1222,7 +1206,8 @@ int ft_board_setup(void *blob, bd_t *bd)
"reset-gpio", NULL); "reset-gpio", NULL);
if (range) { if (range) {
i = fdt_path_offset(blob, GPIO3_PATH); i = fdt_node_offset_by_compat_reg(blob,
"fsl,imx6q-gpio", GPIO3_ADDR);
if (i) if (i)
handle = fdt_get_phandle(blob, i); handle = fdt_get_phandle(blob, i);
if (handle) { if (handle) {
@ -1237,18 +1222,19 @@ int ft_board_setup(void *blob, bd_t *bd)
gpio_cfg[board_type].usd_vsel = 0; gpio_cfg[board_type].usd_vsel = 0;
/* GW522x-B adds WDOG1_B external reset */ /* GW522x-B adds WDOG1_B external reset */
ft_board_wdog_fixup(blob, WDOG1_PATH); if (rev < 'B')
ft_board_wdog_fixup(blob, WDOG1_ADDR);
} }
/* GW520x-E adds WDOG1_B external reset */ /* GW520x-E adds WDOG1_B external reset */
else if (info->model[4] == '0' && rev < 'E') else if (info->model[4] == '0' && rev < 'E')
ft_board_wdog_fixup(blob, WDOG1_PATH); ft_board_wdog_fixup(blob, WDOG1_ADDR);
break; break;
case GW53xx: case GW53xx:
/* GW53xx-E adds WDOG1_B external reset */ /* GW53xx-E adds WDOG1_B external reset */
if (rev < 'E') if (rev < 'E')
ft_board_wdog_fixup(blob, WDOG1_PATH); ft_board_wdog_fixup(blob, WDOG1_ADDR);
break; break;
case GW54xx: case GW54xx:
@ -1256,13 +1242,12 @@ int ft_board_setup(void *blob, bd_t *bd)
* disable serial2 node for GW54xx for compatibility with older * disable serial2 node for GW54xx for compatibility with older
* 3.10.x kernel that improperly had this node enabled in the DT * 3.10.x kernel that improperly had this node enabled in the DT
*/ */
i = fdt_path_offset(blob, UART1_PATH); fdt_set_status_by_alias(blob, "serial2", FDT_STATUS_DISABLED,
if (i) 0);
fdt_del_node(blob, i);
/* GW54xx-E adds WDOG2_B external reset */ /* GW54xx-E adds WDOG2_B external reset */
if (rev < 'E') if (rev < 'E')
ft_board_wdog_fixup(blob, WDOG2_PATH); ft_board_wdog_fixup(blob, WDOG2_ADDR);
break; break;
case GW551x: case GW551x:
@ -1311,13 +1296,13 @@ int ft_board_setup(void *blob, bd_t *bd)
/* GW551x-C adds WDOG1_B external reset */ /* GW551x-C adds WDOG1_B external reset */
if (rev < 'C') if (rev < 'C')
ft_board_wdog_fixup(blob, WDOG1_PATH); ft_board_wdog_fixup(blob, WDOG1_ADDR);
break; break;
case GW5901: case GW5901:
case GW5902: case GW5902:
/* GW5901/GW5901 revB adds WDOG1_B as an external reset */ /* GW5901/GW5901 revB adds WDOG1_B as an external reset */
if (rev < 'B') if (rev < 'B')
ft_board_wdog_fixup(blob, WDOG1_PATH); ft_board_wdog_fixup(blob, WDOG1_ADDR);
break; break;
} }
@ -1331,20 +1316,27 @@ int ft_board_setup(void *blob, bd_t *bd)
continue; continue;
if (hwconfig_subarg_cmp(arg, "mode", "pwm") && cfg->pwm_param) if (hwconfig_subarg_cmp(arg, "mode", "pwm") && cfg->pwm_param)
{ {
char path[48]; phys_addr_t addr;
sprintf(path, "/soc/aips-bus@02000000/pwm@%08x", int off;
0x02080000 + (0x4000 * (cfg->pwm_param - 1)));
printf(" Enabling pwm%d for DIO%d\n", printf(" Enabling pwm%d for DIO%d\n",
cfg->pwm_param, i); cfg->pwm_param, i);
ft_enable_path(blob, path); addr = PWM0_ADDR + (0x4000 * (cfg->pwm_param - 1));
off = fdt_node_offset_by_compat_reg(blob,
"fsl,imx6q-pwm",
addr);
if (off)
fdt_status_okay(blob, off);
} }
} }
/* remove no-1-8-v if UHS-I support is present */ /* remove no-1-8-v if UHS-I support is present */
if (gpio_cfg[board_type].usd_vsel) { if (gpio_cfg[board_type].usd_vsel) {
debug("Enabling UHS-I support\n"); debug("Enabling UHS-I support\n");
ft_delprop_path(blob, "/soc/aips-bus@02100000/usdhc@02198000", i = fdt_node_offset_by_compat_reg(blob, "fsl,imx6q-usdhc",
"no-1-8-v"); USDHC3_ADDR);
if (i)
fdt_delprop(blob, i, "no-1-8-v");
} }
#if defined(CONFIG_CMD_PCI) #if defined(CONFIG_CMD_PCI)