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

Commit db2f95de authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc 

From Sascha Hauer <s.hauer@pengutronix.de>:

ARM i.MX SoC updates

based on imx-multiplatform branch.

* tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6

:
  ARM i.MX51 babbage: Add display support
  ARM i.MX6: Add IPU support
  ARM i.MX51: Add IPU support
  ARM i.MX53: Add IPU support
  ARM i.MX5: switch IPU clk support to devicetree bindings
  ARM i.MX6: fix ldb_di_sel mux
  ARM i.MX51: setup MIPI during startup
  mx2_camera: Fix regression caused by clock conversion
  ARM: clk-imx27: Add missing clock for mx2-camera
  ARM i.MX27: Fix low reference clock path
  ARM: dts: imx27-3ds: Remove local watchdog inclusion
  watchdog: Support imx watchdog on SOC_IMX53
  ARM: mach-imx: Support for DryIce RTC in i.MX53
  ARM : i.MX27 : split code for allocation of ressources of camera and eMMA

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1bf0bc1e d6aef84a

Documentation/arm64/memory.txt

+6 −6
Original line number Original line Diff line number Diff line
@@ -27,17 +27,17 @@ Start End Size Use 
-----------------------------------------------------------------------

-----------------------------------------------------------------------

0000000000000000	0000007fffffffff	 512GB		user

0000000000000000	0000007fffffffff	 512GB		user





ffffff8000000000	ffffffbbfffcffff	~240GB		vmalloc

ffffff8000000000	ffffffbbfffeffff	~240GB		vmalloc





ffffffbbfffd0000	ffffffbcfffdffff	  64KB		[guard page]

ffffffbbffff0000	ffffffbbffffffff	  64KB		[guard page]





ffffffbbfffe0000	ffffffbcfffeffff	  64KB		PCI I/O space

ffffffbc00000000	ffffffbdffffffff	   8GB		vmemmap





ffffffbbffff0000	ffffffbcffffffff	  64KB		[guard page]

ffffffbe00000000	ffffffbffbbfffff	  ~8GB		[guard, future vmmemap]





ffffffbc00000000	ffffffbdffffffff	   8GB		vmemmap

ffffffbffbe00000	ffffffbffbe0ffff	  64KB		PCI I/O space





ffffffbe00000000	ffffffbffbffffff	  ~8GB		[guard, future vmmemap]

ffffffbbffff0000	ffffffbcffffffff	  ~2MB		[guard]





ffffffbffc000000	ffffffbfffffffff	  64MB		modules

ffffffbffc000000	ffffffbfffffffff	  64MB		modules

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
@@ -797,7 +797,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

Makefile

+1 −1
Original line number Original line Diff line number Diff line 
VERSION = 3

VERSION = 3

PATCHLEVEL = 7

PATCHLEVEL = 7

SUBLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Terrified Chipmunk

NAME = Terrified Chipmunk





# *DOCUMENTATION*

# *DOCUMENTATION*

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"