summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* scripts/mkublheader: add program to produce an UBL image headerJan Luebbe2012-07-041-0/+9
| | | | | | | | This image header is used for booting from SPI using the TI User Boot Loader (UBL). Signed-off-by: Jan Luebbe <jlu@pengutronix.de> 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>
* ARM mmu: flush page tables in arm_mmu_remap_sdram()Sascha Hauer2012-07-031-1/+4
| | | | 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/resource-size'Sascha Hauer2012-07-0210-23/+23
|\ \ | | | | | | | | | | | | | | | Conflicts: drivers/base/resource.c fs/fs.c
| * | resource: store 'end' instead of 'size' in struct resourceSascha Hauer2012-07-0110-23/+23
| |/ | | | | | | | | | | | | | | | | | | 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-0212-24/+867
|\ \
| * | ARM: initial ConnectCore® i.MX51 board supportAlexander Shiyan2012-06-3011-0/+843
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/poweroff'Sascha Hauer2012-07-023-0/+60
|\ \
| * | rzx50: add poweroff supportAntony Pavlov2012-06-303-0/+60
| |/ | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/mips-clocksource'Sascha Hauer2012-07-022-5/+4
|\ \
| * | MIPS: XBurst: use clocks_calc_mult_shift() for JZ4755's clocksourceAntony Pavlov2012-06-291-2/+3
| | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | MIPS: XBurst: fix the JZ4755's clocksource input frequency valueAntony Pavlov2012-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 40 KHz frequency value was used to parry __lshrdi3() error on little-endian MIPS because the __lshrdi3() function is used in clocksource code. The true value of the JZ4755's external clock frequency is 24 MHz. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | clocksource: move the NSEC_PER_SEC constant to common headerAntony Pavlov2012-06-291-2/+0
| |/ | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/mmuinfo'Sascha Hauer2012-07-023-1/+121
|\ \
| * | mmuinfo: add a command do display the result of virtual to physical translationJan Luebbe2012-06-303-1/+121
| |/ | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/mxs-usb'Sascha Hauer2012-07-026-7/+114
|\ \ | | | | | | | | | | | | 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-304-6/+5
| |/ | | | | | | | | | | 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-0212-52/+319
|\ \ | | | | | | | | | | | | 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-302-2/+29
| |/ | | | | | | | | Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> 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>
| * | I.MX clko: Using strtol function instead strtoul for getting argument for ↵Alexander Shiyan2012-06-301-1/+1
| |/ | | | | | | | | | | | | | | | | | | clko source This change is necessary because valid source argument for the clko command can be negative. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/sparse'Sascha Hauer2012-07-025-9/+15
|\ \
| * | ARM i.MX clocksource: put registers in iomem spaceSascha Hauer2012-06-301-5/+7
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM i.MX speed: sparse fixesSascha Hauer2012-06-304-4/+8
| |/ | | | | | | | | | | | | - Add missing #include <mach/clock.h> - add global functions to mach/clock.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/misc'Sascha Hauer2012-07-022-10/+14
|\ \
| * | ARM i.MX51 babbage: add mci1Sascha Hauer2012-06-301-0/+1
| | | | | | | | | | | | | | | | | | The iomuxer is already initialized, only need to add the device. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | Setup UART-pads via iomux interfaceAlexander Shiyan2012-06-302-10/+13
| |/ | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/dma-cache-align'Sascha Hauer2012-07-0211-6/+115
|\ \
| * | ARM mmu: add dma_allocMarc Kleine-Budde2012-06-302-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | dma_alloc() allocates memory aligned to cache lines. We have to use cache line aligned buffers if a driver calls dma_inv_range on the buffer. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | nios: add dma_alloc, asm/dma.hMarc Kleine-Budde2012-06-302-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | This patch add dma_alloc to existing dma-mapping.h. On nios the mem is aligned to D_ACHE_LINE_SIZE. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | blackfin, mips, openrisc, ppc, sandbox, x86: add generic dma_alloc, dma_free ↵Marc Kleine-Budde2012-06-306-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inlines Some drivers call dma_inv_range() on buffers, on arm these buffers must be cache line aligned. This patch introduces a generic dma_alloc, dma_free. Archs can implement in their own functions in "asm/dma.h" and add a: #define dma_alloc dma_alloc #define dma_free dma_free On all other archs the generic versions, which translate into xmalloc and free are used. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>