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

Commit 2fca8430 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-for-v4.9/soc' of... 

Merge tag 'davinci-for-v4.9/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

Merge "DaVinci soc support updates for v4.9" from Sekhar Nori:

DA850 SoC support update for making it possible
to use TI AEMIF driver in drivers/memory on DA850.

* tag 'davinci-for-v4.9/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: da850: Add ti-aemif lookup for clock matching
parents 3eab887a 8f899b4e

arch/arm/mach-davinci/da850.c

+1 −0
Original line number Diff line number Diff line
@@ -501,6 +501,7 @@ static struct clk_lookup da850_clks[] = { 
	CLK("da8xx_lcdc.0",	"fck",		&lcdc_clk),

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

	CLK("da830-mmc.1",	NULL,		&mmcsd1_clk),

	CLK("ti-aemif",		NULL,		&aemif_clk),

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

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

	CLK(NULL,		"usb20",	&usb20_clk),

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

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("ti,davinci-dm6467-emac", 0x01e20000, "davinci_emac.1",

		       NULL),

	OF_DEV_AUXDATA("ti,da830-mcasp-audio", 0x01d00000, "davinci-mcasp.0", NULL),

	OF_DEV_AUXDATA("ti,da850-aemif", 0x68000000, "ti-aemif", NULL),

	{}

};