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

Commit 8439a1d7 authored Nov 03, 2016 by Axel Haslam Committed by Sekhar Nori Nov 23, 2016

ARM: davinci: da8xx: Fix ohci device name



While the clk lookup table is making reference to "ohci"
other subsystems (such as phy) are trying to match "ohci.0"

Since there is a single ohci instance, instead of changing
the clk name, change the dev id to -1, and add the "-da8xx"
postfix to match the driver name that will also be changed
in a subsequent patch.

Signed-off-by: Axel Haslam <ahaslam@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

parent 7e431af8

arch/arm/mach-davinci/da830.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -420,7 +420,7 @@ static struct clk_lookup da830_clks[] = {
	CLK("davinci_mdio.0", "fck", &emac_clk),		CLK("davinci_mdio.0", "fck", &emac_clk),
	CLK(NULL, "gpio", &gpio_clk),		CLK(NULL, "gpio", &gpio_clk),
	CLK("i2c_davinci.2", NULL, &i2c1_clk),		CLK("i2c_davinci.2", NULL, &i2c1_clk),
	CLK("ohci", "usb11", &usb11_clk),		CLK("ohci-da8xx", "usb11", &usb11_clk),
	CLK(NULL, "emif3", &emif3_clk),		CLK(NULL, "emif3", &emif3_clk),
	CLK(NULL, "arm", &arm_clk),		CLK(NULL, "arm", &arm_clk),
	CLK(NULL, "rmii", &rmii_clk),		CLK(NULL, "rmii", &rmii_clk),

arch/arm/mach-davinci/da850.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -503,7 +503,7 @@ static struct clk_lookup da850_clks[] = {
	CLK("da830-mmc.1", NULL, &mmcsd1_clk),		CLK("da830-mmc.1", NULL, &mmcsd1_clk),
	CLK("ti-aemif", NULL, &aemif_clk),		CLK("ti-aemif", NULL, &aemif_clk),
	CLK(NULL, "aemif", &aemif_clk),		CLK(NULL, "aemif", &aemif_clk),
	CLK("ohci", "usb11", &usb11_clk),		CLK("ohci-da8xx", "usb11", &usb11_clk),
	CLK("musb-da8xx", "usb20", &usb20_clk),		CLK("musb-da8xx", "usb20", &usb20_clk),
	CLK("spi_davinci.0", NULL, &spi0_clk),		CLK("spi_davinci.0", NULL, &spi0_clk),
	CLK("spi_davinci.1", NULL, &spi1_clk),		CLK("spi_davinci.1", NULL, &spi1_clk),

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
	OF_DEV_AUXDATA("ti,da830-mcasp-audio", 0x01d00000, "davinci-mcasp.0", NULL),		OF_DEV_AUXDATA("ti,da830-mcasp-audio", 0x01d00000, "davinci-mcasp.0", NULL),
	OF_DEV_AUXDATA("ti,da850-aemif", 0x68000000, "ti-aemif", NULL),		OF_DEV_AUXDATA("ti,da850-aemif", 0x68000000, "ti-aemif", NULL),
	OF_DEV_AUXDATA("ti,da850-tilcdc", 0x01e13000, "da8xx_lcdc.0", NULL),		OF_DEV_AUXDATA("ti,da850-tilcdc", 0x01e13000, "da8xx_lcdc.0", NULL),
	OF_DEV_AUXDATA("ti,da830-ohci", 0x01e25000, "ohci", NULL),		OF_DEV_AUXDATA("ti,da830-ohci", 0x01e25000, "ohci-da8xx", NULL),
	OF_DEV_AUXDATA("ti,da830-musb", 0x01e00000, "musb-da8xx", NULL),		OF_DEV_AUXDATA("ti,da830-musb", 0x01e00000, "musb-da8xx", NULL),
	OF_DEV_AUXDATA("ti,da830-usb-phy", 0x01c1417c, "da8xx-usb-phy", NULL),		OF_DEV_AUXDATA("ti,da830-usb-phy", 0x01c1417c, "da8xx-usb-phy", NULL),
	{}		{}

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -109,8 +109,8 @@ static struct resource da8xx_usb11_resources[] = {
	static u64 da8xx_usb11_dma_mask = DMA_BIT_MASK(32);		static u64 da8xx_usb11_dma_mask = DMA_BIT_MASK(32);

	static struct platform_device da8xx_usb11_device = {		static struct platform_device da8xx_usb11_device = {
	.name = "ohci",		.name = "ohci-da8xx",
	.id = 0,		.id = -1,
	.dev = {		.dev = {
	.dma_mask = &da8xx_usb11_dma_mask,		.dma_mask = &da8xx_usb11_dma_mask,
	.coherent_dma_mask = DMA_BIT_MASK(32),		.coherent_dma_mask = DMA_BIT_MASK(32),