UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Few improvments for GPMC (General Purpose Memory Controller) 

found on TI SoCs to produce an error for missing bank-width
 and to make the bootloader timing debug output usable for
 device tree timings.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAlk37z4RHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXMnnQ//Q9/U0t9XRtdEh1AxwTkApu4iYg4+uoxD
 kGNtVXsqv24O/WpPOTOUyIv8Q3iI4cjDB0MNqDtyBJeh6jmf6qRdLnc7tIzvfw5n
 5BR94H5CTRLbxd8dV2qzqX+mOu+/n3c/tetVBdnwnJRIyxIgTr5BIAH5Cphs3HZR
 rCQ7KtRs3cToq1P5RcQasO65PSPSflJE1dlB4We+9TyKsiO74l7s4QLBkNG7A500
 bkgr1wtRXtO2v2socJAHy4sU038M/bO+bFRsF78K9s3tmxenKZItxtpaHIfocC5K
 HcfwEm8HlxR6KhQCjtBqZfu4EmcMclqYgq1hahyedx0mU98XBr6goPzjgE64DFLJ
 KWoFVtn5xYx+s1nQhV68GYRX7RzRZWAQ2JXEVOVaCrPaIFlHrkDt6tCROjk+AI15
 PvLuNl08dfYJgg3lUJXpUuVP39TzVW+0NIESS1hCoPIuZ68SD45RaVs+wzRzJeLt
 xPSEfDvbv30bSDzOZzQmmdUBB/lziYQ478x8Ztt8f0IKFOOYR3RrZl08kuXcnxsP
 CE79y/wTcc8WM23Sw/vBq5LcDwrWrYCcjaGPGGB0/9VsAWX+XkgZagy3NsdCQW6G
 TT+xQFos6MkwbPG4Wlwb/Gd90T0WdUnHTzFqFTlP8lMn1PbHeBoh1bwdEmxjaSao
 c2Xryn3UkpI=
 =6p9V
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.13/gpmc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers

Few improvments for GPMC (General Purpose Memory Controller)
found on TI SoCs to produce an error for missing bank-width
and to make the bootloader timing debug output usable for
device tree timings.

* tag 'omap-for-v4.13/gpmc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  memory: omap-gpmc: add error message if bank-width property is absent
  memory: omap-gpmc: make dts snippet include semicolon

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-06-18 18:55:59 -07:00
parent 5ed02dbb49 c9eabf40d9
commit cd8eb6291d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/memory/omap-gpmc.c
View File

@ -460,12 +460,12 @@ static int get_gpmc_timing_reg(
if (l)
time_ns_min = gpmc_clk_ticks_to_ns(l - 1, cs, cd) + 1;
time_ns = gpmc_clk_ticks_to_ns(l, cs, cd);
pr_info("gpmc,%s = <%u> /* %u ns - %u ns; %i ticks%s*/\n",
pr_info("gpmc,%s = <%u>; /* %u ns - %u ns; %i ticks%s*/\n",
name, time_ns, time_ns_min, time_ns, l,
invalid ? "; invalid " : " ");
} else {
/* raw format */
pr_info("gpmc,%s = <%u>%s\n", name, l,
pr_info("gpmc,%s = <%u>;%s\n", name, l,
invalid ? " /* invalid */" : "");
}
@ -2083,8 +2083,11 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
} else {
ret = of_property_read_u32(child, "bank-width",
&gpmc_s.device_width);
if (ret < 0)
if (ret < 0) {
dev_err(&pdev->dev, "%s has no 'bank-width' property\n",
child->full_name);
goto err;
}
}
/* Reserve wait pin if it is required and valid */