summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* ARM: mx3: use .init_early to initialize cpu type, reset address and iomuxerUwe Kleine-König2011-02-1014-71/+87
| | | | | | | | 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+mx3: convert to mc13xxx MFDDavid Jander2011-02-104-12/+12
| | | | | | Signed-off-by: David Jander <david@protonic.nl> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx3/mx31_3ds: fix compiler warning without CONFIG_USB_ULPIUwe Kleine-König2011-02-101-1/+1
| | | | | | | | | This fixes: arch/arm/mach-mx3/mach-mx31_3ds.c:249: warning: 'mx31_3ds_host2_init' defined but not used Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'imx-board-ifdefs' into imx-for-2.6.39Sascha Hauer2011-01-313-29/+4
|\
| * ARM i.MX31 pcm037 eet: remove unnecessary CONFIG_SPI_IMX ifdefsSascha Hauer2011-01-271-2/+0
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM i.MX31 mx31ads: remove unnecessary CONFIG_SERIAL_8250 ifdefsSascha Hauer2011-01-271-8/+1
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM i.MX31 mx31ads: remove unnecessary CONFIG_SERIAL_IMX ifdefsSascha Hauer2011-01-271-6/+0
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM i.MX31 mx31ads: remove unnecessary CONFIG_I2C ifdefsSascha Hauer2011-01-271-6/+0
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM i.MX35 pcm043: put usbh1 outside CONFIG_USB_ULPISascha Hauer2011-01-271-3/+3
| | | | | | | | | | | | | | 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>
| * ARM i.MX35 pcm043: remove unnecessary CONFIG_I2C ifdefsSascha Hauer2011-01-271-4/+0
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM: mach-mx3/mach-mx31_3ds: Remove unnecessary function for IO mappingFabio Estevam2011-01-281-9/+1
|/ | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Introduce VPR200 board.Marc Reilly2011-01-193-0/+342
| | | | | Signed-off-by: Marc Reilly <marc@cpdesign.com.au> 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-152-11/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-141-2/+2
| |\ | | | | | | | | | devel-stable
| | * ARM i.MX mx31_3ds: Fix MC13783 regulator namesSascha Hauer2011-01-141-2/+2
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: mx3: irq_data conversion.Lennert Buytenhek2011-01-131-9/+9
| | | | | | | | | | | | Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
* | | Change the register name definitions for mc13783Yong Shen2011-01-122-4/+4
|/ / | | | | | | | | | | | | | | | | | | | | To make mc13783 and mc13892 share code, the register names should be changed to fit the new macro definitions in the comming patch. Signed-off-by: Yong Shen <yong.shen@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
* | Merge branch 'devel-stable' into develRussell King2011-01-0626-496/+450
|\| | | | | | | | | | | Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h
| * ARM: mx3/mx31_3ds: Add support for USB Host2 portFabio Estevam2011-01-031-0/+77
| | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: mx3/mx31_3ds: Add support for OTG host modeFabio Estevam2011-01-032-1/+37
| | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: mx3/mx35_3ds: Add USB OTG Host modeFabio Estevam2011-01-031-1/+26
| | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2)Lothar Waßmann2010-12-151-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * ARM: mx3/mx31_3ds: Add watchdog supportFabio Estevam2010-12-142-0/+2
| | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * watchdog: imx: use clk_get to acquire the watchdog clockFabio Estevam2010-12-142-2/+2
| | | | | | | | | | | | | | 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>
| * Merge commit 'v2.6.37-rc4' into imx-for-2.6.38Sascha Hauer2010-12-061-2/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Done to resolve merge conflict: Conflicts: arch/arm/mach-mx25/devices-imx25.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: imx: Get the silicon version from the IIM moduleDinh Nguyen2010-11-282-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | ARM i.MX irq: Compile avic irq code only on SoCs that need itSascha Hauer2010-11-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | mx31_3ds: Add touchscreen supportFabio Estevam2010-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | On the mx31_3ds board the touchscreen feature is provided by MC13783 PMIC. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookieLothar Waßmann2010-11-244-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Sascha Hauer2010-11-2424-462/+269
| |\ \ | | | | | | | | | | | | into imx-for-2.6.38
| | * | ARM: imx: fix name for functions adding sdhci-esdhc-imx devicesUwe Kleine-König2010-11-195-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | and restore alphabetic ordering. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: mx3/mx35_3ds: Add watchdog supportUwe Kleine-König2010-11-192-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bases on a patch by Fabio Estevam who added the device before it was allocated dynamically. Cc: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: mx3: dynamically allocate imx-keypad devicesUwe Kleine-König2010-11-196-23/+11
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: mx3: dynamically allocate imx2-wdt devicesUwe Kleine-König2010-11-199-42/+16
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: mx3: dynamically allocate mxc-ehci devicesUwe Kleine-König2010-11-1916-135/+76
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: mx3: dynamically allocate fsl-usb2-udc devicesUwe Kleine-König2010-11-1913-59/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | ARM: mx3: dynamically allocate mxc_rnga devicesUwe Kleine-König2010-11-193-20/+1
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: mx3: dynamically register mxc-mmc devicesUwe Kleine-König2010-11-1911-64/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | ARM: mx3: introduce SOC_IMX31 and SOC_IMX35Uwe Kleine-König2010-11-193-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally convert some known to be good usages to the new names. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: mx3: use an MX35 constant in imx35 only codeUwe Kleine-König2010-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ... instead of MX3x Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: mx3: move registration of gpios to plat-mxc/gpio.cUwe Kleine-König2010-11-192-39/+12
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: mx3/mach-pcm037_eet: Fix section mismatch for eet_init_devices()Alberto Panizzo2010-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function should be marked as __init because it is used only in the init phase. This fix the compiler warning: LD arch/arm/mach-mx3/built-in.o WARNING: arch/arm/mach-mx3/built-in.o(.text+0x1328): Section mismatch in reference from the function eet_init_devices() to the (unknown reference) .init.rodata:(unknown) The function eet_init_devices() references the (unknown reference) __initconst (unknown). This is often because eet_init_devices lacks a __initconst annotation or the annotation of (unknown) is wrong. Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: change the way flexcan devices are registeredUwe Kleine-König2010-11-171-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group soc specific data in a global struct instead of repeating it for each call to imxXX_add_flexcanX. The structs holding the actual data are placed in .init.constdata and so don't do much harm. Compared to the previous approach this reduces code size to call imx_add_flexcan. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: dynamically allocate mxc_w1 devicesUwe Kleine-König2010-11-176-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there is no platform data used in the driver. In case this changes NULL is passed unused to the soc specific functions. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: use MXxy_IO_P2V macros to setup static mappingsUwe Kleine-König2010-11-171-34/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes less code rely on the virtual constants. To further simplify code and reduce the needed boilerplate when defining the static mappings a new helper macro is defined in mach/hardware.h. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: refactor the io mapping macroUwe Kleine-König2010-11-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it more assembler friendly and allows it to be used in situation that need an unsigned long and not a pointer. Also the naming is clearer. IOMEM is introduced without IMX_ prefix as it is used this way in more than one ARM subarch and it might become globally available soon. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: mx3: fix the last users of IMX_NEEDS_DEPRECATED_SYMBOLSUwe Kleine-König2010-11-173-59/+61
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* | | | Merge branch 'smp' into miscRussell King2011-01-061-3/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c
| * | | ARM i.MX pcm037 eet: compile fixesSascha Hauer2010-11-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The pcm037 eet extension currently does not compile if SPI_IMX is enabled. Fix it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mach-pcm037_eet: Fix section mismatch for eet_init_devices()Alberto Panizzo2010-11-021-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function should be marked as __init because it is used only in the init phase. This fix the compiler warning: LD arch/arm/mach-mx3/built-in.o WARNING: arch/arm/mach-mx3/built-in.o(.text+0x1328): Section mismatch in reference from the function eet_init_devices() to the (unknown reference) .init.rodata:(unknown) The function eet_init_devices() references the (unknown reference) __initconst (unknown). This is often because eet_init_devices lacks a __initconst annotation or the annotation of (unknown) is wrong. Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 23:51:08 +0100