1. 11 Jul, 2011 4 commits
    • Tony Lindgren's avatar
    • Paul Walmsley's avatar
      ASoC: omap: McBSP: fix build breakage on OMAP1 · 69d042d1
      Paul Walmsley authored
      After commits d1358657 ("OMAP: McBSP:
      implement functional clock switching via clock framework") and
      cf4c87ab ("OMAP: McBSP: implement
      McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c"), any OMAP1
      board (such as the AMS Delta) that uses the ASoC McBSP driver will no
      longer build:
      
      sound/built-in.o: In function `omap_mcbsp_dai_set_dai_sysclk':
      last.c:(.text+0x24ff8): undefined reference to `omap2_mcbsp1_mux_clkr_src'
      last.c:(.text+0x2500c): undefined reference to `omap2_mcbsp1_mux_fsr_src'
      make: *** [vmlinux] Error 1
      
      Fix by defining three OMAP1-only dummy functions for
      omap2_mcbsp1_mux_clkr_src(), omap2_mcbsp1_mux_fsr_src(), and
      omap2_mcbsp_set_clks_src().
      
      Normally, code that is OMAP SoC-revision-specific like this should go
      under the arch/arm/*omap* directories, and get abstracted away from
      drivers via struct platform_data function pointers.  This doesn't work
      in this case since there doesn't appear to be any convenient way to access
      struct platform_data (or something like it) in the current design of
      the sound/soc/omap/omap-mcbsp.c driver.
      
      Reported by Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> and Tony Lindgren
      <tony@atomide.com>.  Janusz also posted a patch to fix this at:
      
         http://www.spinics.net/lists/linux-omap/msg39560.html
      
      (among other places), but the following approach seems less dependent
      on compiler behavior.
      
      This patch passes build tests for ams_delta_defconfig and omap2plus_defconfig,
      but since I don't have an AMS Delta here, I can't boot test it on that
      platform.
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      Cc: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
      Cc: Tony Lindgren <tony@atomide.com>
      Cc: Jarkko Nikula <jhnikula@gmail.com>
      Cc: Peter Ujfalusi <peter.ujfalusi@nokia.com>
      Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
      Cc: Liam Girdwood <lrg@slimlogic.co.uk>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      69d042d1
    • Tony Lindgren's avatar
    • Russell King - ARM Linux's avatar
      Convert OMAPs 32kHz clocksource implementation to use the generic MMIO · 354a183f
      Russell King - ARM Linux authored
      clocksource support.  This achieves several things:
      
      1. It means we get rid of all these helper functions which frankly should
         never have been necessary.
      2. It means omap_readl() inside these helper functions does not appear in
         ftrace output.
      
      Another plus is that we avoid the overhead of calculating the address to
      read each time, but a minus is that we use readl() which has a barrier.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      [tony@atomide.com: updated to use ioremap]
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      354a183f
  2. 10 Jul, 2011 36 commits