summaryrefslogtreecommitdiff
path: root/arch/arm
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-samsungWolfgang Denk2010-09-08-144/+229
|\
| * ARMV7: S5P: rename the member of gpio structureMinkyu Kang2010-08-30-86/+86
| | | | | | | | | | | | | | | | | | Typically we declare the name of gpio structure to "gpio", so it was duplicated around the name. (e.g: gpio->gpio_a) This patch modified the naming that is removing "gpio_". Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| * ARMV7: S5P: separate the peripheral clocksMinkyu Kang2010-08-30-6/+26
| | | | | | | | | | | | | | | | | | | | Because of peripheral devices can select clock sources, separate the peripheral clocks. (pwm, uart and so on) It just return the pclk at s5pc1xx SoC, but s5pc210 SoC must be calculated by own clock register setting. Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| * ARMV7: S5P: fix the macro at samsung_get_base functionMinkyu Kang2010-08-26-1/+1
| | | | | | | | | | | | New line is unnecessary at last line of macro. Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| * S5P: mmc: fix the mmc offsetMinkyu Kang2010-08-23-1/+1
| | | | | | | | | | | | This patch fixed the size of mmc structure. Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| * ARMV7: S5P: rename from s5pc1xx to s5pMinkyu Kang2010-08-23-22/+28
| | | | | | | | | | | | | | | | Because of these are common files around s5p Socs, rename from s5pc1xx to s5p. And getting cpu_id is SoC specific, so move to SoC's header file. Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| * ARMV7: S5P: make s5p-common for sharing the code between s5pc1xx and s5pc2xxMinkyu Kang2010-08-23-2/+46
| | | | | | | | | | | | | | | | This patch adds basic support for s5pc210. s5p-common will be used by all of s5p SoCs. Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| * S5P: Use accessor functions instead of SoC specific defines to access the ↵Minkyu Kang2010-08-17-29/+44
| | | | | | | | | | | | | | | | | | | | | | base address This patch is intended to prepare the other S5P SoC. (s5pc210) If use SoC specific defines then can't share with other SoC. So, make the accessor functions for access the base address by common way. Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-marvellWolfgang Denk2010-09-07-3/+3
|\ \
| * | orion5x: fix comment-in-comment typo in cpu.hAlbert Aribaud2010-08-27-1/+1
| | | | | | | | | | | | Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
| * | Kirkwood: bugfix: window size (mis)calculationPrafulla Wadaskar2010-08-26-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixed kw_winctrl_calcsize() off-by-1 bug which caused mapping windows size to be cut by half. This corrected all windows address configuration Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
| * | Orion5x: bugfix: window size (mis)calculationAlbert Aribaud2010-08-26-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix orion5x_winctrl_calcsize() off-by-1 bug which caused mapping windows to be cut by half. This afected all windows including NOR flash (causing half the flash to be unaccessible) but DRAM was and still is fine as its size is determined otherwise. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
* | | Merge branch 'master' of /home/wd/git/u-boot/masterWolfgang Denk2010-09-07-107/+3
|\ \ \ | |/ / |/| |
| * | omap2: i2c: remove redundant header definitionsNishanth Menon2010-08-23-106/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the register offset and common defines which are already present in drivers/i2c/omap24xx.h. All of these defines carry the same value even. Cc: Steve Sakoman <steve@sakoman.com> Cc: Heiko <hs@denx.de> Cc: Sandeep Paulraj <s-paulraj@ti.com> Cc: Wolfang Denk <wd@denx.de> Signed-off-by: Nishanth Menon <nm@ti.com> Acked-by: Steve Sakoman <steve@sakoman.com>
| * | omap2: i2c: add syss offsetNishanth Menon2010-08-23-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMAP2420 ES2.3 trm defines syss register offset as 0x10. Add it. Cc: Steve Sakoman <steve@sakoman.com> Cc: Heiko <hs@denx.de> Cc: Sandeep Paulraj <s-paulraj@ti.com> Cc: Wolfang Denk <wd@denx.de> Signed-off-by: Nishanth Menon <nm@ti.com> Acked-by: Steve Sakoman <steve@sakoman.com>
* | | Merge branch 'master' of /home/wd/git/u-boot/masterWolfgang Denk2010-08-18-24/+1168
|\ \ \ | |/ /
| * | ARM: Update ARM mach-typesSandeep Paulraj2010-08-18-24/+1116
| | | | | | | | | | | | | | | | | | This patch updates the mach-types.h based on the latest linux kernel Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * | AM35x: Adding SCM general register definitionsAjay Kumar Gupta2010-08-12-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | Adding general register structure of system control module (SCM) of AM35x. This would be required to access devconf2 and ip_sw_reset register in musb module. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-tiWolfgang Denk2010-08-12-6/+6
|\ \ \ | |/ /
| * | Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2010-08-10-59/+682
| |\ \
| * | | miiphy: constify device nameMike Frysinger2010-08-09-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The driver name does not need to be writable, so constify it. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | | | ARM: Add support for MB86R0x SoCsMatthias Weisser2010-08-10-0/+950
| |/ / |/| | | | | | | | Signed-off-by: Matthias Weisser <weisserm@arcor.de>
* | | Merge branch 'master' of git://git.denx.de/u-boot-imxWolfgang Denk2010-08-10-1/+1
|\ \ \
| * | | MX51EVK: fix return value of get_timer_maskedLi Haibo2010-08-10-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_timer_masked() should return current timestamp, not current ticks from hardware register. Tested on one custom board with NAND flash. Without this patch, NAND write always TIMEOUT because get_timer(0) return a big value. This patch applies for u-boot-2010.06 Signed-off-by: Li Haibo <hbli@sinocastel.com>
* | | orion5x: allow overriding default mappings windowsAlbert Aribaud2010-08-10-41/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn all ORION5X_DEF{ADR,SZ}_xxx macros into ORION5X_{ADR,SZ}_xxx and allow defining them from board code to override defaults. This is particularly useful for defining board-specific FLASH address and size in board header file rather than having to tweak orion5x code. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
* | | Merge branch 'master' of git://git.denx.de/u-boot-marvellWolfgang Denk2010-08-10-0/+8
|\ \ \
| * | | cmd_ide: add support for KirkwoodPrafulla Wadaskar2010-08-08-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added MVSATAC definitions to Kirkwood. Added support for Kirkwood in cmd_ide. Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
| * | | cmd_ide: add support for orion5xAlbert Aribaud2010-08-08-0/+3
| | |/ | |/| | | | | | | | | | | | | | | | Add MVSATAHC definitions to orion5x. Add support for orion5x in cmd_ide. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
* | | Merge branch 'master' of git://git.denx.de/u-boot-tiWolfgang Denk2010-08-10-10/+367
|\ \ \
| * | | ARMV7: Restructure omap3 musb driver to allow code sharing between OMAP3 and ↵Steve Sakoman2010-08-05-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | OMAP4 Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * | | ARMV7: Modify i2c driver for more reliable operation on OMAP4Steve Sakoman2010-08-05-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch modifies the init routine to follow the TRM recommendations. It also modifies the i2c_read_byte function to reflect subtle differences between the i2c controller in OMAP3 and OMAP4. Signed-off-by: Steve Sakoman <steve@sakoman.com> Acked-by: Nishanth Menon <menon.nishanth@gmail.com> Acked-by: Heiko Schocher <hs@denx.de> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * | | ARMV7: Fix udelay for OMAP4Steve Sakoman2010-08-05-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OMAP4 x-load code sets gptimer1 clock source to 32Khz. This isn't acceptable for udelay. This patch changes from gptimer1 to gptimer2, which uses sys_clk at 38.4 Mhz. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * | | ARMV7: Add pad mux support for OMAP4Steve Sakoman2010-08-05-0/+358
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Add functional multiplexing support for OMAP4 pads. Configure all the pads for the OMAP4430 SDP and OMAP4 Panda boards Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Aneesh V <aneesh@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* | | ARM: Define __raw_readX and __raw_writeXMarek Vasut2010-08-07-6/+40
| | | | | | | | | | | | | | | | | | | | | These functions are undefined on ARM when using __io. These are the commonly used versions and can be redefined. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
* | | Merge branch 'master' of /home/wd/git/u-boot/masterWolfgang Denk2010-08-07-1/+1
|\ \ \ | |/ / |/| / | |/
| * Rename getenv_r() into getenv_f()Wolfgang Denk2010-08-04-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While running from flash, i. e. before relocation, we have only a limited C runtime environment without writable data segment. In this phase, some configurations (for example with environment in EEPROM) must not use the normal getenv(), but a special function. This function had been called getenv_r(), with the idea that the "_r" suffix would mean the same as in the _r_eentrant versions of some of the C library functions (for example getdate vs. getdate_r, getgrent vs. getgrent_r, etc.). Unfortunately this was a misleading name, as in U-Boot the "_r" generally means "running from RAM", i. e. _after_ relocation. To avoid confusion, rename into getenv_f() [as "running from flash"] Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Detlev Zundel <dzu@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-samsungWolfgang Denk2010-08-04-0/+73
|\ \
| * | S5P: support mmc driverMinkyu Kang2010-08-03-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds support mmc driver for s5p SoC Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-tiWolfgang Denk2010-07-16-1/+96
|\ \ \ | |_|/ |/| |
| * | ARMV7: Add basic gpmc initialization for OMAP4Steve Sakoman2010-07-15-1/+96
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds a gpmc_init function for OMAP4 and adds calls to gpmc_init for existing OMAP4 boards: panda and sdp4430 Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-pxaWolfgang Denk2010-07-15-7/+451
|\ \ \
| * | | PXA: Add support for LMS285GF05 into pxafbMarek Vasut2010-07-14-0/+34
| | | | | | | | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| * | | Voipac PXA270 LCD SupportMarek Vasut2010-07-14-0/+33
| | | | | | | | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| * | | PXA: Add OneNAND booting support to start.SMarek Vasut2010-07-14-5/+43
| | | | | | | | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| * | | PXA: Add PWM2 and PWM3 regs to pxa-regs.hMarek Vasut2010-07-14-1/+9
| | | | | | | | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| * | | PXA: Add hardware init helper macrosMarek Vasut2010-07-14-0/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds macros for the following purposes: - GPIO configuration - SDRAM configuration - Wakeup - Clock configuration - Interrupt controller configuration These macros are intended to replace numerous copies of the same code. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| * | | Enable PXAFB for PXA27X and PXA3XXMarek Vasut2010-07-14-1/+8
| | | |
* | | | Merge branch 'master' of ../masterWolfgang Denk2010-07-15-2/+19
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | mvgbe: add support for orion5x GbE controllerAlbert Aribaud2010-07-12-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add definitions and initialization in orion5x for mvgbe. Add orion5x in mvgbe SoC includes. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr> Acked-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | mvgbe: support SoCs other than kirkwoodAlbert Aribaud2010-07-12-2/+5
| |/ | | | | | | | | | | | | | | | | Rename all references to kirkwood in mvgbe symbols throughout the whole codebase. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr> Acked-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>