openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

A fix and a clean-up patch for content previously queued for v4.17. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJavJ0dAAoJEGFBu2jqvgRNe+AQAI+hMIdp+0l3KRxz6sukAU8D
 dlJNPObivN2awJAiin+cMRMWmOJetSJOaNtO/a+KC9I9hzRGoQtJ8EXkBZpf0jP/
 KjU/Dx/EZt2jx1YSTLXKnO13GaNFKpR4RemFVVa5BlpX2wpXKFfRQE2eqZkdAPau
 762ZOZjxRnAVpVAdbQ6K9bI0YJsherXVRjISMf3w6HlLgkM73ow9YsZjG5WGbTYU
 fBRAwLQ3EPePVZXBSxvMwcBW/Wooih3YPzbX78/s0u2nVBCmgouj6C7KwSHoUBGh
 d38AlsquU/jyVIYqwIzYU9TcGCbKFt+HIJ/Wgkl9qSbrXmsubWD7ujOMMaW5B2uY
 wOGqPsagE+ij37GqobvvXtdegSirv01GwHOMUCI8/xvwklWkSRyta9OrCTkj6KkU
 3dv41u6KYUoYv7y70IO/r4kAev4onzHQjdUm3d3ELlLXDZYimv41JvBP7oqWGG/m
 jk0S5SUVt+0idY74DIUZyHTlEqMfNez3gR/N1LMDmZIbnFYL3PXQiWuwWnOrJTIA
 +ZVqyS78x5F0IjQpk0TbL7/R4lYz3R1j+FMgpaiZL8tqChaa/xbD00ybjNp8iuYn
 v3MVFEPRIYwhNzfeLQ74ZNFMlX9FoP+AC9AGbz44dKWa91pxSyQbldt73phoRDZQ
 Zvp8ODuDT7dEjBBo9i6+
 =9vcj
 -----END PGP SIGNATURE-----

Merge tag 'davinci-for-v4.17/soc-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

Pull "DaVinci SoC update fixes for v4.17" from Sekhar Nori:

A fix and a clean-up patch for content previously queued for v4.17.

* tag 'davinci-for-v4.17/soc-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: da8xx: simplify CFGCHIP regmap_config
  ARM: davinci: da8xx: fix oops in USB PHY driver due to stack allocated platform_data
This commit is contained in:
Arnd Bergmann 2018-04-05 11:09:02 +02:00
parent bc52497a59 f6adc9fd1f
commit 04a2c2efbf
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-davinci/devices-da8xx.c
View File

@ -1106,11 +1106,8 @@ int __init da850_register_sata(unsigned long refclkpn)
static struct regmap *da8xx_cfgchip; static struct regmap *da8xx_cfgchip;
/* regmap doesn't make a copy of this, so we need to keep the pointer around */
static const char da8xx_cfgchip_name[] = "cfgchip";
static const struct regmap_config da8xx_cfgchip_config __initconst = { static const struct regmap_config da8xx_cfgchip_config __initconst = {
.name = da8xx_cfgchip_name, .name = "cfgchip",
.reg_bits = 32, .reg_bits = 32,
.val_bits = 32, .val_bits = 32,
.reg_stride = 4, .reg_stride = 4,

8
arch/arm/mach-davinci/usb-da8xx.c
View File

@ -26,6 +26,8 @@
static struct clk *usb20_clk; static struct clk *usb20_clk;
static struct da8xx_usb_phy_platform_data da8xx_usb_phy_pdata;
static struct platform_device da8xx_usb_phy = { static struct platform_device da8xx_usb_phy = {
.name = "da8xx-usb-phy", .name = "da8xx-usb-phy",
.id = -1, .id = -1,
@ -36,15 +38,13 @@ static struct platform_device da8xx_usb_phy = {
* registered yet. * registered yet.
*/ */
.init_name = "da8xx-usb-phy", .init_name = "da8xx-usb-phy",
.platform_data = &da8xx_usb_phy_pdata,
}, },
}; };
int __init da8xx_register_usb_phy(void) int __init da8xx_register_usb_phy(void)
{ {
struct da8xx_usb_phy_platform_data pdata; da8xx_usb_phy_pdata.cfgchip = da8xx_get_cfgchip();
pdata.cfgchip = da8xx_get_cfgchip();
da8xx_usb_phy.dev.platform_data = &pdata;
return platform_device_register(&da8xx_usb_phy); return platform_device_register(&da8xx_usb_phy);
} }