Commit 8e730c7f authored by Sekhar Nori's avatar Sekhar Nori
Browse files

ARM: davinci: dm644x: remove unnecessary postcore_initcall() 



dm644x_init_devices() is unnecessarily implemented as a
postcore_initcall().

This does not cause any issues now, but creates issues when
converting to common clock framework where clocks themselves
become platform devices and are initialized later. Because of
this, device clock acquisition and runtime PM on that device
fails.

Move the call to .init_machine() callback along with rest of
platform device's registration.

While at it, convert it to return void since return value is
ignored by caller anyway.

Reviewed-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 60cc43fc

arch/arm/mach-davinci/board-dm644x-evm.c

+2 −0
Original line number Diff line number Diff line
@@ -768,6 +768,8 @@ static __init void davinci_evm_init(void) 
	struct clk *aemif_clk;

	struct davinci_soc_info *soc_info = &davinci_soc_info;



	dm644x_init_devices();



	ret = dm644x_gpio_register();

	if (ret)

		pr_warn("%s: GPIO init failed: %d\n", __func__, ret);

arch/arm/mach-davinci/board-neuros-osd2.c

+2 −0
Original line number Diff line number Diff line
@@ -174,6 +174,8 @@ static __init void davinci_ntosd2_init(void) 
	struct clk *aemif_clk;

	struct davinci_soc_info *soc_info = &davinci_soc_info;



	dm644x_init_devices();



	ret = dm644x_gpio_register();

	if (ret)

		pr_warn("%s: GPIO init failed: %d\n", __func__, ret);

arch/arm/mach-davinci/board-sffsdr.c

+2 −0
Original line number Diff line number Diff line
@@ -134,6 +134,8 @@ static __init void davinci_sffsdr_init(void) 
{

	struct davinci_soc_info *soc_info = &davinci_soc_info;



	dm644x_init_devices();



	platform_add_devices(davinci_sffsdr_devices,

			     ARRAY_SIZE(davinci_sffsdr_devices));

	sffsdr_init_i2c();

arch/arm/mach-davinci/davinci.h

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ int dm365_gpio_register(void); 


/* DM644x function declarations */

void dm644x_init(void);

void dm644x_init_devices(void);

void dm644x_init_time(void);

void dm644x_init_asp(void);

int dm644x_init_video(struct vpfe_config *, struct vpbe_config *);

arch/arm/mach-davinci/dm644x.c

+3 −10
Original line number Diff line number Diff line
@@ -961,19 +961,14 @@ int __init dm644x_init_video(struct vpfe_config *vpfe_cfg, 
	return 0;

}



static int __init dm644x_init_devices(void)

void __init dm644x_init_devices(void)

{

	struct platform_device *edma_pdev;

	int ret = 0;



	if (!cpu_is_davinci_dm644x())

		return 0;

	int ret;



	edma_pdev = platform_device_register_full(&dm644x_edma_device);

	if (IS_ERR(edma_pdev)) {

	if (IS_ERR(edma_pdev))

		pr_warn("%s: Failed to register eDMA\n", __func__);

		return PTR_ERR(edma_pdev);

	}



	platform_device_register(&dm644x_mdio_device);

	platform_device_register(&dm644x_emac_device);
@@ -982,6 +977,4 @@ static int __init dm644x_init_devices(void) 
	if (ret)

		pr_warn("%s: watchdog init failed: %d\n", __func__, ret);



	return ret;

}
 
postcore_initcall(dm644x_init_devices);

CRA Git | Maintained and supported by SUSTech CRA and CCSE