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

Commit 46c18334 authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Sekhar Nori
Browse files

ARM: davinci: fix clock lookup for mdio device 



This patch removes the clock alias for mdio device and adds a entry
in clock lookup table, this entry can now be used by both DT and
non-DT case.

Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 79eb1636

arch/arm/mach-davinci/da830.c

+1 −0
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ static struct clk_lookup da830_clks[] = { 
	CLK(NULL,		"aintc",	&aintc_clk),

	CLK(NULL,		"secu_mgr",	&secu_mgr_clk),

	CLK("davinci_emac.1",	NULL,		&emac_clk),

	CLK("davinci_mdio.0",   "fck",          &emac_clk),

	CLK(NULL,		"gpio",		&gpio_clk),

	CLK("i2c_davinci.2",	NULL,		&i2c1_clk),

	CLK(NULL,		"usb11",	&usb11_clk),

arch/arm/mach-davinci/da850.c

+1 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ static struct clk_lookup da850_clks[] = { 
	CLK(NULL,		"arm",		&arm_clk),

	CLK(NULL,		"rmii",		&rmii_clk),

	CLK("davinci_emac.1",	NULL,		&emac_clk),

	CLK("davinci_mdio.0",	"fck",		&emac_clk),

	CLK("davinci-mcasp.0",	NULL,		&mcasp_clk),

	CLK("da8xx_lcdc.0",	"fck",		&lcdc_clk),

	CLK("da830-mmc.0",	NULL,		&mmcsd0_clk),

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

+2 −6
Original line number Diff line number Diff line
@@ -481,12 +481,8 @@ int __init da8xx_register_emac(void) 
	ret = platform_device_register(&da8xx_mdio_device);

	if (ret < 0)

		return ret;

	ret = platform_device_register(&da8xx_emac_device);

	if (ret < 0)

		return ret;

	ret = clk_add_alias(NULL, dev_name(&da8xx_mdio_device.dev),

			    NULL, &da8xx_emac_device.dev);

	return ret;



	return platform_device_register(&da8xx_emac_device);

}



static struct resource da830_mcasp1_resources[] = {

arch/arm/mach-davinci/dm365.c

+1 −2
Original line number Diff line number Diff line
@@ -477,6 +477,7 @@ static struct clk_lookup dm365_clks[] = { 
	CLK(NULL, "timer3", &timer3_clk),

	CLK(NULL, "usb", &usb_clk),

	CLK("davinci_emac.1", NULL, &emac_clk),

	CLK("davinci_mdio.0", "fck", &emac_clk),

	CLK("davinci_voicecodec", NULL, &voicecodec_clk),

	CLK("davinci-mcbsp", NULL, &asp0_clk),

	CLK(NULL, "rto", &rto_clk),
@@ -1422,8 +1423,6 @@ static int __init dm365_init_devices(void) 


	platform_device_register(&dm365_mdio_device);

	platform_device_register(&dm365_emac_device);

	clk_add_alias(NULL, dev_name(&dm365_mdio_device.dev),

		      NULL, &dm365_emac_device.dev);



	return 0;

}

arch/arm/mach-davinci/dm644x.c

+1 −2
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ static struct clk_lookup dm644x_clks[] = { 
	CLK("serial8250.1", NULL, &uart1_clk),

	CLK("serial8250.2", NULL, &uart2_clk),

	CLK("davinci_emac.1", NULL, &emac_clk),

	CLK("davinci_mdio.0", "fck", &emac_clk),

	CLK("i2c_davinci.1", NULL, &i2c_clk),

	CLK("palm_bk3710", NULL, &ide_clk),

	CLK("davinci-mcbsp", NULL, &asp_clk),
@@ -950,8 +951,6 @@ static int __init dm644x_init_devices(void) 


	platform_device_register(&dm644x_mdio_device);

	platform_device_register(&dm644x_emac_device);

	clk_add_alias(NULL, dev_name(&dm644x_mdio_device.dev),

		      NULL, &dm644x_emac_device.dev);



	return 0;

}