summaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc
AgeCommit message (Collapse)Author
2011-01-06Merge branch 'devel-stable' into develRussell King
Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h
2011-01-04ARM i.MX53: Make MX53 EVK bootableYong Shen
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>
2011-01-03ARM i.MX51: rename IPU irqsSascha Hauer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-03MX51: Add support for usb host 2Arnaud Patard (Rtp)
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-03arch/arm/plat-mxc/ehci.c: fix errors/typosArnaud Patard (Rtp)
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>
2011-01-03arm: mx50: add mx50 reference design board supportRichard Zhao
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>
2011-01-03arm: mx50: add core functions support except clockRichard Zhao
Add core definitions and memory map, gpio, irq, iomux, uart device support. Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-03arm: mx5: mx51/53 have different mxc_cpu_type definitionRichard Zhao
Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-03arm: mx51: define mx51's own MXC_GPIO_IRQSRichard Zhao
mx5 SoCs have different GPIO port count. Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-03arm: plat-mxc: add full parameter macro to define gpio portRichard Zhao
Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-22ARM: mxc: update clock source registrationRussell King
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-12-15ARM i.MX51: Full iomux supportSascha Hauer
This iomux file has been constructed from the Freescale pinmux tool. It contains all pins from the tool, but the datasheet lists some configurations not present in the tool, these are not yet added. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-15MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2)Lothar Waßmann
This patch actually replaces the 'struct pad_desc' with a u64 cookie to facilitate adding platform specific pad_ctrl settings to an existing pad definition. So, instead of: iomux_v3_cfg_t power_key = MX51_PAD_EIM_A27__GPIO_2_21; power_key.pad_ctrl = MX51_GPIO_PAD_CTRL_2; mxc_iomux_v3_setup_pad(&power_key); one can write: mxc_iomux_v3_setup_pad((MX51_PAD_EIM_A27__GPIO_2_21 & ~MUX_PAD_CTRL_MASK) | MX51_GPIO_PAD_CTRL_2); Patch applies to branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/imx/linux-2.6 Signed-Off-By: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-14ARM: mx5: check for error in ioremapFabio Estevam
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-14Fix imx cpufreq driver as moduleArnaud Patard (Rtp)
When building as module: ERROR: "cpufreq_gov_performance" [arch/arm/plat-mxc/cpufreq.ko] undefined! WARNING: modpost: Found 1 section mismatch(es). To see full details build your kernel with: 'make CONFIG_DEBUG_SECTION_MISMATCH=y' make[1]: *** [__modpost] Error 1 make: *** [modules] Error 2 It's due to the driver using CPUFREQ_DEFAULT_GOVERNOR, even it should not (see commit 8122c6cea033e8034e99d3b10a4e3f377ce23994 in Linus tree), so remove it. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-14mx51: support FIQ on TZIC, revisedPeter Horton
Add support for FIQ on mx51 TZIC TZIC changes tested with FIQ audio on an mx51 board AVIC changes build with mx3_defconfig, not tested Signed-off-by: Peter Horton <phorton@bitbox.co.uk> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-14mx51: add SSI3Peter Horton
Add SSI3 to MX51 Signed-off-by: Peter Horton <phorton@bitbox.co.uk> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-14watchdog: imx: use clk_get to acquire the watchdog clockFabio Estevam
Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-07ARM: mx5: add support for the two watchdog modulesFabio Estevam
MX51 has two watchdog modules. Add support for both of them. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-06Merge commit 'v2.6.37-rc4' into imx-for-2.6.38Sascha Hauer
Done to resolve merge conflict: Conflicts: arch/arm/mach-mx25/devices-imx25.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-03iMX51: introduce IMX_GPIO_NRArnaud Patard (Rtp)
Currently, to define a GPIO number, we're using something like : #define EFIKAMX_PCBID0 (2*32 + 16) to define GPIO 3 16. This is not really readable and it's error prone imho (note the 3 vs 2). So, I'm introducing a new macro to define this in a better way. Now, the code sample become : #define EFIKAMX_PCBID0 IMX_GPIO_NR(3, 16) v2: - move to gpio.h - add parens & spaces - switch to IMX_GPIO_NR instead of MX51_GPIO_NR Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Cc: Amit Kucheria <amit.kucheria@linaro.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-03ARM: mx5: dynamically allocate imx2-wdt devicesFabio Estevam
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-03ARM: mx5: introduce SOC_IMX51Fabio Estevam
Introduce SOC_IMX51 to keep consistency with the other i.MX devices Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-03ARM: mx25: fix offset for usb host controllerUwe Kleine-König
In commit 2c20b9f (ARM: mx25: dynamically allocate mxc-ehci devices) I changed the offset to the value specified in the reference manual intending to test this change on hardware. This slipped through and now prooved to be wrong. So fix it and add a comment about the documentation being wrong. Reported-by: Jaume Ribot <jaume@fqingenieria.es> Cc: Michael Trimarchi <trimarchi@gandalf.sssup.it> Cc: Shawn Guo <shawn.gsc@gmail.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-03plat-mxc/ehci.c: fix compile breakageEric Bénard
commits 2eb42d5c287f5e883a4b3ebe668ba880caa351e5 and 9e1dde33876ba83ad586c336647fff133d0f5472 renamed some defines but didn't fix all the places where these defines are used leading to a compile failure for USB on i.MX31, 35 and 27. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-03ARM i.MX SDMA: Add ROM script addresses to platform_dataSascha Hauer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-03dmaengine i.MX SDMA: Allow to run without firmwareSascha Hauer
The SDMA firmware consists of a ROM part and a RAM part. The ROM part is always present in the SDMA engine and is sufficient for many cases. This patch allows to pass in platform data containing the script addresses in ROM, so loading a firmware is optional now. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Dan Williams <dan.j.williams@intel.com>
2010-11-28ARM: imx: Get the silicon version from the IIM moduleDinh Nguyen
Instead of reading the silicon version from ROM, we should read the SREV register from the IIM. Freescale has dropped all support for MX51 REV1.0, only MX51 REV 2.0 and 3.0 are valid. Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24ARM: imx: Add core definitions for MX53Dinh Nguyen
Add iomux, clocks, and memory map for Freescale's MX53 SoC. Add cpu_is_mx53 function to common.h. Add 3 more banks of gpio's to mxc_gpio_ports. Add MX53 phys offset address. Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24ARM i.MX51: Make CONFIG_MXC_TZIC an invisible optionSascha Hauer
There's no point showing this option to the user. The correct value will be selected anyway. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24ARM i.MX irq: Compile avic irq code only on SoCs that need itSascha Hauer
This patch adds a Kconfig option for the avic irq controller and lets the SoCs that need it select this option. Also, as we have two irq controllers for i.MX, irq.c is not appropriate anymore, so rename it to avic.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24imx: fix iomux v3Arnaud Patard (Rtp)
Commit "ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie" (b705cb4d42e95a4a43a8945571c8613e71526c3d) introduced a typo which was preventing my efikamx to boot. This patch is fixing that. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Tested-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24efikamx: add resetArnaud Patard (Rtp)
The efikamx board is using a gpio to reset the board so add support for it Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24imx51: fix gpio_4_24 and gpio_4_25 pad configurationArnaud Patard (Rtp)
s/NO_PAD_CTRL/MX51_GPIO_PAD_CTRL/ Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24imx51: add gpio mode for csi1 {h,v}syncArnaud Patard (Rtp)
Add definitions for configuring CSI1_{H,V}SYNC as GPIO Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24imx51: enhance iomux configuration for esdhc supportArnaud Patard (Rtp)
- add definition to configure pads as ESDHC{1,2} WP and CD Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24imx51: fix iomux configurationArnaud Patard (Rtp)
- ALT0 is used to set GPIO mode of GPIO_1_{2,3,4,5,6,7,8,9} but it's ALT1 for GPIO_1_{0,1}. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookieLothar Waßmann
The following patch is a first step to convert the 'struct pad_desc' to a bitmapped cookie to facilitate adding platform specific pullup or drive strength definitions to existing pad definitions without need to rewrite the complete pad def. The patch wraps 'struct pad_desc' in an opaque data type and introduces macros to access the individual members. This patch does not constitute any functional change! Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Sascha Hauer
into imx-for-2.6.38
2010-11-19ARM: imx: fix name for functions adding sdhci-esdhc-imx devicesUwe Kleine-König
and restore alphabetic ordering. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: mx3: dynamically allocate imx-keypad devicesUwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: mx3: dynamically allocate imx2-wdt devicesUwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: mx3: dynamically allocate mxc-ehci devicesUwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: mx3: dynamically allocate fsl-usb2-udc devicesUwe Kleine-König
While adapting the #defines for this I noticed that the offset used for USB HS on i.MX35 differs from the documented offset. I kept the working offset and commented that the documentation differs. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: mx3: dynamically allocate mxc_rnga devicesUwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: mx3: dynamically register mxc-mmc devicesUwe Kleine-König
Compared to the static devices the dynamic have a DMA resource. This should be save as it seems unused in the driver. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: mx3: introduce SOC_IMX31 and SOC_IMX35Uwe Kleine-König
Additionally convert some known to be good usages to the new names. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: mx3: move registration of gpios to plat-mxc/gpio.cUwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoCUwe Kleine-König
Some usages of ARCH_MX25 are assuming that if it is defined the other SoCs are undefined. Use SOC_IMX25 for the save places. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: imx: let IMX_HAVE_PLATFORM_IMX_FB select HAVE_FB_IMXUwe Kleine-König
This way FB_IMX can just depend on HAVE_FB_IMX and machines just need to select IMX_HAVE_PLATFORM_IMX_FB without bothering about HAVE_FB_IMX. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>