Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4afe30df authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'imx/multi-platform' of... 

Merge branch 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

From Shawn Guo:
"Here is the imx multi-platform support [1] that missed 3.7 merge window.
 Please pull it for 3.8 and exposing on linux-next.  As it touches a lot
 of files, I send it early, so that people can base their works off it
 to avoid conflicts."

* 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6

: (31 commits)
  ARM: imx: enable multi-platform build
  ARM: imx: call mxc_device_init() in soc specific function
  ARM: imx: remove header file mach/irqs.h
  ARM: imx: include hardware.h rather than mach/hardware.h
  ARM: imx: move debug macros to include/debug
  video: imxfb: remove cpu_is_xxx by using platform_device_id
  mmc: mxcmmc: remove cpu_is_xxx by using platform_device_id
  media: mx2_camera: remove cpu_is_xxx by using platform_device_id
  dma: imx-dma: remove cpu_is_xxx by using platform_device_id
  dma: imx-dma: retrieve MEM and IRQ from resources
  dma: imx-dma: use devm_kzalloc and devm_request_irq
  rtc: mxc_rtc: remove cpu_is_xxx by using platform_device_id
  mtd: mxc_nand: remove cpu_is_xxx by using platform_device_id
  i2c: imx: remove cpu_is_xxx by using platform_device_id
  watchdog: imx2_wdt: remove unneeded mach/hardware.h inclusion
  video: mx3fb: remove unneeded mach/hardware.h inclusion
  usb: ehci-mxc: remove unneeded mach/hardware.h inclusion
  ASoC: imx-ssi: remove unneeded mach/hardware.h inclusion
  dma: imx-sdma: remove unneeded mach/hardware.h inclusion
  dma: ipu: rename mach/ipu.h to include/linux/dma/ipu-dma.h
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ddffeb8c c5a0d497

Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -12,13 +12,13 @@ Optional properties: 
Examples:

Examples:





i2c@83fc4000 { /* I2C2 on i.MX51 */

i2c@83fc4000 { /* I2C2 on i.MX51 */

	compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";

	compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";

	reg = <0x83fc4000 0x4000>;

	reg = <0x83fc4000 0x4000>;

	interrupts = <63>;

	interrupts = <63>;

};

};





i2c@70038000 { /* HS-I2C on i.MX51 */

i2c@70038000 { /* HS-I2C on i.MX51 */

	compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";

	compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";

	reg = <0x70038000 0x4000>;

	reg = <0x70038000 0x4000>;

	interrupts = <64>;

	interrupts = <64>;

	clock-frequency = <400000>;

	clock-frequency = <400000>;

MAINTAINERS

+0 −1
Original line number Original line Diff line number Diff line
@@ -789,7 +789,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

S:	Maintained

T:	git git://git.pengutronix.de/git/imx/linux-2.6.git

T:	git git://git.pengutronix.de/git/imx/linux-2.6.git

F:	arch/arm/mach-imx/

F:	arch/arm/mach-imx/

F:	arch/arm/plat-mxc/

F:	arch/arm/configs/imx*_defconfig

F:	arch/arm/configs/imx*_defconfig





ARM/FREESCALE IMX6

ARM/FREESCALE IMX6

arch/arm/Kconfig

+1 −14
Original line number Original line Diff line number Diff line
@@ -433,19 +433,6 @@ config ARCH_FOOTBRIDGE 
	  Support for systems based on the DC21285 companion chip

	  Support for systems based on the DC21285 companion chip

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.





config ARCH_MXC

	bool "Freescale MXC/iMX-based"

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select USE_OF

	help

	  Support for Freescale MXC/iMX-based family of processors



config ARCH_MXS

config ARCH_MXS

	bool "Freescale MXS-based"

	bool "Freescale MXS-based"

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB
@@ -1058,7 +1045,7 @@ source "arch/arm/mach-msm/Kconfig" 




source "arch/arm/mach-mv78xx0/Kconfig"

source "arch/arm/mach-mv78xx0/Kconfig"





source "arch/arm/plat-mxc/Kconfig"

source "arch/arm/mach-imx/Kconfig"





source "arch/arm/mach-mxs/Kconfig"

source "arch/arm/mach-mxs/Kconfig"

arch/arm/Kconfig.debug

+8 −0
Original line number Original line Diff line number Diff line
@@ -412,6 +412,14 @@ endchoice 
config DEBUG_LL_INCLUDE

config DEBUG_LL_INCLUDE

	string

	string

	default "debug/icedcc.S" if DEBUG_ICEDCC

	default "debug/icedcc.S" if DEBUG_ICEDCC

	default "debug/imx.S" if DEBUG_IMX1_UART || \

				 DEBUG_IMX25_UART || \

				 DEBUG_IMX21_IMX27_UART || \

				 DEBUG_IMX31_IMX35_UART || \

				 DEBUG_IMX51_UART || \

				 DEBUG_IMX50_IMX53_UART ||\

				 DEBUG_IMX6Q_UART2 || \

				 DEBUG_IMX6Q_UART4

	default "debug/highbank.S" if DEBUG_HIGHBANK_UART

	default "debug/highbank.S" if DEBUG_HIGHBANK_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

arch/arm/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -195,7 +195,6 @@ machine-$(CONFIG_ARCH_ZYNQ) += zynq 




# Platform directory name.  This list is sorted alphanumerically

# Platform directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.

# by CONFIG_* macro name.

plat-$(CONFIG_ARCH_MXC)		+= mxc

plat-$(CONFIG_ARCH_OMAP)	+= omap

plat-$(CONFIG_ARCH_OMAP)	+= omap

plat-$(CONFIG_ARCH_S3C64XX)	+= samsung

plat-$(CONFIG_ARCH_S3C64XX)	+= samsung

plat-$(CONFIG_ARCH_ZYNQ)	+= versatile

plat-$(CONFIG_ARCH_ZYNQ)	+= versatile