Commit 1fe40618 authored Jul 03, 2012 by Arnd Bergmann

Merge tag 'omap-cleanup-for-v3.6' of...

Merge tag 'omap-cleanup-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

From Tony Lindgren <tony@atomide.com>

Here is some more omap clean-up. The biggest changes are
hwmod, clock, and System Control Module cleanup, and the removal
of the last instance of omap_read/write usage for omap2+ with
the removal of unused USB OHCI Full Speed driver support. The
removed OHCI is only currently used for omap1 as the actively
used omap2+ boards have either MUSB or another instance of
OHCI+EHCI that's more usable.

* tag 'omap-cleanup-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: hwmod: remove prm_clkdm, cm_clkdm; allow hwmods to have no clockdomain
  ARM: OMAP3: Move McBSP fck clock alias to hwmod data
  ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2430
  ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2420
  ARM: OMAP: dsp: interface to control module functions
  ARM: OMAP2+: control: new APIs to configure boot address and mode
  ARM: OMAP2+: CLEANUP: Remove ARCH_OMAPx ifdef from struct dpll_data
  ARM: OMAP2+: hwmod: use init-time function pointer for _init_clkdm
  ARM: OMAP2+: hwmod: use init-time function pointer for hardreset
  ARM: OMAP2+: hwmod: use init-time function pointer for wait_target_ready
  ARM: OMAP4: hwmod: drop extra cpu_is check from _wait_target_disable()
  ARM: OMAP2+: hwmod: use init-time function ptrs for enable/disable module
  ARM: OMAP4: hwmod: rename _enable_module to _omap4_enable_module()
  ARM: OMAP: Make FS USB omap1 only
  ARM: OMAP2: Remove legacy USB FS support
  ARM: OMAP3: There is no FS USB controller on omap3
  ARM: OMAP: dma: Clear status registers on enable/disable irq

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents df7cb455 472fd540

arch/arm/mach-omap1/board-ams-delta.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,12 +37,12 @@
		#include <plat/board-ams-delta.h>
		#include <plat/keypad.h>
		#include <plat/mux.h>
		#include <plat/usb.h>
		#include <plat/board.h>

		#include <mach/hardware.h>
		#include <mach/ams-delta-fiq.h>
		#include <mach/camera.h>
		#include <mach/usb.h>

		#include "iomap.h"
		#include "common.h"

arch/arm/mach-omap1/board-generic.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -23,8 +23,10 @@
		#include <asm/mach/map.h>

		#include <plat/mux.h>
		#include <plat/usb.h>
		#include <plat/board.h>

		#include <mach/usb.h>

		#include "common.h"

		/* assume no Mini-AB port */

arch/arm/mach-omap1/board-h2.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,11 +40,11 @@
		#include <plat/dma.h>
		#include <plat/tc.h>
		#include <plat/irda.h>
		#include <plat/usb.h>
		#include <plat/keypad.h>
		#include <plat/flash.h>

		#include <mach/hardware.h>
		#include <mach/usb.h>

		#include "common.h"
		#include "board-h2.h"

arch/arm/mach-omap1/board-h3.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,13 +40,13 @@

		#include <plat/mux.h>
		#include <plat/tc.h>
		#include <plat/usb.h>
		#include <plat/keypad.h>
		#include <plat/dma.h>
		#include <plat/flash.h>

		#include <mach/hardware.h>
		#include <mach/irqs.h>
		#include <mach/usb.h>

		#include "common.h"
		#include "board-h3.h"

arch/arm/mach-omap1/board-htcherald.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,10 +44,10 @@
		#include <plat/omap7xx.h>
		#include <plat/board.h>
		#include <plat/keypad.h>
		#include <plat/usb.h>
		#include <plat/mmc.h>

		#include <mach/irqs.h>
		#include <mach/usb.h>

		#include "common.h"