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

Commit 89a41503 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x

parents 77b67063 68b25325

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

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



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

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

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

	reg = <0x83fc4000 0x4000>;

	interrupts = <63>;

};



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

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

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

	reg = <0x70038000 0x4000>;

	interrupts = <64>;

	clock-frequency = <400000>;

MAINTAINERS

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

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

F:	arch/arm/mach-imx/

F:	arch/arm/plat-mxc/

F:	arch/arm/configs/imx*_defconfig



ARM/FREESCALE IMX6

arch/arm/Kconfig

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

	  ("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

	bool "Freescale MXS-based"

	select ARCH_REQUIRE_GPIOLIB
@@ -1058,7 +1045,7 @@ source "arch/arm/mach-msm/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"

arch/arm/Kconfig.debug

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

	string

	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/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

arch/arm/Makefile

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


# Platform directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.

plat-$(CONFIG_ARCH_MXC)		+= mxc

plat-$(CONFIG_ARCH_OMAP)	+= omap

plat-$(CONFIG_ARCH_S3C64XX)	+= samsung

plat-$(CONFIG_ARCH_ZYNQ)	+= versatile