diff options
author | Kevin Hilman <khilman@linaro.org> | 2013-08-22 11:44:44 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-08-22 11:46:36 -0700 |
commit | cee7e8bbd634486277796341a6acdaa30ad6429b (patch) | |
tree | 88393f1c08f637c42fbe07004dfa4d874a2a188a /arch/arm/mach-davinci/board-omapl138-hawk.c | |
parent | 1ee64e48fac2780c26653e6f82b6f3810f59c24d (diff) | |
parent | 46c1833467c5e555f31cd6f14b342a7383f26885 (diff) | |
download | op-kernel-dev-cee7e8bbd634486277796341a6acdaa30ad6429b.zip op-kernel-dev-cee7e8bbd634486277796341a6acdaa30ad6429b.tar.gz |
Merge tag 'davinci-for-v3.12/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
From Sekhar Nori:
DaVinci SoC updates for v3.12
-----------------------------
This set of SoC updates contains changes to the
way UART clock is handled to enabled DT-boot to
obtain UART clock frequency instead of relying
on DT-binding being supplied. Similarly handling
of MDIO clock is fixed to make it easier to support
MDIO in DT-boot. Finally there is patch to remove
now unnecessary setting of wake-up capable flag for
RTC.
* tag 'davinci-for-v3.12/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: fix clock lookup for mdio device
ARM: davinci: da8xx: remove hard coding of rtc device wakeup
ARM: davinci: serial: remove davinci_serial_setup_clk()
ARM: davinci: serial: get rid of davinci_uart_config
ARM: davinci: da8xx: remove da8xx_uart_clk_enable
ARM: davinci: uart: move to devid based clk_get
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/mach-davinci/board-omapl138-hawk.c')
-rw-r--r-- | arch/arm/mach-davinci/board-omapl138-hawk.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index b8c20de..ab98c75 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -286,15 +286,11 @@ usb11_setup_oc_fail: gpio_free(DA850_USB1_VBUS_PIN); } -static struct davinci_uart_config omapl138_hawk_uart_config __initdata = { - .enabled_uarts = 0x7, -}; - static __init void omapl138_hawk_init(void) { int ret; - davinci_serial_init(&omapl138_hawk_uart_config); + davinci_serial_init(da8xx_serial_device); omapl138_hawk_config_emac(); |