diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-14 14:16:26 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-14 14:16:26 -0700 |
| commit | f46ad023774a587db26b8798ea40e8c42d6bcdf4 (patch) | |
| tree | d7ee724ca58329c8e7ad68bc18df380319d187a7 /drivers/clk/davinci/psc-dm646x.c | |
| parent | dd8ba5232561d1a69a7bd3634f5a92f7f64d881d (diff) | |
| parent | 7f69ae7fadd9dbebe563bfc28b993a2bc9c8acf9 (diff) | |
| download | blackbird-obmc-linux-f46ad023774a587db26b8798ea40e8c42d6bcdf4.tar.gz blackbird-obmc-linux-f46ad023774a587db26b8798ea40e8c42d6bcdf4.zip | |
Merge tag 'davinci-for-v4.19/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
DaVinci SoC updates for v4.19
-----------------------------
* mach-davinci updates needed to finally move over to common clock framework
* update to use the aemif driver from drivers/memory rather than the
private implementation available in mach-davinci
For the later item, I have included a branch from David Lechner which
should also get merged through the clk tree. The clk dependencies are
needed for aemif conversion.
* tag 'davinci-for-v4.19/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: (34 commits)
ARM: davinci: unduplicate aemif support
ARM: davinci: mityomapl138: use aemif platform driver
ARM: davinci: dm646x-evm: use aemif platform driver
ARM: davinci: da830-evm: use aemif platform driver
ARM: davinci: dm644x-evm: use aemif platform driver
ARM: davinci: dm365-evm: use the ti-aemif soc driver
ARM: davinci: da850-evm: use aemif platform driver in legacy mode
ARM: davinci: omapl138-hawk: add aemif & nand support
clk: davinci: psc-da830: add a lookup entry for aemif clock
clk: davinci: psc-dm646x: use two lookup entries for the aemif clock
clk: davinci: psc-dm644x: use two lookup entries for the aemif clock
clk: davinci: psc-dm365: use two lookup entries for the aemif clock
clk: davinci: psc-da850: remove the 'davinci_nand.0" lookup
ARM: davinci: da8xx-dt: switch to device tree clocks
ARM: davinci: add device tree support to timer
ARM: davinci: remove legacy clocks
ARM: davinci: da8xx: Remove legacy USB and SATA clock init
ARM: davinci: dm646x: Remove legacy clock init
ARM: davinci: dm644x: Remove legacy clock init
ARM: davinci: dm365: Remove legacy clock init
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/clk/davinci/psc-dm646x.c')
| -rw-r--r-- | drivers/clk/davinci/psc-dm646x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/davinci/psc-dm646x.c b/drivers/clk/davinci/psc-dm646x.c index c3f82ed70a80..20012dc7471a 100644 --- a/drivers/clk/davinci/psc-dm646x.c +++ b/drivers/clk/davinci/psc-dm646x.c @@ -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"); |
