Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04a2c2ef authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-for-v4.17/soc-2' of... 

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
parents bc52497a f6adc9fd

arch/arm/mach-davinci/devices-da8xx.c

+1 −4
Original line number Diff line number Diff line
@@ -1106,11 +1106,8 @@ int __init da850_register_sata(unsigned long refclkpn) 


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 = {

	.name		= da8xx_cfgchip_name,

	.name		= "cfgchip",

	.reg_bits	= 32,

	.val_bits	= 32,

	.reg_stride	= 4,

arch/arm/mach-davinci/usb-da8xx.c

+4 −4
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 


static struct clk *usb20_clk;



static struct da8xx_usb_phy_platform_data da8xx_usb_phy_pdata;



static struct platform_device da8xx_usb_phy = {

	.name		= "da8xx-usb-phy",

	.id		= -1,
@@ -36,15 +38,13 @@ static struct platform_device da8xx_usb_phy = { 
		 * registered yet.

		 */

		.init_name	= "da8xx-usb-phy",

		.platform_data	= &da8xx_usb_phy_pdata,

	},

};



int __init da8xx_register_usb_phy(void)

{

	struct da8xx_usb_phy_platform_data pdata;



	pdata.cfgchip = da8xx_get_cfgchip();

	da8xx_usb_phy.dev.platform_data = &pdata;

	da8xx_usb_phy_pdata.cfgchip = da8xx_get_cfgchip();



	return platform_device_register(&da8xx_usb_phy);

}