Commit Graph

57 Commits

Author SHA1 Message Date
Arnd Bergmann 7cc026f21e Merge branch 'imx/defconfig' into next/drivers
Conflicts:
	arch/arm/configs/imx_v6_v7_defconfig

Resolves one conflict with an earlier branch

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-20 22:40:37 +00:00
Arnd Bergmann dae2efd750 Merge branch 'imx-drivers' of git://git.pengutronix.de/git/imx/linux-2.6 into next/drivers
* 'imx-drivers' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx_v4_v5_defconfig: Update defconfig
  ARM: mx27_3ds: Add camera support
  ARM: imx_v6_v7_defconfig: Add support for framebuffer and camera on mx31
2012-02-27 13:42:09 +00:00
Shawn Guo b1f91a9ce3 ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE
Some devices on some imx boards are supplied by fixed voltage, so
build REGULATOR_FIXED_VOLTAGE support in.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-02-27 17:52:48 +08:00
Shawn Guo 9394243fc8 ARM: imx: update imx_v6_v7_defconfig
It adds CONFIG_BLK_DEV_INITRD and runs savedefconfig.  The resulted
can boot Linaro rootfs out of box.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-02-27 17:52:48 +08:00
Fabio Estevam 932fe704bb ARM: imx_v6_v7_defconfig: Add support for framebuffer and camera on mx31
Let framebuffer and camera support be built by default on mx31.

Tested on a mx31pdk board.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-02-27 10:13:46 +01:00
Jaccon Bastiaansen 64a38516ff CS89x0 : add CS89x0 platform device to the iMX31ADS board
Add CS89x0 networking support to the iMX31ADS board by using the
platform driver support in the CS89x0 driver.

Signed-off-by: Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-02-01 16:52:02 +01:00
Sascha Hauer 3f07f35570 ARM i.MX: Update defconfig
This updates the defconfig for i.MX3, i.MX5 and i.MX6.

- all these can be compiled together now, so remove mx3_defconfig and
  mx5_defconfig and introduce a imx_v6_v7_defconfig instead.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-11-16 08:37:53 +01:00