Commit 63a9a4f9 authored by Sekhar Nori's avatar Sekhar Nori
Browse files

Merge branch 'for-sekhar' of https://github.com/dlech/linux into v4.19/soc

parents bfd107bd f917ff75

drivers/clk/davinci/psc-da830.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include "psc.h"



LPSC_CLKDEV1(aemif_clkdev,	NULL,	"ti-aemif");

LPSC_CLKDEV1(spi0_clkdev,	NULL,	"spi_davinci.0");

LPSC_CLKDEV1(mmcsd_clkdev,	NULL,	"da830-mmc.0");

LPSC_CLKDEV1(uart0_clkdev,	NULL,	"serial8250.0");
@@ -22,7 +23,7 @@ static const struct davinci_lpsc_clk_info da830_psc0_info[] = { 
	LPSC(0,  0, tpcc,     pll0_sysclk2, NULL,         LPSC_ALWAYS_ENABLED),

	LPSC(1,  0, tptc0,    pll0_sysclk2, NULL,         LPSC_ALWAYS_ENABLED),

	LPSC(2,  0, tptc1,    pll0_sysclk2, NULL,         LPSC_ALWAYS_ENABLED),

	LPSC(3,  0, aemif,    pll0_sysclk3, NULL,         LPSC_ALWAYS_ENABLED),

	LPSC(3,  0, aemif,    pll0_sysclk3, aemif_clkdev, LPSC_ALWAYS_ENABLED),

	LPSC(4,  0, spi0,     pll0_sysclk2, spi0_clkdev,  0),

	LPSC(5,  0, mmcsd,    pll0_sysclk2, mmcsd_clkdev, 0),

	LPSC(6,  0, aintc,    pll0_sysclk4, NULL,         LPSC_ALWAYS_ENABLED),

drivers/clk/davinci/psc-da850.c

+1 −2
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 


#include "psc.h"



LPSC_CLKDEV2(emifa_clkdev,	NULL,		"ti-aemif",

				"aemif",	"davinci_nand.0");

LPSC_CLKDEV1(emifa_clkdev,	NULL,		"ti-aemif");

LPSC_CLKDEV1(spi0_clkdev,	NULL,		"spi_davinci.0");

LPSC_CLKDEV1(mmcsd0_clkdev,	NULL,		"da830-mmc.0");

LPSC_CLKDEV1(uart0_clkdev,	NULL,		"serial8250.0");

drivers/clk/davinci/psc-dm365.c

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ LPSC_CLKDEV1(mmcsd1_clkdev, NULL, "da830-mmc.1"); 
LPSC_CLKDEV1(asp0_clkdev,		NULL,		"davinci-mcbsp");

LPSC_CLKDEV1(usb_clkdev,		"usb",		NULL);

LPSC_CLKDEV1(spi2_clkdev,		NULL,		"spi_davinci.2");

LPSC_CLKDEV1(aemif_clkdev,		"aemif",	NULL);

LPSC_CLKDEV2(aemif_clkdev,		"aemif",	NULL,

					NULL,		"ti-aemif");

LPSC_CLKDEV1(mmcsd0_clkdev,		NULL,		"da830-mmc.0");

LPSC_CLKDEV1(i2c_clkdev,		NULL,		"i2c_davinci.1");

LPSC_CLKDEV1(uart0_clkdev,		NULL,		"serial8250.0");

drivers/clk/davinci/psc-dm644x.c

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ LPSC_CLKDEV2(emac_clkdev, NULL, "davinci_emac.1", 
					"fck",		"davinci_mdio.0");

LPSC_CLKDEV1(usb_clkdev,		"usb",		NULL);

LPSC_CLKDEV1(ide_clkdev,		NULL,		"palm_bk3710");

LPSC_CLKDEV1(aemif_clkdev,		"aemif",	NULL);

LPSC_CLKDEV2(aemif_clkdev,		"aemif",	NULL,

					NULL,		"ti-aemif");

LPSC_CLKDEV1(mmcsd_clkdev,		NULL,		"dm6441-mmc.0");

LPSC_CLKDEV1(asp0_clkdev,		NULL,		"davinci-mcbsp");

LPSC_CLKDEV1(i2c_clkdev,		NULL,		"i2c_davinci.1");

drivers/clk/davinci/psc-dm646x.c

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
LPSC_CLKDEV1(ide_clkdev,	NULL,		"palm_bk3710");

LPSC_CLKDEV2(emac_clkdev,	NULL,		"davinci_emac.1",

				"fck",		"davinci_mdio.0");

LPSC_CLKDEV1(aemif_clkdev,	"aemif",	NULL);

LPSC_CLKDEV2(aemif_clkdev,	"aemif",	NULL,

				NULL,		"ti-aemif");

LPSC_CLKDEV1(mcasp0_clkdev,	NULL,		"davinci-mcasp.0");

LPSC_CLKDEV1(mcasp1_clkdev,	NULL,		"davinci-mcasp.1");

LPSC_CLKDEV1(uart0_clkdev,	NULL,		"serial8250.0");