3c00079b31
Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable
2010-10-19 19:55:59 +01:00
7f9c7e2811
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
2010-10-18 15:20:21 +01:00
4af8f24d99
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
2010-10-12 20:11:18 +01:00
88b5227710
msm: smd: enable smd on qsd8x50 target
...
Add msm_smd device in the qsd8x50 board file.
Signed-off-by: Niranjana Vishwanathapura <nvishwan@codeaurora.org >
Signed-off-by: Daniel Walker <dwalker@codeaurora.org >
2010-10-11 15:14:02 -07:00
a8855e9c09
msm: smd: enable smd on msm7x30 target
...
Add msm_smd device in the msm7x30 board file.
Signed-off-by: Niranjana Vishwanathapura <nvishwan@codeaurora.org >
Signed-off-by: Daniel Walker <dwalker@codeaurora.org >
2010-10-11 15:13:05 -07:00
c9ee46a910
Merge branch 'for-rmk-next' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
2010-10-11 17:30:44 +01:00
81490fcdf4
mx51: efikamx: add otg support
...
Ethernet hangs off OTG
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 16:29:17 +02:00
088d01b00e
mx51: add support for genesi efikamx nettop
...
Get serial port working for now
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 16:29:17 +02:00
4b5ee7a768
ARM: iomux-mx51: Add AUD5 pinmux definitions
...
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:32:54 +02:00
0d0e9cbf81
mx25/clocks: match esdhc-clocks to platform device
...
So the correct clock will be taken for each of the two independent
controllers.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de >
Cc: Eric Bénard <eric@eukrea.com >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:31:41 +02:00
886ab3dae2
mxc/gpio: make _set_value work with values != 0/1
...
Documentation/gpio.txt specifies that the value argument to
gpio_set_value() should be handled as a boolean (E.G. != 0 is high),
so use the same logic as in _set_direction().
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:31:40 +02:00
9524705c86
MX35: Fix bogus L2 cache settings
...
i.MX35 CPUs marked with "MCIMX357CJQ5C M99V CTHA0943B" are coming with bogus
L2 cache settings. If these settings are kept unmodified prior enabling the L2
cache the CPU runs amok immediately when its enabled.
This fix should not hurt already working CPUs, as they are using the written
register value already.
Its currently unknown if its possible to detect the production lot from the
software to fix only affected CPUs.
While at it, make sure that mxc_init_l2x0 is only executed on i.MX31/35
Signed-off-by: Juergen Beisert <jbe@pengutronix.de >
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:31:39 +02:00
55fd2ef6d9
ARM: mx3/cpuimx35: mark otg_pdata and usbh1_pdata as maybe unused
...
This fixes
arch/arm/mach-mx3/mach-cpuimx35.c:143: warning: 'otg_pdata' defined but not used
arch/arm/mach-mx3/mach-cpuimx35.c:148: warning: 'usbh1_pdata' defined but not used
when USB_ULPI is not selected.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:31:38 +02:00
6bd96f3c33
ARM: imx: dynamically register fec devices
...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:31:37 +02:00
8a8d20600d
ARM: imx: fix/define clocks and create devices for imx dma
...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:30:31 +02:00
67520f3a89
ARM: mx35: Add mx35_revision function to query the silicon revision
...
Based on work done earlier by Sascha Hauer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
Signed-off-by: Eric Bénard <eric@eukrea.com >
[ukl: actually squash the two approaches together]
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:28:32 +02:00
fdb03870a9
ARM: mx3: use MX3x_ prefixed version of CHIP_REV_x
...
Also, remove the deprecated symbols from arch/arm/mach-mx3/cpu.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:28:32 +02:00
6f8460eb82
eukrea_mbimxsd for cpuimx25: add CAN & SDCard support
...
Signed-off-by: Eric Bénard <eric@eukrea.com >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:22:14 +02:00
f5e40c28b6
i.mx25: add esdhc support
...
Signed-off-by: Eric Bénard <eric@eukrea.com >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:22:13 +02:00
438a4d66a5
eukrea_mbimxsd for cpuimx35: add CAN & SDCard support
...
Signed-off-by: Eric Bénard <eric@eukrea.com >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:22:12 +02:00
9a545943a3
arm: pcm043: add esdhc-device to boardconfig
...
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:22:11 +02:00
774305d0ee
arm: imx35: add esdhc-device to MX35-platform
...
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:22:10 +02:00
203a073470
arm: imx: add generic esdhc device
...
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-10-11 15:22:05 +02:00
b476ef059e
ARM: pxa/balloon3: Disperse MFP config
...
Move pin config to appropriate places and use it only if needed.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com >
Acked-By: Jonathan McDowell <noodles@earth.li >
Signed-off-by: Eric Miao <eric.y.miao@gmail.com >
2010-10-09 17:10:40 +08:00
f090c74b23
ARM: mmp: update cpuid of pxa168 and pxa910
...
Correct the cpuid of pxa168 and pxa910.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com >
Signed-off-by: Eric Miao <eric.y.miao@gmail.com >
2010-10-09 17:07:32 +08:00
Russell King
Niranjana Vishwanathapura
Amit Kucheria
Sascha Hauer
Wolfram Sang
Peter Korsgaard
Juergen Beisert
Uwe Kleine-König
Eric Bénard
Marek Vasut
Haojian Zhuang