summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx5/board-mx51_babbage.c
Commit message (Collapse)AuthorAgeFilesLines
* ARM i.MX: Merge i.MX5 support into mach-imxSascha Hauer2011-11-161-429/+0
| | | | | | | | | | This patch moves the contents of arch/arm/mach-mx5 to arch/arm/mach-imx and adjusts the Makefile/Kconfig entries in a way that it's possible to compile i.MX5 together with i.MX3/6. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Tested-by: Shawn Guo <shawn.guo@linaro.org> Tested-by: Dirk Behme <dirk.behme@de.bosch.com>
* Merge branch 'imx/devel' into next/dtArnd Bergmann2011-11-011-14/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | The board changes in the imx/devel branch conflict with other changes in the device imx/dt branch. Conflicts: arch/arm/mach-mx5/board-mx53_loco.c arch/arm/mach-mx5/board-mx53_smd.c arch/arm/plat-mxc/include/mach/common.h arch/arm/plat-mxc/include/mach/memory.h Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * Merge branch 'imx/cleanup' into imx/develArnd Bergmann2011-10-071-14/+12
| |\ | | | | | | | | | | | | | | | | | | | | | This helps resolve the conflicts between the imx cleanups and the new code that has gone into the imx tree. Conflict resolution was originally done by Sascha Hauer. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | *---. Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', ↵Sascha Hauer2011-08-261-14/+12
| | |\ \ \ | | | | | | | | | | | | | | | | | | 'cleanups/troy-cleanup-iomux-v3' and 'cleanups/ukl-mx5-dynamically-allocate-devices' into imx-cleanups-for-arnd
| | | | | * ARM: mx5: dynamically allocate high speed i2c (imx-i2c actually)Uwe Kleine-König2011-08-011-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the last device from devices.c. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | | * ARM: mx5: dynamically allocate fsl-usb2-udc devicesUwe Kleine-König2011-08-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | | * ARM: mx5: dynamically allocate mxc-ehci devicesUwe Kleine-König2011-08-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally make the usb related defines consistent with the other imx SoCs. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * | ARM: i.MX51: Remove _MX51_PAD_xxx referencesTroy Kisky2011-08-171-2/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new macro NEW_PAD_CTRL to remove _MX51_PAD_xxx references. A later patch will remove the _MX51_PAD_xxx symbols. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | imx5: not include the unused head fileJason Liu2011-08-161-1/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the useless <asm/irq.h> and <linux/irq.h> reference Signed-off-by: Jason Liu <jason.hui@linaro.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * / / ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLERSascha Hauer2011-09-261-0/+1
| |/ / | | | | | | | | | | | | | | | Also, add handle_irq callbacks to machine descriptors. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'dt/gic' into next/dtArnd Bergmann2011-10-311-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/include/asm/localtimer.h arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-omap2/board-generic.c
| * | | ARM: mach-mx5: convert boot_params to atag_offsetNicolas Pitre2011-08-211-1/+1
| |/ / | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
* / / arm/mx5: add device tree support for imx51 babbageShawn Guo2011-10-181-2/+7
|/ / | | | | | | | | | | | | | | | | It adds device tree support for imx51 babbage board. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge commit 'v3.1-rc1' into imx-fixesSascha Hauer2011-08-081-19/+41
|\|
| * mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5Shawn Guo2011-07-271-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch extends card_detect and write_protect support to get mx5 family and more scenarios supported. The changes include: * Turn platform_data from optional to mandatory * Add cd_types and wp_types into platform_data to cover more use cases * Remove the use of flag ESDHC_FLAG_GPIO_FOR_CD * Adjust some machine codes to adopt the platform_data changes * Work around the issue that software reset will get card detection circuit stop working With this patch, card_detect and write_protect gets supported on mx5 based platforms. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Chris Ball <cjb@laptop.org> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Tested-by: Arnaud Patard <arnaud.patard@rtp-net.org> Acked-by: Chris Ball <cjb@laptop.org>
| * ARM:mach-mx5/board-mx51_babbage: Add CD and WP GPIOsAndre Silva2011-07-071-2/+20
| | | | | | | | | | Signed-off-by: Andre Silva <andre.silva@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * Merge remote-tracking branch 'grant/gpio/next-mx' into devel-featuresSascha Hauer2011-07-071-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-imx/mach-mx31_3ds.c arch/arm/mach-imx/mach-scb9328.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * gpio/mxc: Change gpio-mxc into an upstanding gpio driverShawn Guo2011-06-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch makes necessary changes on gpio-mxc as below to turn it into an upstanding gpio driver. * Add a list to save all mx2 ports references, so that mx2_gpio_irq_handler can walk through all interrupt status registers * Use readl/writel to replace mach-specific accessors __raw_readl/__raw_writel * Change mxc_gpio_init into mxc_gpio_probe function * Move "struct mxc_gpio_port" into gpio-mxc.c, as it needs not to be public at all, and also make some other cleanup on plat-mxc/include/mach/gpio.h at the same time And the patch then migrates mach-imx and mach-mx5 to the updated driver by adding corresponding platform devices. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Olof Johansson <olof@lixom.net> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| * | ARM: mx5/mx51_babbage: Use gpio_request_array for USBH1 pinsFabio Estevam2011-07-071-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using gpio_request followed by gpio_direction_output use gpio_request_array when requesting multiple pins. Also fixed the location of the delay for the reset and make the BABBAGE_USB_PHY_RESET to toggle. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: mx5/mx51_babbage: Move GPIO initialization for USB PHY Reset line to ↵Fabio Estevam2011-07-071-5/+6
| |/ | | | | | | | | | | | | | | | | | | | | common place The USB PHY Reset GPIO can be configured in the same place as the other GPIOs. While at it rename the pin as BABBAGE_USB_PHY_RESET to make clearer its purpose. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / ARM: board-mx51_babbage: Fix UART2 registrationFabio Estevam2011-07-261-1/+1
|/ | | | | | | | | On MX51 Babbage board the RTS/CTS pins are not used on UART2 port. Fix the registration of this port. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx51: Remove imx51_add_gpio_keysFabio Estevam2011-05-191-1/+1
| | | | | | | | | | | There is no need for using a MX51-specific version of imx_add_gpio_keys. Remove imx51_add_gpio_keys and use imx_add_gpio_keys instead. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> LAKML-Reference: 1302105926-20574-1-git-send-email-fabio.estevam@freescale.com Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: imx: remove #includes already available from devices-common.hUwe Kleine-König2011-05-191-4/+0
| | | | | | | | | | | | | | | | | Most machine files include "devices-imxXX.h" which in turn includes <mach/devices-common.h>. The latter already includes many headers that the machine files don't need to include again. These were found by: $ grep \#include arch/arm/plat-mxc/include/mach/devices-common.h > tmpfile $ git grep -l 'devices-imx' arch/arm | xargs grep -f tmpfile -F (but I kept linux/init.h, linux/kernel.h and linux/platform_device.h) LAKML-Reference: 1298912674-15153-2-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx5/babbage: Use gpio_request_one in babbage_usbhub_resetFabio Estevam2011-05-191-7/+5
| | | | | | | | | | | | Current code inside babbage_usbhub_reset uses gpio_direction_output with initial value of the GPIO and also sets the GPIO value via gpio_set_value to the same level right after. This is not needed. By using gpio_request_one it is possible to set the direction and initial value in one shot. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> LAKML-Reference: 1300377359-23212-2-git-send-email-fabio.estevam@freescale.com Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx5/babbage: Use gpio_request_one in babbage_fec_resetFabio Estevam2011-03-231-3/+2
| | | | | | | | | | | Current code inside babbage_fec_reset uses gpio_direction_output with initial value of the GPIO and also sets the GPIO value via gpio_set_value to the same level right after. This is not needed. By using gpio_request_one it is possible to set the direction and initial value in one shot. 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>
* ARM: mx3+mx5: rename mxc_board_init to ${machine}_initUwe Kleine-König2011-02-111-5/+5
| | | | | | | | mxc_board_init is too generic to be useful. Additionally change some mxc_timer to ${machine}_timer, too. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM i.MX ehci: do ehci init in board specific functionsSascha Hauer2011-02-111-4/+9
| | | | | | | | | | 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: mx5: use .init_early to initialize cpu type, reset address and iomuxerUwe Kleine-König2011-02-101-1/+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 i.MX51 mx51 babbage: remove unnecessary CONFIG_SERIAL_IMX ifdefsSascha Hauer2011-01-271-14/+5
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM i.MX51: Full iomux supportSascha Hauer2010-12-151-19/+19
| | | | | | | | 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>
* MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2)Lothar Waßmann2010-12-151-6/+6
| | | | | | | | | | | | | | | | | | | 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: mx5: check for error in ioremapFabio Estevam2010-12-141-0/+4
| | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx5/mx51_babbage: Add watchdog supportFabio Estevam2010-12-071-0/+1
| | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* iMX51: introduce IMX_GPIO_NRArnaud Patard (Rtp)2010-12-031-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* mx51_babbage: Add SPI flash supportFabio Estevam2010-11-241-0/+36
| | | | | | | | | | MX51 Babbage has an AT45DB321 SPI Flash connected to eCSPI1. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookieLothar Waßmann2010-11-241-5/+5
| | | | | | | | | | | | | | 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>
* ARM: imx: fix name for functions adding sdhci-esdhc-imx devicesUwe Kleine-König2010-11-191-2/+2
| | | | | | and restore alphabetic ordering. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2010-10-281-1/+48
|\ | | | | | | devel-stable
| * ARM: mx5: Add gpio-keys to mx51 babbage boardDinh Nguyen2010-10-261-0/+24
| | | | | | | | | | | | | | Add functionality for the power button on MX51 Babbage board. Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * cpufreq for freescale mx51Yong Shen2010-10-221-1/+5
| | | | | | | | | | | | | | | | Currently, only two operating points: 160Mhz and 800Mhz. the operating points are tested on babbage 3.0 Signed-off-by: Yong Shen <yong.shen@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * babbage: esdhc device registrationShawn Guo2010-10-211-0/+19
| | | | | | | | | | | | | | Update babbage board support to register esdhc device Signed-off-by: Shawn Guo <shawn.gsc@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | arm: remove machine_desc.io_pg_offst and .phys_ioNicolas Pitre2010-10-201-2/+0
|/ | | | | | | | | | | | | | | Since we're now using addruart to establish the debug mapping, we can remove the io_pg_offst and phys_io members of struct machine_desc. The various declarations were removed using the following script: grep -rl MACHINE_START arch/arm | xargs \ sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }' [ Initial patch was from Jeremy Kerr, example script from Russell King ] Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Eric Miao <eric.miao at canonical.com>
* ARM: imx: dynamically register fec devicesUwe Kleine-König2010-10-111-5/+1
| | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx51: dynamically register imx-uart devicesUwe Kleine-König2010-10-011-5/+5
| | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx5: dynamically register imx-i2c devicesUwe Kleine-König2010-10-011-4/+3
| | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx5/mx51_babbage: don't use PHYS_OFFSETUwe Kleine-König2010-09-271-1/+1
| | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* ARM: mx5/mx51_babbage: fix compiler warningsSascha Hauer2010-09-271-2/+2
| | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* ARM: mx5/mx51_babbage: Add FEC supportFabio Estevam2010-09-271-1/+42
| | | | | | | | Tested it by booting a rootfs via NFS. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* [PATCH] mxc: Fix pad names for imx51Amit Kucheria2010-07-261-1/+1
| | | | | | | | | | | The pads capable of being used as GPIOs had their pad-name and mode-name switched. Also, fix the following: - Whitespace fixes - Replace IOMUX_CONFIG_ALTn with 'n' Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mx5: Register i2c on Freescale MX51 Babbage HWDinh Nguyen2010-07-261-0/+26
| | | | | | | | Add device registration and setup IOMUX pins in the mx51_babbage board feil. Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 06:27:30 +0000