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

Commit d8e22fb4 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Greg Kroah-Hartman
Browse files

ARM: da850: add the nand dev_id to the clock lookup table 



The aemif driver can now access struct of_dev_auxdata (using platform
data).

Add the device id to the clock lookup table for the nand clock and
create a separate lookup table for aemif subnodes.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f95bd041

arch/arm/mach-davinci/da850.c

+1 −9
Original line number Original line Diff line number Diff line
@@ -557,15 +557,7 @@ static struct clk_lookup da850_clks[] = { 
	CLK("da830-mmc.0",	NULL,		&mmcsd0_clk),

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

	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("davinci-nand.0",	"aemif",	&aemif_nand_clk),

	 * The only user of this clock is davinci_nand and it get's it through

	 * con_id. The nand node itself is created from within the aemif

	 * driver to guarantee that it's probed after the aemif timing

	 * parameters are configured. of_dev_auxdata is not accessible from

	 * the aemif driver and can't be passed to of_platform_populate(). For

	 * that reason we're leaving the dev_id here as NULL.

	 */

	CLK(NULL,		"aemif",	&aemif_nand_clk),

	CLK("ohci-da8xx",	"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),

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

+11 −1
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/of_irq.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/irqdomain.h>

#include <linux/irqdomain.h>

#include <linux/platform_data/ti-aemif.h>





#include <asm/mach/arch.h>

#include <asm/mach/arch.h>
@@ -18,6 +19,15 @@ 
#include "cp_intc.h"

#include "cp_intc.h"

#include <mach/da8xx.h>

#include <mach/da8xx.h>





static struct of_dev_auxdata da850_aemif_auxdata_lookup[] = {

	OF_DEV_AUXDATA("ti,davinci-nand", 0x62000000, "davinci-nand.0", NULL),

	{}

};



static struct aemif_platform_data aemif_data = {

	.dev_lookup = da850_aemif_auxdata_lookup,

};



static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {

static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL),

	OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL),

	OF_DEV_AUXDATA("ti,davinci-i2c", 0x01e28000, "i2c_davinci.2", NULL),

	OF_DEV_AUXDATA("ti,davinci-i2c", 0x01e28000, "i2c_davinci.2", NULL),
@@ -37,7 +47,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("ti,davinci-dm6467-emac", 0x01e20000, "davinci_emac.1",

	OF_DEV_AUXDATA("ti,davinci-dm6467-emac", 0x01e20000, "davinci_emac.1",

		       NULL),

		       NULL),

	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", &aemif_data),

	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-da8xx", 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),