diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 16:48:30 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 16:48:30 +0300 |
| commit | 196249beabe34066fc4655af8bacbb5ab8b77224 (patch) | |
| tree | a08133fb438b3e1ff647185ab59793b320825c77 /arch/arm/mach-davinci/da850.c | |
| parent | c0db16b8151eb40d757222a59330c7a9528a9585 (diff) | |
| parent | b5e1438cf98a1c588726b0f861178f9aa5a96caf (diff) | |
| download | linux-196249beabe34066fc4655af8bacbb5ab8b77224.tar.xz | |
Merge tag 'davinci-for-v4.10/soc-3' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
Pull "DaVinci SoC updates for v4.10 (part 3)" from Sekhar Nori:
mach-davinci SoC support updates to adjust
USB ohci device name to that used by drivers
and update of various board files to use gpio
descriptor API used by MMC subsystem for card
detect and write-protect detection.
* tag 'davinci-for-v4.10/soc-3' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: da830-evm: use gpio descriptor for mmc pins
ARM: davinci: da850-evm: use gpio descriptor for mmc pins
ARM: davinci: hawk: use gpio descriptor for mmc pins
ARM: davinci: da8xx: Fix ohci device name
Diffstat (limited to 'arch/arm/mach-davinci/da850.c')
| -rw-r--r-- | arch/arm/mach-davinci/da850.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 512ccc19e4e1..9b00d9119467 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -503,7 +503,7 @@ static struct clk_lookup da850_clks[] = { CLK("da830-mmc.1", NULL, &mmcsd1_clk), CLK("ti-aemif", NULL, &aemif_clk), CLK(NULL, "aemif", &aemif_clk), - CLK("ohci", "usb11", &usb11_clk), + CLK("ohci-da8xx", "usb11", &usb11_clk), CLK("musb-da8xx", "usb20", &usb20_clk), CLK("spi_davinci.0", NULL, &spi0_clk), CLK("spi_davinci.1", NULL, &spi1_clk), |