Commit d9142025 authored Feb 04, 2012 by Linus Torvalds

arm-soc

arm-soc fixes for 3.3-rc

* A series of OMAP regression fixes for merge window fallout
* Two patches for Davinci, one removes some misdefined clocks, the other
  is a regression fix for merge window fallout
* Two patches that makes Broadcom bcmring build again (and removes a
  bunch of unused code in the process)

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: bcmring: fix build failure in mach-bcmring/arch.c
  ARM: bcmring: remove unused DMA map code
  ARM: davinci: update mdio bus name
  ARM: OMAP2+: arch/arm/mach-omap2/smartreflex.c: add missing iounmap
  ARM: OMAP2+: arch/arm/mach-omap2/devices.c: introduce missing kfree
  ARM: OMAP: fix MMC2 loopback clock handling
  ARM: OMAP: fix erroneous mmc2 clock change on mmc3 setup
  ARM: OMAP2+: GPMC: fix device size setup
  ARM: OMAP2+: timer: Fix crash due to wrong arg to __omap_dm_timer_read_counter
  ARM: OMAP3: hwmod data: register dss hwmods after dss_core
  ARM: OMAP2/3: PRM: fix missing plat/irqs.h build breakage
  ARM: OMAP2+: io: fix compilation breakage on 2420-only configs
  ARM: OMAP4: hwmod data: Add names for DMIC memory address space
  ARM: OMAP3: hwmod data: add SYSC_HAS_ENAWAKEUP for dispc
  ARM: OMAP2+: hwmod data: split omap2/3 dispc hwmod class
  ARM: davinci: DA850: remove non-existing pll1_sysclk4-7 clocks
  ARM: OMAP2: fix regulator warnings
  ARM: OMAP2: fix omap3 touchbook kconfig warning
  i2c: OMAP: Fix OMAP1 build error

parents 31c150a1 ca43784d

arch/arm/mach-bcmring/arch.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -194,6 +194,6 @@ MACHINE_START(BCMRING, "BCMRING")
	.init_early = bcmring_init_early,		.init_early = bcmring_init_early,
	.init_irq = bcmring_init_irq,		.init_irq = bcmring_init_irq,
	.timer = &bcmring_timer,		.timer = &bcmring_timer,
	.init_machine = bcmring_init_machine		.init_machine = bcmring_init_machine,
	.restart = bcmring_restart,		.restart = bcmring_restart,
	MACHINE_END		MACHINE_END

arch/arm/mach-bcmring/dma.c

+0 −812

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-bcmring/include/mach/dma.h

+0 −196

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-davinci/board-da850-evm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,7 @@
	#include <mach/aemif.h>		#include <mach/aemif.h>
	#include <mach/spi.h>		#include <mach/spi.h>

	#define DA850_EVM_PHY_ID "0:00"		#define DA850_EVM_PHY_ID "davinci_mdio-0:00"
	#define DA850_LCD_PWR_PIN GPIO_TO_PIN(2, 8)		#define DA850_LCD_PWR_PIN GPIO_TO_PIN(2, 8)
	#define DA850_LCD_BL_PIN GPIO_TO_PIN(2, 15)		#define DA850_LCD_BL_PIN GPIO_TO_PIN(2, 15)

arch/arm/mach-davinci/board-dm365-evm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,7 @@ static inline int have_tvp7002(void)
	return 0;		return 0;
	}		}

	#define DM365_EVM_PHY_ID "0:01"		#define DM365_EVM_PHY_ID "davinci_mdio-0:01"
	/*		/*
	* A MAX-II CPLD is used for various board control functions.		* A MAX-II CPLD is used for various board control functions.
	*/		*/