summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/misc'Sascha Hauer2012-10-031-0/+4
|\
| * ARM i.MX: add debug for iomux-v3Sascha Hauer2012-09-281-0/+4
| | | | | | | | | | | | | | iomux setup often is the source of great fun. Add some debug printf for it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/karo-tx53'Sascha Hauer2012-10-031-0/+8
|\ \
| * | ARM i.MX: Add Ka-Ro TX53 board supportSascha Hauer2012-09-161-0/+8
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/driver'Sascha Hauer2012-10-0320-291/+221
|\ \ \ | |/ / |/| |
| * | gpio: reduce verbosity while probingJan Luebbe2012-09-281-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM i.MX: Add devicetree support for clocksource driverSascha Hauer2012-09-231-0/+13
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM i.MX: add devicetree support for gpio driverSascha Hauer2012-09-231-1/+38
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM i.MX: implement clocksource as driverSascha Hauer2012-09-1719-218/+79
| | | | | | | | | | | | | | | | | | | | | To get rid of the register definitions in the SoC header files. platform_device_id is used to distinguish between gpt types. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM i.MX: Use platform_device_id for gpio driverSascha Hauer2012-09-1410-72/+91
| | | | | | | | | | | | | | | | | | So we get the type of the gpio controller from the device Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | ARM i.MX6: add usb function prototypesSteffen Trumtrar2012-09-161-0/+3
| | | | | | | | | | | | | | | | | | | | | Add missing prototypes to mach/usb.h Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | ARM i.MX21: Add missing includeSascha Hauer2012-09-141-0/+1
|/ / | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / i.MX51: unbreak FEC iomuxEric Bénard2012-09-071-7/+7
|/ | | | | | | | | | | | in commit 2bdc9f57a86dff41cfc1f87b644a2e53fdcce2b6 the iomux was synced with the kernel but this leads to some changes in the PAD_CTRL of some FEC pins leading to a non working FEC on our cpuimx51 board. This patch set back the PAD_CTRL of the missing pins to the initial value. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/pbl'Sascha Hauer2012-09-051-0/+1
|\
| * ARM boards: Make boards pbl safeSascha Hauer2012-08-121-0/+1
| | | | | | | | | | | | | | | | With pbl support enabled most boards need a pbl-y for their lowlevel stuff. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | Merge branch 'for-next/imx'Sascha Hauer2012-09-058-1/+146
|\ \
| * | ARM i.MX6: enable usbphy1Steffen Trumtrar2012-08-312-1/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a function to take the usbphy1 through its initialization procedure. The imx6_usb_phy1_disable_oc function is needed at least on the sabrelite, as the power design is faulty. The state on other imx6 boards is unknown, therefore it is an extra function call at the moment. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM i.MX6: add the usbphy1 base addrSteffen Trumtrar2012-08-311-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | i.MX35: add cspi1 supportEric Bénard2012-08-293-0/+12
| | | | | | | | | | | | | | | | | | | | | tested with a m25p128 flash both in nand boot & spi boot. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM i.MX: Add support for i2c on imx6Steffen Trumtrar2012-08-092-0/+21
| |/ | | | | | | | | Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/i2c'Sascha Hauer2012-09-057-8/+8
|\ \
| * | IMX driver: replace imx -> fslRenaud Barbier2012-09-047-8/+8
| |/ | | | | | | | | | | | | | | | | The IMX i2c driver is to be used by SOCs on both the ARM and PPC architetures. Use a more neutral name for the structure, function names and #define. The driver name is now "i2c-fsl". Signed-off-by: Renaud Barbier <renaud.barbier@ge.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / ARM i.MX: switch to gpiolib supportSascha Hauer2012-09-0411-145/+124
|/ | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
* Merge branch 'for-next/tqma53'Sascha Hauer2012-08-011-0/+1
|\
| * ARM tqma53: switch to new environmentSascha Hauer2012-07-041-0/+1
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/sabrelite'Sascha Hauer2012-08-017-1/+55
|\ \ | | | | | | | | | | | | Conflicts: arch/arm/Makefile
| * | ARM i.MX: Add support for the Freescale i.MX6 sabrelite boardSascha Hauer2012-07-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for the Freescale i.MX6 sabrelite board with: - FEC - SD2/3 - SPI flash Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM i.MX: Add support for internal serial boot modeSascha Hauer2012-07-313-1/+30
| | | | | | | | | | | | | | | | | | This mode is needed for bootstrapping a board via USB serial. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | SPI i.MX: Add support for i.MX6Sascha Hauer2012-07-314-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | The i.MX5 does not have a valid function to get the spi clock. This patch introduces a function for i.MX6, and moves the bogus spi clock speed to the speed-imx5*.c. Not nice, but preserves the current status quo for i.MX5 Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/reset-source'Sascha Hauer2012-08-012-0/+73
|\ \ \
| * | | ARM/i.MX: add support to detect the reset sourceJuergen Beisert2012-07-182-0/+73
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Juergen Beisert <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/randconfig'Sascha Hauer2012-08-013-8/+2
|\ \ \ \
| * | | | ARM i.MX: No external NAND boot on i.MX1Sascha Hauer2012-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM i.MX: rename internal-nand-boot.c to external-nand-boot.cSascha Hauer2012-07-252-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because that's what it is. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: remove mx1ads leftoversSascha Hauer2012-07-251-7/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | We have no mx1ads support in the tree, so remove the remaining bits from Kconfig. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/imx-misc'Sascha Hauer2012-08-012-2/+7
|\ \ \ \
| * | | | imx35: mmc clock has 6 bit divider, not 3_3Marc Reilly2012-07-301-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marc Reilly <marc@cpdesign.com.au> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | i.MX: Removed unused declaration for imx_iim_get_macAlexander Shiyan2012-07-241-1/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Procedure is missing, so remove its declaration. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/imx-keypad'Sascha Hauer2012-08-013-0/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | input: add i.MX51 platform code for matrix keypad driverChristian Kapeller2012-07-173-0/+11
| |/ / | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / / ARM i.MX53: notify clocksource about changing clockWjatscheslaw Stoljarski (Slawa)2012-07-251-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | This fix a clock inaccuracy in get_time_ns (used by sleep, time, etc). At i.MX53 power-on GPT clock is typically 55500000 Hz, and it will be used to calc the clock multiplier. After call imx53_init_lowlevel() GPT clock will changed (e.g. to 66666666 Hz), but multiplier not. To fix this behavior call clock_notifier_call_chain() after changing clock in imx53_init_lowlevel(). Signed-off-by: Wjatscheslaw Stoljarski <wjatscheslaw.stoljarski@kiwigrid.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / ARM i.MX51 babbage: Use correct select for new environmentSascha Hauer2012-07-041-1/+1
|/ | | | | | It's HAVE_DEFAULT_ENVIRONMENT_NEW, not DEFAULT_ENVIRONMENT_GENERIC_NEW Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/resource-size'Sascha Hauer2012-07-022-4/+4
|\ | | | | | | | | | | Conflicts: drivers/base/resource.c fs/fs.c
| * resource: store 'end' instead of 'size' in struct resourceSascha Hauer2012-07-012-4/+4
| | | | | | | | | | | | | | | | | | | | Storing the size instead of the resource end in struct resource was a mistake. 'size' ranges from 0 to UINT[32|64]_MAX + 1 which obviously leads to problems. 'end' on the other hand will never exceed UINT[32|64]_MAX. Also this way we can express a iomem region covering the whole address space. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/digi-connect-core'Sascha Hauer2012-07-022-24/+43
|\ \
| * | ARM: initial ConnectCore® i.MX51 board supportAlexander Shiyan2012-06-301-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for ConnectCore® i.MX51 board from Digi International. A separate option includes support for debugging board for this module. Some code taken from the bootloader U-Boot and patch from Digi. Functional of Ethernet not tested yet. barebox 2012.05.0-00316-g4024d9c-dirty #0 Wed Jun 6 13:08:25 MSK 2012 Board: ConnectCore i.MX51 Module Variant: i.MX515@600MHz, PHY, Acceleromter (0x0b) Module HW Rev : 02 Module Serial : B111156789 mc13xxx-spi@mc13xxx-spi0: Found MC13892 ID: 0x0045d0 [Rev: 2.0a] NAND device: Manufacturer ID: 0x2c, Chip ID: 0xda (Micron NAND 256MiB 3,3V 8-bit) Bad block table found at page 131008, version 0x01 Bad block table found at page 130944, version 0x01 nand_read_bbt: Bad block at 0x00ce0000 nand_read_bbt: Bad block at 0x05bc0000 nand_read_bbt: Bad block at 0x0bc40000 ehci@ehci0: USB EHCI 1.00 detected i.MX51 rev 3.0 imx-esdhc@mci0: registered as mci0 imx-esdhc@mci1: registered as mci1 Malloc space: 0x95f00000 -> 0x97efffff (size 32 MB) Stack space : 0x95ef8000 -> 0x95f00000 (size 32 kB) envfs: wrong magic on /dev/env0 no valid environment found on /dev/env0. Using default environment running /env/bin/init... Hit any key to stop autoboot: 3 barebox@ConnectCore i.MX51:/ Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | i.MX51: Synchronize iomux header file from kernelAlexander Shiyan2012-06-301-24/+24
| |/ | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/imx-clko'Sascha Hauer2012-07-028-21/+124
|\ \
| * | i.MX51: Added support for "clko" commandAlexander Shiyan2012-06-302-1/+70
| | | | | | | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | i.MX clko: Added support for more than one CLKO outputsAlexander Shiyan2012-06-307-19/+53
| | | | | | | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-13 20:13:27 +0000