diff options
| author | gonzo <gonzo@FreeBSD.org> | 2017-01-06 22:46:02 +0000 |
|---|---|---|
| committer | gonzo <gonzo@FreeBSD.org> | 2017-01-06 22:46:02 +0000 |
| commit | 51a0a84c67695d93803129d2a5a4527fb37a7b68 (patch) | |
| tree | 9ac97a1d6d8992e8d1a7c14586daff7b063e975f /sys/arm/freescale | |
| parent | 1d1aa111885000c9d543e32d0ccd0b4766185756 (diff) | |
| download | FreeBSD-src-51a0a84c67695d93803129d2a5a4527fb37a7b68.zip FreeBSD-src-51a0a84c67695d93803129d2a5a4527fb37a7b68.tar.gz | |
MFC r309999, r310012
r309999:
[iMX6] Fix platform compatibility string for i.MX6 Dual
i.MX6 Dual boot was broken since r308533 because ofw_bus_node_is_compatible
is more strict than fdt_is_compatible and does not accept partial matches
r310012:
[iMX6] Add compatibility string for GPT timer on i.MX6 Dual
Up until r295436 GPT timer in i.MX6 Dual dts used the same compatiblity
string as i.MX6 Quad. After the sync up with Linux in r295436, GPT timer
stopped getting attached on the i.MX6 Dual
Diffstat (limited to 'sys/arm/freescale')
| -rw-r--r-- | sys/arm/freescale/imx/imx6_machdep.c | 2 | ||||
| -rw-r--r-- | sys/arm/freescale/imx/imx_gpt.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c index 7a4311d..2379810 100644 --- a/sys/arm/freescale/imx/imx6_machdep.c +++ b/sys/arm/freescale/imx/imx6_machdep.c @@ -355,5 +355,5 @@ static platform_method_t imx6_methods[] = { }; FDT_PLATFORM_DEF2(imx6, imx6s, "i.MX6 Solo", 0, "fsl,imx6s", 0); -FDT_PLATFORM_DEF2(imx6, imx6d, "i.MX6 Dual", 0, "fsl,imx6d", 0); +FDT_PLATFORM_DEF2(imx6, imx6d, "i.MX6 Dual", 0, "fsl,imx6dl", 0); FDT_PLATFORM_DEF2(imx6, imx6q, "i.MX6 Quad", 0, "fsl,imx6q", 0); diff --git a/sys/arm/freescale/imx/imx_gpt.c b/sys/arm/freescale/imx/imx_gpt.c index 8da0b2e..70d729a 100644 --- a/sys/arm/freescale/imx/imx_gpt.c +++ b/sys/arm/freescale/imx/imx_gpt.c @@ -107,6 +107,7 @@ static struct resource_spec imx_gpt_spec[] = { }; static struct ofw_compat_data compat_data[] = { + {"fsl,imx6dl-gpt", 1}, {"fsl,imx6q-gpt", 1}, {"fsl,imx53-gpt", 1}, {"fsl,imx51-gpt", 1}, |
