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: update imx wdog external reset dt property

Browse Source 
Early backports of the imx wdog external reset feature occured before the
property was accepted upstream and used 'ext-reset-output' instead of
'fsl,ext-reset-output'. In order to support older kernels remove both
properties.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
This commit is contained in:
Tim Harvey 2017-05-15 10:05:07 -07:00 committed by Stefano Babic
parent 27388d561c
commit 9f0a3ac1b2
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1090,6 +1090,12 @@ 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)
{
ft_delprop_path(blob, path, "ext-reset-output");
ft_delprop_path(blob, path, "fsl,ext-reset-output");
}
/* /*
* called prior to booting kernel or by 'fdt boardsetup' command * called prior to booting kernel or by 'fdt boardsetup' command
* *
@ -1172,8 +1178,7 @@ int ft_board_setup(void *blob, bd_t *bd)
/* GW51xx-E adds WDOG1_B external reset */ /* GW51xx-E adds WDOG1_B external reset */
if (rev < 'E') if (rev < 'E')
ft_delprop_path(blob, WDOG1_PATH, ft_board_wdog_fixup(blob, WDOG1_PATH);
"fsl,ext-reset-output");
break; break;
case GW52xx: case GW52xx:
@ -1204,22 +1209,18 @@ 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_delprop_path(blob, WDOG1_PATH, ft_board_wdog_fixup(blob, WDOG1_PATH);
"fsl,ext-reset-output");
} }
/* 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_delprop_path(blob, WDOG1_PATH, ft_board_wdog_fixup(blob, WDOG1_PATH);
"fsl,ext-reset-output");
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_delprop_path(blob, WDOG1_PATH, ft_board_wdog_fixup(blob, WDOG1_PATH);
"fsl,ext-reset-output");
break; break;
case GW54xx: case GW54xx:
@ -1233,8 +1234,7 @@ int ft_board_setup(void *blob, bd_t *bd)
/* GW54xx-E adds WDOG2_B external reset */ /* GW54xx-E adds WDOG2_B external reset */
if (rev < 'E') if (rev < 'E')
ft_delprop_path(blob, WDOG2_PATH, ft_board_wdog_fixup(blob, WDOG2_PATH);
"fsl,ext-reset-output");
break; break;
case GW551x: case GW551x:
@ -1283,8 +1283,7 @@ 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_delprop_path(blob, WDOG1_PATH, ft_board_wdog_fixup(blob, WDOG1_PATH);
"fsl,ext-reset-output");
break; break;
} }