9
0
Fork 0
Commit Graph

10342 Commits

Author SHA1 Message Date
Lucas Stach 67221982b3 ARM: imx6: rename Carrier-1 to Hummingboard
Solidrun has renamed the Carrier-1 to Hummingboard.
This is also the name that is used in upstream Linux,
change barebox to be in line with that.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-23 08:15:41 +01:00
Lucas Stach 3c3e99d6ac ARM: imx6: add initial support for Nitrogen6X boards
Only the 1GB variant is supported for now, as I don't
have anything other to test with.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-23 08:15:41 +01:00
Lucas Stach c06522e88e ARM: imx6: add support for DL variant of SabreLite Board
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-23 08:15:41 +01:00
Lucas Stach a1cb05072a ARM: imx6: split sabrelite DT
Split out common QDL parts into shared include file.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-23 08:15:41 +01:00
Lucas Stach a2d6081c56 ARM: imx6: update base DTs
Upgrade to linux-next version.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-23 08:15:41 +01:00
Lucas Stach 6267173673 ARM: imx6: update pin related DT headers
Needed to be able to update other i.MX 6 DTs properly.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-23 08:15:41 +01:00
Lucas Stach 019a363d2a dt-bindings: import input.h
Straight copy from the Linux kernel.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-23 08:15:41 +01:00
Lucas Stach cda7fb110f ARM: imx53: guard voipac vmx53 init function
Otherwise we end up doing the VMX53 board init for
unrelated boards when using a multiimage build.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-23 08:15:41 +01:00
Sascha Hauer e6201db24d ARM: i.MX DFI FS700-M60: Update for new boards
This adds support for new board variants. Now Supported are:

- i.MX6q module with 1GiB Micron RAM
- i.MX6d/q modules with 1GiB/2GiB Nanya RAM
- i.MX6s modules with 512MiB/1GiB Nanya RAM

This has been tested on:

- i.MX6q module with 1GiB Micron RAM
- i.MX6d module with 2GiB Nanya RAM
- i.MX6s module with 1GiB Nanya RAM

The possible RAM equipment is:

- For the 512MiB module: 2x Nanya nt5cb128m16fp-di
- For the 1GiB modules: 2x Nanya nt5cc256m16cp or 4x Micron MT41K128M16JT-125
- For the 2GiB module: 4x Nanya nt5cc256m16cp

The 512MiB Nanya board is assumed to work with the same DCD table
as the 1GiB Nanya board. The variant is detected by mirroring at
512MiB, but this hasn't been tested by Pengutronix.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-23 08:15:37 +01:00
Sascha Hauer c8156afa22 ARM: i.MX DFI FS700-M60: Add SPI NOR flash update handler
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Conflicts:
	arch/arm/boards/dfi-fs700-m60/board.c
2014-01-15 08:25:19 +01:00
Sascha Hauer ffc386d06f ARM: i.MX DFI FS700-M60: Add SPI NOR flash support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-15 08:25:16 +01:00
Jesús Guitarte f1f6d76370 ARM: i.MX6: correct work flow of PFDs from uboot-sources
PFDs need to be gate/ungate after PLL lock to reset PFDs to right state.
Otherwise PFDs may lose correct state in state-machine, then no output
clock.
For i.MX6DL and i.MX6SL, ROM have taken care of PFD396 already since the
bus clock needs it.

This patch is backported from
http://git.freescale.com/git/cgit.cgi/imx/uboot-imx.git/commit/cpu/arm_cortexa8/mx6/generic.c?h=imx_v2009.08_3.0.35_4.1.0&id=b7c5badf94ffbe6cd0845efbb75e16e05e3af404

And resolve issues with booting from MMC/SD cards

Signed-off-by: Jesús Guitarte <jguitarte@data-modul.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-14 17:01:33 +01:00
Sascha Hauer 764ae1647c ARM: i.MX: Add correct SoC type detection for i.MX6
Using the ANATOP_SI_REV register we can only distinguish between
i.MX6q/d and i.MX6dl/s SoCs. Take the number of cores into account
to get the exact SoC type.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-14 17:01:33 +01:00
Lucas Stach c4a311dc0e ARM: imx6: remove old pingroups
Keeps the size of the compiles DTs down.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-14 17:01:33 +01:00
Lucas Stach 653c53c298 ARM: imx6: update DFI FS700 M60 DT
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-14 17:01:33 +01:00
Lucas Stach 20df62d33f ARM: imx6: update DMO RealQ7 DT
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-14 17:01:33 +01:00
Lucas Stach 7fd511c677 ARM: imx6: update GK802 DT
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-10 09:21:45 +01:00
Lucas Stach c5ce8af318 ARM: imx6: update TQ DTs
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-10 09:21:45 +01:00
Lucas Stach c47c67f895 ARM: imx6: update Carrier-1 DTs
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-10 09:18:56 +01:00
Lucas Stach 05e961b92b ARM: imx6: update phytec-pfla02 DT
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-10 09:18:56 +01:00
Lucas Stach 300f2ee5ab ARM: imx6: update SabreSD DTs
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-10 09:18:56 +01:00
Lucas Stach 503cba5b37 ARM: imx6q: update sabrelite DT
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-10 09:18:56 +01:00
Lucas Stach 0a9514b0cc ARM: imx6: pull imx6qdl-pingrp.h from linux
This makes it possible to pull other DT changes from
the linux kernel repo. Plus it will make it possible
to slim down the i.MX6 dtbs at a later point.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-10 09:18:56 +01:00
Alexander Shiyan c81f103887 ARM: freescale-mx51-pdk: Remove FEC GPIO handling
Reset GPIO now handled from DTS, no need to touch this in the board.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-10 08:21:51 +01:00
Alexander Shiyan 0039821dca ARM: i.MX51: Sync DT files with kernel
This patch includes update i.MX51 template and porting some barebox
DTS files to use new template.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-10 08:21:51 +01:00
Sascha Hauer 29b6d429f6 Merge branch 'for-next/video' 2014-01-07 11:57:52 +01:00
Sascha Hauer dd28a45d9d Merge branch 'for-next/usb-chipidea' 2014-01-07 11:57:52 +01:00
Sascha Hauer 07e5ba98e5 Merge branch 'for-next/ubi' 2014-01-07 11:57:52 +01:00
Sascha Hauer aebde15776 Merge branch 'for-next/socfpga' 2014-01-07 11:57:51 +01:00
Sascha Hauer f1f5346975 Merge branch 'for-next/poller' 2014-01-07 11:57:51 +01:00
Sascha Hauer 968cb4bb84 Merge branch 'for-next/openrisc' 2014-01-07 11:57:51 +01:00
Sascha Hauer 32f9b1079a Merge branch 'for-next/misc' 2014-01-07 11:57:51 +01:00
Sascha Hauer c56fdbbc37 Merge branch 'for-next/miiphy' 2014-01-07 11:57:51 +01:00
Sascha Hauer 9d8c0841d2 Merge branch 'for-next/imx' 2014-01-07 11:57:51 +01:00
Sascha Hauer 8720919039 Merge branch 'for-next/arm-barebox-bootm' 2014-01-07 11:57:51 +01:00
Sascha Hauer dde5704122 Release v2014.01.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-07 11:47:31 +01:00
Sascha Hauer 682d47d6ce usb: chipidea i.MX: add some delay after ulpi_setup
On the pcm038 the ULPI phy is found correctly, but after
a power cycle the attached devices are not found. Adding
some delay fixes this.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-07 11:13:59 +01:00
Sascha Hauer d35fa7f26d usb: chipidea i.MX: always print an error message when ULPI fails
The ULPI code does not print a message when the operation times
out. Add one to the caller so that he gets an idea that something
is going wrong.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-07 11:13:58 +01:00
Sascha Hauer db48428216 usb: chipidea i.MX: limit port init to HSIC mode
imx_chipidea_port_init() will be called during startup from
the ehci driver. Calling it before setting up the PORTSC register
is only necessary in HSIC mode.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-07 11:13:58 +01:00
Sascha Hauer 873b6b6892 usb: chipidea i.MX: remove unused pdata->init hook
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-07 11:13:58 +01:00
Richard Weinberger 73618394bf UBI: Add some asserts to ubi_attach_fastmap()
Add more paranioa asserts to make it easier to detect
implementation errors.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-07 11:03:24 +01:00
Richard Weinberger 71791bd2cb UBI: Fix memory leak in ubi_attach_fastmap() error path
On error we have to free all three temporary lists.

Reported-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-07 11:03:24 +01:00
Richard Genoud dee73c54b0 UBI: simplify image sequence test
The test:
if (!a && b)
  a = b;
can be symplified in:
if (!a)
  a = b;

And there's no need to test if ubi->image_seq is not null, because if it is,
it is set to image_seq.
So, we just test if image_seq is not null.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-07 11:03:24 +01:00
Richard Genoud 2bae366563 UBI: fastmap: fix backward compatibility with image_seq
Some old UBI implementations (e.g. U-Boot) have not implemented the image
sequence feature.
So, when erase blocks are written, the image sequence in the ec header
is lost (set to zero).
UBI scan_all() takes this case into account (commits
32bc4820287a1a03982979515949e8ea56eac641 and
2eadaad67b2b6bd132eda105128d2d466298b8e3)

But fastmap scan functions (ubi_scan_fastmap() and scan_pool()) didn't.

This patch fixes the issue.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-07 11:03:24 +01:00
Richard Weinberger 8000a53dda UBI: Call scan_all() with correct offset in error case
If we find an invalid fastmap we have to scan from the very beginning.
Otherwise we leak the first 64 PEBs.

Reported-and-tested-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-07 11:03:24 +01:00
Richard Weinberger 4a290f970d UBI: Fix error path in scan_pool()
We have to set "ret", not "err" in case of an error.

Reported-and-tested-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-07 11:03:24 +01:00
Richard Weinberger f0986b6f70 UBI: fix refill_wl_user_pool()
If no free PEBs are available refill_wl_user_pool() must not
return with -ENOSPC immediately.
It has to block till produce_free_peb() produced a free PEB.

Reported-and-Tested-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-07 11:03:24 +01:00
Richard Weinberger 54930d9f92 UBI: Fix invalidate_fastmap()
Onging tests uncovered that invalidate_fastmap() is broken.
It must not call ubi_wl_put_fm_peb() because all PEBs used
by the old fastmap have already been put back.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
2014-01-07 11:03:24 +01:00
Richard Weinberger 92924e7ae1 UBI: Fix PEB leak in wear_leveling_worker()
get_peb_for_wl() removes the PEB from the free list.
If the WL subsystem detects that no wear leveling is needed
it cancels the operation and drops the gained PEB.
In this case we have to put the PEB back into the free list.

This issue was introduced with commit ed4b7021c
(UBI: remove PEB from free tree in get_peb_for_wl()).

Cc: <stable@vger.kernel.org> # 3.7.x
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
2014-01-07 11:03:24 +01:00
Sascha Hauer 8e3ddc13eb ARM: boot barebox with kernel calling convention
Start a 2nd stage barebox with the Linux Kernel calling convention.
Right now barebox does not interpret ATAGs or devicetree passed
to it, but it doesn't hurt to pass parameters so that future bareboxes
can use them.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-01-06 14:25:06 +01:00