summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc
Commit message (Collapse)AuthorAgeFilesLines
...
| * | ARM: mxc91231/iomux: allow pin_list to be constUwe Kleine-König2011-03-071-4/+4
| | | | | | | | | | | | | | | | | | | | | While at it remove some useless consts from unsigned int arguments. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: iomux-imx31: allow pin_list to be constUwe Kleine-König2011-03-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following warning in a mx3_defconfig build: arch/arm/mach-mx3/mach-bug.c: In function 'bug_board_init': arch/arm/mach-mx3/mach-bug.c:47: warning: passing argument 1 of 'mxc_iomux_setup_multiple_pins' discards qualifiers from pointer target type While at it remove some useless consts from unsigned int arguments. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | MX1: Add data structure for SPIGwenhael Goavec-Merou2011-03-071-0/+9
| | | | | | | | | | | | | | | Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | MX1: Rename SPI interrupt name and base address.Gwenhael Goavec-Merou2011-03-071-3/+4
| | | | | | | | | | | | | | | Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: imx35: fix ATA_DATA3 pad control addressRyan Lortie2011-03-071-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the "i.MX35 (MCIMX35) Multimedia Applications Processor Reference Manual" the correct address for the pad control register IOMUXC_SW_PAD_CTL_PAD_ATA_DATA3 is 0x06ec, not 0x6e8. Signed-off-by: Ryan Lortie <desrt@desrt.ca> Acked-by: Marc Reilly <marc@cpdesign.com.au> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: mxc: add a dma mask to fec devicesUwe Kleine-König2011-03-011-2/+2
| | | | | | | | | | | | | | | | | | This is not strictly necessary but the right thing to do. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | ARM: mxc: free dma_mask in error pathUwe Kleine-König2011-03-011-0/+2
| | | | | | | | | | | | | | | | | | | | | This fixes a small memory leak that was only hit in very unlikely error paths Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | mx31: add support for the bugbase 1.3 from buglabsDenis 'GNUtoo' Carikli2011-02-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Note that the hardware schematics and documentations can be obtained here: http://www.bugcommunity.com/wiki/index.php/BUGbase Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: imx53: add sdhc pad settingsRichard Zhu2011-02-281-40/+43
| | | | | | | | | | | | | | | Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: imx53_smd add uncompress printFrank Li2011-02-211-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: imx50: correct iomux-mx50.h wrong daisy chain settingsRichard Zhao2011-02-181-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | Most fix is for uart txd/cts. They don't need to select input. And fix some other pads with wrong select input. Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: imx53_loco add uncompress printRichard Zhao2011-02-181-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: mx5: Add watchdog support for MX53Fabio Estevam2011-02-182-1/+10
| | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | i.MX51 iomux: Fixes MX51_PAD_UART2_TXD__UART2_TXD & ↵Julien Boibessot2011-02-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MX51_PAD_USBH1_DATA2__UART2_TXD declarations Fixes 2 small regressions of recent iomux changes: - current MX51_PAD_UART2_TXD__UART2_TXD declaration overwrites IOMUXC_UART2_IPP_UART_RXD_MUX_SELECT_INPUT register (0x09ec) and prevent UART2 Rx from working properly. (Tested on my custom i.MX51 board where UART2 is used as console) - current MX51_PAD_USBH1_DATA2__UART2_TXD declaration also has the same problem. (Not tested) Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM i.MX ehci: do ehci init in board specific functionsSascha Hauer2011-02-113-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mxc-ehci driver calls SoC specific phy initialization right after calling board specific initialization. To offer greater flexibility for boards to setup the phy and to get rid of some unnecessary flags in platform data this patch lets the boards call the SoC specific phy initialization and remove it from the driver. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM i.MX ehci: factor out soc specific functionsSascha Hauer2011-02-112-333/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we have a mxc_initialize_usb_hw which is called on every i.MX SoC. This function dispatches the different SoC types, which is quite ugly. This patch moves the SoC specific USB initialization to their correspondive mach directories. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | Merge commit 'v2.6.38-rc4' into imx-for-2.6.39Sascha Hauer2011-02-111-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-mxs/clock-mx28.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: mxc91231: use .init_early to initialize cpu typeUwe Kleine-König2011-02-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This used to be done in .map_io which is supposed to only setup the memory mapping. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: mx5: use .init_early to initialize cpu type, reset address and iomuxerUwe Kleine-König2011-02-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This used to be done in .map_io which is supposed to only setup the memory mapping. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: mx3: use .init_early to initialize cpu type, reset address and iomuxerUwe Kleine-König2011-02-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | This used to be done in .map_io which is supposed to only setup the memory mapping. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: imx: use .init_early to initialize cpu type and reset addressUwe Kleine-König2011-02-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This used to be done in .map_io which is supposed to only setup the memory mapping. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | plat-mxc: Provide irq_chip name for GPIO IRQsAlexander Stein2011-02-011-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: imx: Add initial support for IMX27IPCAM boardFabio Estevam2011-01-251-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX53: Add full iomux support for mx53Dinh Nguyen2011-01-211-293/+2343
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | arm: mx50_rdp: add i2c bus supportRichard Zhao2011-01-191-0/+10
| | | | | | | | | | | | | | | Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: mx50_rdp: add fec supportRichard Zhao2011-01-191-0/+5
| | | | | | | | | | | | | | | Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'p2v' into develRussell King2011-03-161-9/+9
|\ \ \ | |_|/ |/| | | | | | | | | | | Conflicts: arch/arm/kernel/module.c arch/arm/mach-s5pv210/sleep.S
| * | ARM: P2V: separate PHYS_OFFSET from platform definitionsRussell King2011-02-171-9/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uncouple PHYS_OFFSET from the platform definitions, thereby facilitating run-time computation of the physical memory offset. Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Viresh Kumar <viresh.kumar@st.com> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Magnus Damm <damm@opensource.se> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Wan ZongShun <mcuos.com@gmail.com> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Eric Miao <eric.y.miao@gmail.com> Acked-by: Jiandong Zheng <jdzheng@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | ARM: imx: Add VPR200 and MX51_3DS entries to uncompress.hFabio Estevam2011-01-241-0/+2
|/ | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Tested-by: Marc Reilly <marc@cpdesign.com.au> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-01-1516-75/+130
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (161 commits) ARM: pxa: fix building issue of missing physmap.h ARM: mmp: PXA910 drive strength FAST using wrong value ARM: mmp: MMP2 drive strength FAST using wrong value ARM: pxa: fix recursive calls in pxa_low_gpio_chip AT91: Support for gsia18s board AT91: Acme Systems FOX Board G20 board files AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h ARM: pxa: fix suspend/resume array index miscalculation ARM: pxa: use cpu_has_ipr() consistently in irq.c ARM: pxa: remove unused variable in clock-pxa3xx.c ARM: pxa: fix warning in zeus.c ARM: sa1111: fix typo in sa1111_retrigger_lowirq() ARM mxs: clkdev related compile fixes ARM i.MX mx31_3ds: Fix MC13783 regulator names ARM: plat-stmp3xxx: irq_data conversion. ARM: plat-spear: irq_data conversion. ARM: plat-orion: irq_data conversion. ARM: plat-omap: irq_data conversion. ARM: plat-nomadik: irq_data conversion. ARM: plat-mxc: irq_data conversion. ... Fix up trivial conflict in arch/arm/plat-omap/gpio.c (Lennert Buytenhek's irq_data conversion clashing with some omap irq updates)
| * Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2011-01-1412-20/+75
| |\ | | | | | | | | | devel-stable
| | * mx51: add support for pwmArnaud Patard (Rtp)2011-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is adding support for pwm1 and pwm2 devices found on mx51. [ this patch has been tested with pwm-backlight driver ] Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM: i.MX53: add IOMUX pad for ecspiYong Shen2011-01-131-0/+3
| | | | | | | | | | | | | | | | | | | | | Add IOMUX pad entry for ecspi Signed-off-by: Yong Shen <yong.shen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM: mx5: dynamically allocate imx-keypad devicesFabio Estevam2011-01-122-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for dynamical allocation of imx-keypad on mx5 platform. After moving to dynamically registration of the keypad, the keypad clock name needs to change accordingly. The reason is that the original mx5 keypad platform_device id was 0, now we use id=-1 as per arch/arm/plat-mxc/devices/platform-imx-keypad.c. Tested keypad successfully on a MX51_3DS board. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM: mx5: dynamically allocate pwm devicesFabio Estevam2011-01-122-2/+11
| | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM i.MX53 enable spi on EVK boardYong Shen2011-01-112-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1. some macro definitions fix 2. add platform data for spi device 3. register spi clocks Signed-off-by: Yong Shen <yong.shen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM i.MX53 enable sdhc support on EVK boardYong Shen2011-01-072-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | 1. changes some register address to fit macro definition 2. add platform data and clock for sdhc Signed-off-by: Yong Shen <yong.shen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM i.MX53 enable i2c on EVK boardYong Shen2011-01-071-0/+9
| | | | | | | | | | | | | | | | | | | | | add i2c platform data and clock Signed-off-by: Yong Shen <yong.shen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM i.MX53: enable fec driver on EVK boardYong Shen2011-01-073-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | 1. Adjust FEC base address name to fit macro definition 2. Add platform data and reset function for FEC Signed-off-by: Yong Shen <yong.shen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * arm: mxc: move IOMUX_CONFIG_SION definition to iomux-v3.hRichard Zhao2011-01-072-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: plat-mxc: irq_data conversion.Lennert Buytenhek2011-01-134-55/+55
| | | | | | | | | | | | Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
* | | Merge branch 'for-next' of ↵Linus Torvalds2011-01-131-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) Documentation/trace/events.txt: Remove obsolete sched_signal_send. writeback: fix global_dirty_limits comment runtime -> real-time ppc: fix comment typo singal -> signal drivers: fix comment typo diable -> disable. m68k: fix comment typo diable -> disable. wireless: comment typo fix diable -> disable. media: comment typo fix diable -> disable. remove doc for obsolete dynamic-printk kernel-parameter remove extraneous 'is' from Documentation/iostats.txt Fix spelling milisec -> ms in snd_ps3 module parameter description Fix spelling mistakes in comments Revert conflicting V4L changes i7core_edac: fix typos in comments mm/rmap.c: fix comment sound, ca0106: Fix assignment to 'channel'. hrtimer: fix a typo in comment init/Kconfig: fix typo anon_inodes: fix wrong function name in comment fix comment typos concerning "consistent" poll: fix a typo in comment ... Fix up trivial conflicts in: - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c) - fs/ext4/ext4.h Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
| * | Merge branch 'master' into for-nextJiri Kosina2010-12-222-8/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.
| * | | tree-wide: fix comment/printk typosUwe Kleine-König2010-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "gadget", "through", "command", "maintain", "maintain", "controller", "address", "between", "initiali[zs]e", "instead", "function", "select", "already", "equal", "access", "management", "hierarchy", "registration", "interest", "relative", "memory", "offset", "already", Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | | | Merge branch 'devel-stable' into develRussell King2011-01-0668-1470/+5552
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h
| * | | ARM i.MX53: Make MX53 EVK bootableYong Shen2011-01-044-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add entries to Kconfig 2. Add machine definition 3. Add Uart platform data, pad setting and base address 4. Adjust GPIO irq number Signed-off-by: Yong Shen <yong.shen@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM i.MX51: rename IPU irqsSascha Hauer2011-01-031-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | MX51: Add support for usb host 2Arnaud Patard (Rtp)2011-01-032-0/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | arch/arm/plat-mxc/ehci.c: fix errors/typosArnaud Patard (Rtp)2011-01-031-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is fixing some issues : - MXC_OTG_UCTRL_OPM_BIT is for USBCTRL register and not PHYCTRL register. - the MXC_EHCI_WAKEUP_ENABLED check was only clearing the bits so never allows to set them. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | arm: mx50: add mx50 reference design board supportRichard Zhao2011-01-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add basic function and uart device support. Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
OpenPOWER on IntegriCloud