From: Kevin Hilman Date: Mon, 14 Oct 2013 22:42:08 +0000 (-0700) Subject: Merge tag 'omap-for-v3.13/soc-take2' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=94f53f1f0845a0c7a9cdd0107939f5876bf9e428;p=linux-beck.git Merge tag 'omap-for-v3.13/soc-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc From Tony Lindgren: SoC related changes for omaps to support the realtime counter on newer omaps, and to fail early for omap5 es1.0 SoCs that don't have any support merged for them in the mainline tree. * tag 'omap-for-v3.13/soc-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Fix build error for realtime counter init if not enabled ARM: OMAP5/DRA7: realtime_counter: Configure CNTFRQ register ARM: OMAP5: id: Remove ES1.0 support ARM: OMAP2+: DRA7: realtime_counter: Add ratio registers for 20MHZ sys-clk frequency Signed-off-by: Kevin Hilman --- 94f53f1f0845a0c7a9cdd0107939f5876bf9e428