|
@@ -967,16 +967,6 @@ void ft_board_pci_fixup(void *blob, struct bd_info *bd)
|
|
|
}
|
|
|
#endif /* if defined(CONFIG_CMD_PCI) */
|
|
|
|
|
|
-void ft_board_wdog_fixup(void *blob, phys_addr_t addr)
|
|
|
-{
|
|
|
- int off = fdt_node_offset_by_compat_reg(blob, "fsl,imx6q-wdt", addr);
|
|
|
-
|
|
|
- if (off) {
|
|
|
- fdt_delprop(blob, off, "ext-reset-output");
|
|
|
- fdt_delprop(blob, off, "fsl,ext-reset-output");
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
/*
|
|
|
* called prior to booting kernel or by 'fdt boardsetup' command
|
|
|
*
|
|
@@ -986,10 +976,6 @@ void ft_board_wdog_fixup(void *blob, phys_addr_t addr)
|
|
|
* - board (full model from EEPROM)
|
|
|
* - peripherals removed from DTB if not loaded on board (per EEPROM config)
|
|
|
*/
|
|
|
-#define WDOG1_ADDR 0x20bc000
|
|
|
-#define WDOG2_ADDR 0x20c0000
|
|
|
-#define GPIO3_ADDR 0x20a4000
|
|
|
-#define USDHC3_ADDR 0x2198000
|
|
|
#define PWM0_ADDR 0x2080000
|
|
|
int ft_board_setup(void *blob, struct bd_info *bd)
|
|
|
{
|
|
@@ -1043,139 +1029,8 @@ int ft_board_setup(void *blob, struct bd_info *bd)
|
|
|
/* set desired digital video capture format */
|
|
|
ft_sethdmiinfmt(blob, env_get("hdmiinfmt"));
|
|
|
|
|
|
- /*
|
|
|
- * Board model specific fixups
|
|
|
- */
|
|
|
- switch (board_type) {
|
|
|
- case GW51xx:
|
|
|
- /*
|
|
|
- * disable wdog node for GW51xx-A/B to work around
|
|
|
- * errata causing wdog timer to be unreliable.
|
|
|
- */
|
|
|
- if (rev >= 'A' && rev < 'C') {
|
|
|
- i = fdt_node_offset_by_compat_reg(blob, "fsl,imx6q-wdt",
|
|
|
- WDOG1_ADDR);
|
|
|
- if (i)
|
|
|
- fdt_status_disabled(blob, i);
|
|
|
- }
|
|
|
-
|
|
|
- /* GW51xx-E adds WDOG1_B external reset */
|
|
|
- if (rev < 'E')
|
|
|
- ft_board_wdog_fixup(blob, WDOG1_ADDR);
|
|
|
- break;
|
|
|
-
|
|
|
- case GW52xx:
|
|
|
- /* GW522x Uses GPIO3_IO23 instead of GPIO1_IO29 */
|
|
|
- if (info->model[4] == '2') {
|
|
|
- u32 handle = 0;
|
|
|
- u32 *range = NULL;
|
|
|
-
|
|
|
- i = fdt_node_offset_by_compatible(blob, -1,
|
|
|
- "fsl,imx6q-pcie");
|
|
|
- if (i)
|
|
|
- range = (u32 *)fdt_getprop(blob, i,
|
|
|
- "reset-gpio", NULL);
|
|
|
-
|
|
|
- if (range) {
|
|
|
- i = fdt_node_offset_by_compat_reg(blob,
|
|
|
- "fsl,imx6q-gpio", GPIO3_ADDR);
|
|
|
- if (i)
|
|
|
- handle = fdt_get_phandle(blob, i);
|
|
|
- if (handle) {
|
|
|
- range[0] = cpu_to_fdt32(handle);
|
|
|
- range[1] = cpu_to_fdt32(23);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- /* these have broken usd_vsel */
|
|
|
- if (strstr((const char *)info->model, "SP318-B") ||
|
|
|
- strstr((const char *)info->model, "SP331-B"))
|
|
|
- gpio_cfg[board_type].usd_vsel = 0;
|
|
|
-
|
|
|
- /* GW522x-B adds WDOG1_B external reset */
|
|
|
- if (rev < 'B')
|
|
|
- ft_board_wdog_fixup(blob, WDOG1_ADDR);
|
|
|
- }
|
|
|
-
|
|
|
- /* GW520x-E adds WDOG1_B external reset */
|
|
|
- else if (info->model[4] == '0' && rev < 'E')
|
|
|
- ft_board_wdog_fixup(blob, WDOG1_ADDR);
|
|
|
- break;
|
|
|
-
|
|
|
- case GW53xx:
|
|
|
- /* GW53xx-E adds WDOG1_B external reset */
|
|
|
- if (rev < 'E')
|
|
|
- ft_board_wdog_fixup(blob, WDOG1_ADDR);
|
|
|
- break;
|
|
|
-
|
|
|
- case GW54xx:
|
|
|
- /*
|
|
|
- * disable serial2 node for GW54xx for compatibility with older
|
|
|
- * 3.10.x kernel that improperly had this node enabled in the DT
|
|
|
- */
|
|
|
- fdt_set_status_by_alias(blob, "serial2", FDT_STATUS_DISABLED,
|
|
|
- 0);
|
|
|
-
|
|
|
- /* GW54xx-E adds WDOG2_B external reset */
|
|
|
- if (rev < 'E')
|
|
|
- ft_board_wdog_fixup(blob, WDOG2_ADDR);
|
|
|
- break;
|
|
|
-
|
|
|
- case GW551x:
|
|
|
- /*
|
|
|
- * isolate CSI0_DATA_EN for GW551x-A to work around errata
|
|
|
- * causing non functional digital video in (it is not hooked up)
|
|
|
- */
|
|
|
- if (rev == 'A') {
|
|
|
- u32 *range = NULL;
|
|
|
- int len;
|
|
|
- const u32 *handle = NULL;
|
|
|
-
|
|
|
- i = fdt_node_offset_by_compatible(blob, -1,
|
|
|
- "fsl,imx-tda1997x-video");
|
|
|
- if (i)
|
|
|
- handle = fdt_getprop(blob, i, "pinctrl-0",
|
|
|
- NULL);
|
|
|
- if (handle)
|
|
|
- i = fdt_node_offset_by_phandle(blob,
|
|
|
- fdt32_to_cpu(*handle));
|
|
|
- if (i)
|
|
|
- range = (u32 *)fdt_getprop(blob, i, "fsl,pins",
|
|
|
- &len);
|
|
|
- if (range) {
|
|
|
- len /= sizeof(u32);
|
|
|
- for (i = 0; i < len; i += 6) {
|
|
|
- u32 mux_reg = fdt32_to_cpu(range[i+0]);
|
|
|
- u32 conf_reg = fdt32_to_cpu(range[i+1]);
|
|
|
- /* mux PAD_CSI0_DATA_EN to GPIO */
|
|
|
- if (is_cpu_type(MXC_CPU_MX6Q) &&
|
|
|
- mux_reg == 0x260 &&
|
|
|
- conf_reg == 0x630)
|
|
|
- range[i+3] = cpu_to_fdt32(0x5);
|
|
|
- else if (!is_cpu_type(MXC_CPU_MX6Q) &&
|
|
|
- mux_reg == 0x08c &&
|
|
|
- conf_reg == 0x3a0)
|
|
|
- range[i+3] = cpu_to_fdt32(0x5);
|
|
|
- }
|
|
|
- fdt_setprop_inplace(blob, i, "fsl,pins", range,
|
|
|
- len);
|
|
|
- }
|
|
|
-
|
|
|
- /* set BT656 video format */
|
|
|
- ft_sethdmiinfmt(blob, "yuv422bt656");
|
|
|
- }
|
|
|
-
|
|
|
- /* GW551x-C adds WDOG1_B external reset */
|
|
|
- if (rev < 'C')
|
|
|
- ft_board_wdog_fixup(blob, WDOG1_ADDR);
|
|
|
- break;
|
|
|
- case GW5901:
|
|
|
- case GW5902:
|
|
|
- /* GW5901/GW5901 revB adds WDOG1_B as an external reset */
|
|
|
- if (rev < 'B')
|
|
|
- ft_board_wdog_fixup(blob, WDOG1_ADDR);
|
|
|
- break;
|
|
|
- }
|
|
|
+ /* early board/revision ft fixups */
|
|
|
+ ft_early_fixup(blob, board_type);
|
|
|
|
|
|
/* Configure DIO */
|
|
|
for (i = 0; i < gpio_cfg[board_type].dio_num; i++) {
|
|
@@ -1201,15 +1056,6 @@ int ft_board_setup(void *blob, struct bd_info *bd)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /* remove no-1-8-v if UHS-I support is present */
|
|
|
- if (gpio_cfg[board_type].usd_vsel) {
|
|
|
- debug("Enabling UHS-I support\n");
|
|
|
- i = fdt_node_offset_by_compat_reg(blob, "fsl,imx6q-usdhc",
|
|
|
- USDHC3_ADDR);
|
|
|
- if (i)
|
|
|
- fdt_delprop(blob, i, "no-1-8-v");
|
|
|
- }
|
|
|
-
|
|
|
#if defined(CONFIG_CMD_PCI)
|
|
|
if (!env_get("nopcifixup"))
|
|
|
ft_board_pci_fixup(blob, bd);
|