From patchwork Thu Mar 8 20:53:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [GIT,PULL,7/7] minimal omap board updates for upcoming merge window Date: Thu, 08 Mar 2012 10:53:29 -0000 From: Tony Lindgren X-Patchwork-Id: 145628 Message-Id: To: Arnd Bergmann , Olof Johansson Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org This one contains minimal updates to existing board files so people can use the mainline kernel easier. Note that the board-omap4panda.c changes have a minor merge conflict in the ASoC tree in next/master. The following changes since commit 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d: Linus Torvalds (1): Linux 3.3-rc6 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap board Aaro Koskinen (1): ARM: OMAP: add minimal support for Nokia RM-696 Alex (1): ARM: OMAP: Add omap_reserve functionality Grazvydas Ignotas (1): ARM: OMAP: pandora: add support for backlight and poweroff Igor Grinberg (1): ARM: OMAP3: cm-t3517: add EMAC support Ilya Yanok (1): ARM: OMAP: move generic EMAC init to separate file Mircea Gherzan (1): ARM: OMAP: enable Bluetooth on the PandaBoard Uwe Kleine-Knig (1): ARM: OMAP4: board-4430sdp: don't initialize value that is never used Vladimir Zapolskiy (1): ARM: OMAP3: RX-51: add explicit mux configuration of tsc2005 control gpios arch/arm/mach-omap2/Kconfig | 3 +- arch/arm/mach-omap2/Makefile | 3 + arch/arm/mach-omap2/am35xx-emac.c | 117 ++++++++++++++++++++++++++ arch/arm/mach-omap2/am35xx-emac.h | 15 ++++ arch/arm/mach-omap2/board-4430sdp.c | 5 +- arch/arm/mach-omap2/board-am3517evm.c | 117 +------------------------- arch/arm/mach-omap2/board-cm-t3517.c | 2 + arch/arm/mach-omap2/board-omap3logic.c | 2 + arch/arm/mach-omap2/board-omap3pandora.c | 11 +++ arch/arm/mach-omap2/board-omap4panda.c | 6 ++ arch/arm/mach-omap2/board-rm680.c | 14 +++- arch/arm/mach-omap2/board-rx51-peripherals.c | 25 +++--- arch/arm/plat-omap/include/plat/uncompress.h | 1 + 13 files changed, 192 insertions(+), 129 deletions(-) create mode 100644 arch/arm/mach-omap2/am35xx-emac.c create mode 100644 arch/arm/mach-omap2/am35xx-emac.h