Merge tag 'davinci-for-v4.12/soc-3' of... (17e310b8) · Commits · 戴 / test

arch/arm/mach-davinci/da830.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -304,6 +304,11 @@ static struct clk usb20_clk = {
		.gpsc = 1,
		};

		static struct clk cppi41_clk = {
		.name = "cppi41",
		.parent = &usb20_clk,
		};

		static struct clk aemif_clk = {
		.name = "aemif",
		.parent = &pll0_sysclk3,
		@@ -413,6 +418,7 @@ static struct clk_lookup da830_clks[] = {
		CLK("davinci-mcasp.1", NULL, &mcasp1_clk),
		CLK("davinci-mcasp.2", NULL, &mcasp2_clk),
		CLK("musb-da8xx", "usb20", &usb20_clk),
		CLK("cppi41-dmaengine", NULL, &cppi41_clk),
		CLK(NULL, "aemif", &aemif_clk),
		CLK(NULL, "aintc", &aintc_clk),
		CLK(NULL, "secu_mgr", &secu_mgr_clk),

+6 −0

Original line number	Diff line number	Diff line
		@@ -401,6 +401,11 @@ static struct clk usb20_clk = {
		.gpsc = 1,
		};

		static struct clk cppi41_clk = {
		.name = "cppi41",
		.parent = &usb20_clk,
		};

		static struct clk spi0_clk = {
		.name = "spi0",
		.parent = &pll0_sysclk2,
		@@ -560,6 +565,7 @@ static struct clk_lookup da850_clks[] = {
		CLK("davinci-nand.0", "aemif", &aemif_nand_clk),
		CLK("ohci-da8xx", "usb11", &usb11_clk),
		CLK("musb-da8xx", "usb20", &usb20_clk),
		CLK("cppi41-dmaengine", NULL, &cppi41_clk),
		CLK("spi_davinci.0", NULL, &spi0_clk),
		CLK("spi_davinci.1", NULL, &spi1_clk),
		CLK("vpif", NULL, &vpif_clk),