Commit Graph

54196 Commits

Author SHA1 Message Date
Fabio Estevam abc1813dc0 ARM: mach-mx5/board-mx53_loco: Remove unused UARTs
On mx53_loco only UART1 is used and its signals go to connector J16.

Remove UART2 and UART3 as they are not used on this board.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Richard Zhao <richard.zhao@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-02-01 10:26:00 +01:00
Fabio Estevam 528f65271f ARM: mach-mx5/board-mx53_loco: Make UART1 functional
Fix IOMUX settings for UART1 and make UART1 functional.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Richard Zhao <richard.zhao@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-02-01 10:25:50 +01:00
Fabio Estevam 67f2a87f92 ARM: mach-mx5: Fix build for mx53_loco and mx53_smd
Commit 816ad74 (ARM: i.MX53: Add full iomux support for mx53) renamed some of the pad names.

Make the changes accordingly so that mx53_loco and mx53_cmd can build without errors.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Richard Zhao <richard.zhao@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-02-01 10:25:08 +01:00
Alexander Stein 039c4644b4 plat-mxc: Provide irq_chip name for GPIO IRQs
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-02-01 09:42:14 +01:00
Sascha Hauer bf9f6c8fcd Merge branch 'imx-board-ifdefs' into imx-for-2.6.39 2011-01-31 09:23:41 +01:00
Fabio Estevam 4404117d74 ARM: mach-mx3/mach-mx31_3ds: Remove unnecessary function for IO mapping
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-28 13:22:54 +01:00
Sascha Hauer 44b4ca32fe ARM i.MX28: remove reserved register defines
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
2011-01-28 08:28:57 +01:00
Sascha Hauer d69934bc7b ARM i.MX23: remove reserved register defines
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
2011-01-28 08:28:52 +01:00
Sascha Hauer 0e8b462de0 ARM i.MX23/28: do not use complicated macros if not necessary
Get rid of ## preprocessor construct where it only makes the
code harder to read.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
2011-01-28 08:28:46 +01:00
Sascha Hauer ef19660b0a ARM i.MX23/28: deobfuscate gpio initialization
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
2011-01-28 08:28:35 +01:00
Sascha Hauer 53cdd3068b ARM i.MX51 efikamx: remove unnecessary CONFIG_SERIAL_IMX ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-27 14:33:55 +01:00
Sascha Hauer 7f16f817e2 ARM i.MX51 cpuimx51: remove unnecessary CONFIG_SERIAL_8250 ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-27 14:33:54 +01:00
Sascha Hauer 818956e0b6 ARM i.MX51 mx51-3ds: remove unnecessary CONFIG_KEYBOARD_IMX ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-27 14:33:36 +01:00
Sascha Hauer 27d2d62b8b ARM i.MX51 mx51 babbage: remove unnecessary CONFIG_SERIAL_IMX ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-27 14:32:50 +01:00
Sascha Hauer 0c1c8511a3 ARM i.MX51 mx51 3ds: remove unnecessary CONFIG_SERIAL_IMX ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-27 14:32:43 +01:00
Sascha Hauer b49a2a69e5 ARM i.MX31 pcm037 eet: remove unnecessary CONFIG_SPI_IMX ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-27 12:51:27 +01:00
Sascha Hauer 285faa1b56 ARM i.MX27 eukrea mbimx27: remove unnecessary CONFIG_SPI_IMX ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-27 12:51:26 +01:00
Sascha Hauer 5ec561afbc ARM i.MX27 pca100: remove unnecessary CONFIG_SPI_IMX ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-27 12:51:24 +01:00
Sascha Hauer 9f43e44be8 ARM i.MX31 mx31ads: remove unnecessary CONFIG_SERIAL_8250 ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-27 12:51:23 +01:00
Sascha Hauer 889faeaad0 ARM i.MX31 mx31ads: remove unnecessary CONFIG_SERIAL_IMX ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-27 12:51:20 +01:00
Sascha Hauer afc11e6ef7 ARM i.MX31 mx31ads: remove unnecessary CONFIG_I2C ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-27 12:51:18 +01:00
Sascha Hauer 070ed73359 ARM i.MX35 pcm043: put usbh1 outside CONFIG_USB_ULPI
The usbh1 port of the pcm043 does not use ulpi, so put it outside
the corresponding ifdefs.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-27 12:51:14 +01:00
Sascha Hauer 0fbfd987ff ARM i.MX35 pcm043: remove unnecessary CONFIG_I2C ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-27 12:51:13 +01:00
Shawn Guo 376e9c5848 ARM: mxs: add initial pm support
This is a very initial pm support and basically does nothing.
With this pm support entry, drivers can start testing their own
pm functions.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-26 08:30:49 +01:00
Sascha Hauer cf3567aaad ARM MXS: Add auart platform support for i.MX28
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-25 08:39:58 +01:00
Fabio Estevam 9c2c35848c ARM: imx: Add initial support for IMX27IPCAM board
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-25 08:29:22 +01:00
Daiane Angolini 56f94b1e6e ARM: mx5/mx51_3ds: Add watchdog support
Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-24 08:44:01 +01:00
Shawn Guo a320b2793d ARM: mxs/mx28evk: read fec mac address from ocotp
Read fec mac address from ocotp and save it into fec_platform_data
mac field for fec driver to use.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-21 11:36:49 +01:00
Shawn Guo 67f43086a2 ARM: mxs: add ocotp read function
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-21 11:36:49 +01:00
Fabio Estevam bb58b3e8b1 ARM: mx5: Use dummy clock for the keypad
Reuse dummy_clk for the imx-keypad device instead of using a dedicated kpp_clk.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-21 11:33:20 +01:00
Dinh Nguyen 816ad741b6 ARM: i.MX53: Add full iomux support for mx53
This iomux file contains all the available pins that are iomux
capable.

Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-21 11:32:45 +01:00
Marc Reilly 00c89c1d18 Introduce VPR200 board.
Signed-off-by: Marc Reilly <marc@cpdesign.com.au>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-19 09:58:42 +01:00
Richard Zhao 98b7d550f2 arm: mx50_rdp: add i2c bus support
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-19 09:58:21 +01:00
Richard Zhao 82c520dccf arm: mx50_rdp: add fec support
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-19 09:57:56 +01:00
Jason Liu a929dcf70e ARM i.MX50: Rename devices-mx50.h
There are devices-imx51.h and devices-imx53.h under
arch/arm/mach-mx5 directory. So, had better rename
devices-mx50.h to devices-imx50.h to follow the same
naming convention with imx51 and imx53 part.

Signed-off-by: Jason Liu <r64343@freescale.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-19 09:54:13 +01:00
Linus Torvalds a25cecce88 Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Fix asm/pgtable.h
  microblaze: Fix missing pagemap.h
2011-01-18 08:06:22 -08:00
Linus Torvalds 6a7f6ec951 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (25 commits)
  m68knommu: fix broken setting of irq_chip and handler
  m68knommu: switch to using -mcpu= flags for ColdFire targets
  m68knommu: arch/m68knommu/Kconfig whitespace cleanup
  m68knommu: create optimal separate instruction and data cache for ColdFire
  m68knommu: support ColdFire caches that do copyback and write-through
  m68knommu: support version 2 ColdFire split cache
  m68knommu: make cache push code ColdFire generic
  m68knommu: clean up ColdFire cache control code
  m68knommu: move inclusion of ColdFire v4 cache registers
  m68knommu: merge bit definitions for version 3 ColdFire cache controller
  m68knommu: create bit definitions for the version 2 ColdFire cache controller
  m68knommu: remove empty __iounmap() it is no used
  m68knommu: remove kernel_map() code, it is not used
  m68knommu: remove do_page_fault(), it is not used
  m68knommu: use user stack pointer hardware on some ColdFire cores
  m68knommu: remove command line printing DEBUG
  m68knommu: remove fasthandler interrupt code
  m68knommu: move UART addressing to part specific includes
  m68knommu: fix clock rate value reported for ColdFire 54xx parts
  m68knommu: move ColdFire CPU names into their headers
  ...
2011-01-18 08:05:20 -08:00
Linus Torvalds c6fa63c659 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf tools: Fix tracepoint id to string perf.data header table
  perf tools: Fix handling of wildcards in tracepoint event selectors
  powerpc: perf: Fix frequency calculation for overflowing counters
2011-01-18 08:04:30 -08:00
Jassi Brar fbcb44dea8 ARM: S5PV310: Add missing virtual ASoC DMA device
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2011-01-18 14:47:07 +09:00
Jassi Brar b9368f324a ARM: S5PV210: Add missing virtual ASoC DMA device
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2011-01-18 14:45:33 +09:00
Jassi Brar be370adca0 ARM: S5P6450: Add missing virtual ASoC DMA device
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2011-01-18 14:44:32 +09:00
Jassi Brar 8418f8873a ARM: S5P6440: Add missing virtual ASoC DMA device
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2011-01-18 14:44:32 +09:00
Jassi Brar 2fe4f0cb4b ARM: S5P6442: Enable I2S device to work on SMDK6442
Add missing virtual ASoC DMA device.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
[kgene.kim@samsung.com: minor changed title]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2011-01-18 14:44:32 +09:00
Linus Torvalds 8c34482c17 Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  spi/spi_sh_msiof: fix a wrong free_irq() parameter
  dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()
2011-01-17 11:18:40 -08:00
Linus Torvalds ab2020f2f1 Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (59 commits)
  mtd: mtdpart: disallow reading OOB past the end of the partition
  mtd: pxa3xx_nand: NULL dereference in pxa3xx_nand_probe
  UBI: use mtd->writebufsize to set minimal I/O unit size
  mtd: initialize writebufsize in the MTD object of a partition
  mtd: onenand: add mtd->writebufsize initialization
  mtd: nand: add mtd->writebufsize initialization
  mtd: cfi: add writebufsize initialization
  mtd: add writebufsize field to mtd_info struct
  mtd: OneNAND: OMAP2/3: prevent regulator sleeping while OneNAND is in use
  mtd: OneNAND: add enable / disable methods to onenand_chip
  mtd: m25p80: Fix JEDEC ID for AT26DF321
  mtd: txx9ndfmc: limit transfer bytes to 512 (ECC provides 6 bytes max)
  mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips
  mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips
  mtd: nand: ams-delta: drop omap_read/write, use ioremap
  mtd: m25p80: add debugging trace in sst_write
  mtd: nand: ams-delta: select for built-in by default
  mtd: OneNAND: lighten scary initial bad block messages
  mtd: OneNAND: OMAP2/3: add support for command line partitioning
  mtd: nand: rearrange ONFI revision checking, add ONFI 2.3
  ...

Fix up trivial conflict in drivers/mtd/Kconfig as per DavidW.
2011-01-17 11:15:30 -08:00
Linus Torvalds af575e2d2e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
  alpha: fix WARN_ON in __local_bh_enable()
  alpha: fix breakage caused by df9ee29270
  alpha: add GENERIC_HARDIRQS_NO__DO_IRQ to Kconfig
  alpha/osf_sys: remove unused MAX_SELECT_SECONDS
  alpha: change to new Makefile flag variables
  alpha: kill off alpha_do_IRQ
  alpha: irq clean up
  alpha: use set_irq_chip and push down __do_IRQ to the machine types
2011-01-17 10:58:44 -08:00
Linus Torvalds e1288cd72f Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (63 commits)
  ARM: PL08x: cleanup comments
  Update CONFIG_MD_RAID6_PQ to CONFIG_RAID6_PQ in drivers/dma/iop-adma.c
  ARM: PL08x: fix a warning
  Fix dmaengine_submit() return type
  dmaengine: at_hdmac: fix race while monitoring channel status
  dmaengine: at_hdmac: flags located in first descriptor
  dmaengine: at_hdmac: use subsys_initcall instead of module_init
  dmaengine: at_hdmac: no need set ACK in new descriptor
  dmaengine: at_hdmac: trivial add precision to unmapping comment
  dmaengine: at_hdmac: use dma_address to program DMA hardware
  pch_dma: support new device ML7213 IOH
  ARM: PL08x: prevent dma_set_runtime_config() reconfiguring memcpy channels
  ARM: PL08x: allow dma_set_runtime_config() to return errors
  ARM: PL08x: fix locking between prepare function and submit function
  ARM: PL08x: introduce 'phychan_hold' to hold on to physical channels
  ARM: PL08x: put txd's on the pending list in pl08x_tx_submit()
  ARM: PL08x: rename 'desc_list' as 'pend_list'
  ARM: PL08x: implement unmapping of memcpy buffers
  ARM: PL08x: store prep_* flags in async_tx structure
  ARM: PL08x: shrink srcbus/dstbus in txd structure
  ...
2011-01-17 10:54:41 -08:00
Anton Blanchard 4bca770ede powerpc: perf: Fix frequency calculation for overflowing counters
When profiling a benchmark that is almost 100% userspace, I noticed some wildly
inaccurate profiles that showed almost all time spent in the kernel.

Closer examination shows we were programming a tiny number of cycles into the
PMU after each overflow (about ~200 away from the next overflow). This gets us
stuck in a loop which we eventually break out of by throttling the PMU (there
are regular throttle/unthrottle events in the log).

It looks like we aren't setting event->hw.last_period to something same and the
frequency to period calculations in perf are going haywire.

With the following patch we find the correct period after a few interrupts and
stay there. I also see no more throttle events.

Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
LKML-Reference: <20110117161742.5feb3761@kryten>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2011-01-17 11:43:02 +01:00
Ivan Kokshaysky f5de6ecc84 alpha: fix WARN_ON in __local_bh_enable()
Interrupts ought to be disabled _before_ irq_enter().

Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Matt Turner <mattst88@monolith.freenet-rz.de>
2011-01-17 05:42:16 +01:00
Ivan Kokshaysky e2609f6aa2 alpha: fix breakage caused by df9ee29270
Commit df9ee29270 made arch_local_irq_save and arch_local_irq_restore
static inline which with -Werror trips up on __set_hae() and _set_hae()
which are extern inline.  The naive solution is to make __set_hae() and
set_hae() static inline but for reasons described in commit d559d4a24a
this breaks the generic kernel build.  Instead, since this is architecture
specific code, this patch hard wires in the architecture specific method
f disabling and enabling interrupts.

Tested-by: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Matt Turner <mattst88@gmail.com>
2011-01-17 05:42:15 +01:00