summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/mxs'Sascha Hauer2013-03-041-0/+120
|\
| * SPI: Add i.MX 23/28 SPI driver supportMichael Grzeschik2013-02-111-0/+2
| | | | | | | | | | Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM mxs: ssp move to common register layoutMichael Grzeschik2013-02-111-0/+118
| | | | | | | | | | | | | | | | | | This patch moves the register defines and bit definitions into one include file. As the defines are common for ssp and mci devices they can be shared. Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM i.MX28: Add missing return value in non-void functionSascha Hauer2013-02-151-0/+2
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM i.MX28: change default watchdog reset methodSteffen Trumtrar2013-02-121-0/+12
|/ | | | | | | | | | | | The default setting for the imx28 watchdog is to do a power-off reset. If the SoC is only powered via battery, then the watchdog powers the chip down, though. According to the datasheet it should still be possible to execute a proper POR with battery power, but testing showed otherwise. When the watchdog power-off reset is disabled, a software reset is executed instead. This works with and without battery power. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: cfa10036: Add the AT24HC02 I2C EEPROMMaxime Ripard2012-12-141-0/+3
| | | | | | | | | | | | This EEPROM is found on the expansion boards available for the 10036 module. Since we won't need to do anything fancy except reading/writing from it, use bitbanging to communicate with it. This EEPROM will hold mostly the board_id so that we can determine if there is an expansion board plugged in and what expansion board it is. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'kconfig'Sascha Hauer2012-12-081-3/+3
|\
| * Cleanup Kconfig filesAlexander Shiyan2012-12-081-3/+3
| | | | | | | | | | | | | | | | | | This patch provides a global cleanup barebox Kconfig files. This includes replacing spaces to tabs, formatting in accordance format, removing extraneous lines and spaces. No functional changes. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mxs: get_fecclk is hclk, not a constantWolfram Sang2012-12-071-2/+1
|/ | | | | | | | | | | | | | | | The fec has multiple clock inputs: - 50MHz clock for generating the (R)MII clock - bus clock The MDIO clock is derived from the bus clock, not the 50MHz clock, so pass this into the driver so that it can correctly configure the MDIO clock divider. This fixes several wrong MDIO register read problems on i.MX28 boards. Reported-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/mxs'Sascha Hauer2012-11-161-4/+35
|\
| * arm: mxs: use timeouts in block reset routinesWolfram Sang2012-10-311-4/+35
| | | | | | | | | | | | | | | | These routines can fail, add support for that. Also, put in missing copyright headers. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | gpio: provide generic gpio headerJean-Christophe PLAGNIOL-VILLARD2012-10-051-4/+2
|/ | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Merge branch 'for-next/imx-clk'Sascha Hauer2012-10-042-14/+0
|\
| * ARM i.MX/MXS: Allow to include imx*-regs.h directlySascha Hauer2012-10-042-14/+0
| | | | | | | | | | | | In fact we can be happy about everyone including the files directly. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | switch all platform_bus device/driver registering to ↵Jean-Christophe PLAGNIOL-VILLARD2012-10-041-1/+1
|/ | | | | | | | platform_driver/device_register now register_driver and register_device are for bus only usage. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Merge branch 'for-next/remove-fsf-address'Sascha Hauer2012-10-0312-48/+0
|\ | | | | | | | | | | Conflicts: drivers/net/miidev.c include/miidev.h
| * Treewide: remove address of the Free Software FoundationSascha Hauer2012-09-1712-48/+0
| | | | | | | | | | | | | | The FSF address has changed in the past. Instead of updating it each time the address changes, just drop it completely treewide. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM mxs: Clear USB boot mode during startupSascha Hauer2012-09-161-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When the i.MX28 boots from USB, the ROM code sets this bit. When after a reset the ROM code detects that this bit is set it will boot from USB again. This means that if we boot once from USB the chip will continue to boot from USB until the next power cycle. To prevent this (and boot from the configured bootsource instead) clear this bit here. This bit is not documented in the datasheets, it was figured out the hard way. Whether this is the same on i.MX23 is currently not known. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | boards: Add support for imx233-olinuxino boardFadil Berisha2012-09-101-0/+7
|/ | | | | | | | | | | | | | | | | | | | | imx23-olinuxino is a board designed by Olimex. It has the following features: - Freescale iMX233 ARM926J processor at 454MHz -64 MB RAM -SD-card connector -TV PAL/NTSC video output -2 USB High Speed Hosts -Ethernet 100 Mbit -Stereo Audio Input -Stereo Headphones Audio Output More information at: http://www.olimex.com/dev/imx233-olinuxino-maxi.html Signed-off-by: Fadil Berisha <f.koliqi@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* arm: mxs: bcb: fix usage of second bootstreamWolfram Sang2012-09-031-1/+1
| | | | | | | | | | If a second bootstream was used, there was a sanity check which was not only wrong (using erasesize instead of writesize) but also superfluous (we got the block from an existing cdev, so it must be in the flash range). Simply remove it to make bcb work as expected. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/cfa-10036'Sascha Hauer2012-08-011-0/+8
|\
| * Add support for the Crystalfontz CFA-10036 boardMaxime Ripard2012-07-041-0/+8
| | | | | | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Brian Lilly <brian@crystalfontz.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM/MXS: pull-up and bitkeeper must be handled differentlyJuergen Beisert2012-07-232-4/+6
| | | | | | | | | | | | | | | | | | | | | | Since commit 2f6b1f7690640f571f8e72fc2f2564acb2e13778 the pull-up and bitkeeper handling for i.MX23/28 is correct. But now it is important to distinguish these pin features as their programmed bit values are different. With this patch the bitkeeper and pull-up enable/disable bits are now handled separately. Signed-off-by: Juergen Beisert <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM/MXS: the GPIO bitkeeper enable logic is inverse to the pullup enable logicJuergen Beisert2012-07-161-1/+1
|/ | | | | | | | | While a set bit enables the pullup (if exists) it disables the bitkeeper (if exists). Both features are using the same register bit and only one of this feature is present on a per pin base. Signed-off-by: Juergen Beisert <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/mxs-nand'Sascha Hauer2012-07-0212-2/+639
|\ | | | | | | | | | | | | Conflicts: arch/arm/mach-mxs/Kconfig arch/arm/mach-mxs/Makefile drivers/Makefile
| * ARM mxs: add bcb command to create 'boot control block' for NAND bootWolfram Sang2012-06-303-0/+408
| | | | | | | | | | | | | | | | We write a proper FCB, but no DBBT since it is unresolved how to keep it in sync with Linux-based BBTs. Also, we imply searchcount = 4 and stride = 64 (which is the default) until we can verify via ocotp. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
| * mtd nand: add mxs-nand driverWolfram Sang2012-06-306-1/+46
| | | | | | | | | | | | | | | | | | | | Based on the U-Boot version. Changed to kernel style register layout, added MX23 support (WIP!), made MMU aware and adapted to barebox. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * dma: add mxs-apbh-dma driverWolfram Sang2012-06-301-0/+145
| | | | | | | | | | | | | | | | | | Based on the U-Boot version. Changed to kernel style register layout, added MX23 support, made MMU aware and adapted to barebox. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM mxs: Add mxs_reset_block functionSascha Hauer2012-06-303-1/+40
| | | | | | | | | | | | | | The i.MX23/28 have a reset block to reset several units. Add a function to support this. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/mxs-usb'Sascha Hauer2012-07-025-6/+113
|\ \ | | | | | | | | | | | | Conflicts: arch/arm/mach-mxs/Makefile
| * | ARM i.MX28 usb: Add USBPHY supportSascha Hauer2012-06-304-1/+110
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM i.MX23 usb: move to SoC specific functionsSascha Hauer2012-06-303-5/+4
| |/ | | | | | | | | | | Makes space for a i.MX28 specific USBPHY implementation. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/mxs-reset'Sascha Hauer2012-07-024-64/+77
|\ \ | | | | | | | | | | | | Conflicts: arch/arm/mach-mxs/Makefile
| * | ARM/MXS: add new way to reset the whole SoCJuergen Beisert2012-06-304-64/+77
| |/ | | | | | | | | | | | | | | | | | | Currently the watchdog is occupied for system reset. This usage collides with the dedicated usage of a watchdog. This patch change the behaviour of at least i.MX23/i.MX28 where the chipset supports a simple and powerful alternative to reset the whole SoC (including the PMIC). Signed-off-by: Juergen Beisert <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/mx28-ocotp'Sascha Hauer2012-07-0211-50/+291
|\ \ | | | | | | | | | | | | Conflicts: arch/arm/mach-mxs/ocotp.c
| * | arm: mxs: add write support for ocotpWolfram Sang2012-06-302-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we now can change HCLK and VDDIO, we can now support writing to OCOTP. Writing is done via a special data register. This is u32, so we need to fill a temporary buffer when offset or count is not aligned. The write is also protected by a special device variable. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: mxs: use consistent naming for #defines for ocotpWolfram Sang2012-06-301-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | Will the code more readable, especially since future additions are planned. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: mxs: refactor timeout routine for ocotpWolfram Sang2012-06-301-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | Let's keep the timeout routine in a central place. We will need it more often when we add write support. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: mxs: add functions to get/set vddioWolfram Sang2012-06-302-0/+40
| | | | | | | | | | | | | | | | | | | | | Needed for ocotp write. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: mxs: refactor access to power domainWolfram Sang2012-06-304-29/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | usbphy initializaion needs to access the power supply and has this embedded. Refactor to a seperate power.c, since we need other accesses in the future. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: mxs: add POWER_BASE for MX28, tooWolfram Sang2012-06-301-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: mxs: add imx_set_hclkWolfram Sang2012-06-304-0/+44
| | | | | | | | | | | | | | | | | | | | | needed for writing the One-Time-Prgorammable Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: mxs: make get_hclk result useable for upcoming set_hclkWolfram Sang2012-06-302-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | To avoid getting a different divider due to rounding errors when using set_hclk later, use DIV_ROUND_UP for the returned value. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: mxs: get MAC from OCOTP for MX28EVKWolfram Sang2012-06-301-0/+1
| |/ | | | | | | | | Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / use loff_t for file offsetsSascha Hauer2012-06-301-2/+2
|/ | | | | | | This is a first step for 64bit file support: Make the file sizes/offsets 64bit. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* complete: add empty complete supportJean-Christophe PLAGNIOL-VILLARD2012-04-301-0/+2
| | | | | | | | | | for cpuinfo, clear, dhcp, false, login, lsmod, meminfo, passwd, pwd, reginfo, reset, true, usb, version for mach-imx and mach-mxs: dump_clocks for u_serial: mycdev Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* ARM mxs: Add cpu_is_mx* macros for drivers shared with i.MXSascha Hauer2012-04-241-0/+10
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* arm: tx28: select OCOTP driverWolfram Sang2012-04-131-0/+1
| | | | | | | | Compile fixes unknown symbol 'mxs_ocotp_read' for tx28 defconfig. Since the vendor stores the MAC address in OCOTP, we always want this driver. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'master' into nextSascha Hauer2012-04-111-0/+4
|\
| * fix mxs iomux error in mx23 caseEric Bénard2012-04-051-0/+4
| | | | | | | | | | | | | | | | | | | | e62edd3 mxs: Fix support for BITKEEPER() macro added this macro in iomux-imxc.c but the macro is not present in the i.MX23 case. Adding it in iomux-imx23.h fix both imx23evk_defconfig and chumbyone_defconfig Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 12:35:41 +0000