Commit graph

13593 commits

Author SHA1 Message Date
Sascha Hauer
0c5c47b511 Merge branch 'for-next/vincell' 2015-08-07 07:54:46 +02:00
Sascha Hauer
19afbd285e Merge branch 'for-next/video' 2015-08-06 12:33:26 +02:00
Sascha Hauer
fd58dc84cb Merge branch 'for-next/spd' 2015-08-06 12:33:24 +02:00
Sascha Hauer
0dea9c7cf9 Merge branch 'for-next/ppc' 2015-08-06 12:33:16 +02:00
Sascha Hauer
e188d2ec26 Merge branch 'for-next/net' 2015-08-06 12:33:15 +02:00
Sascha Hauer
4ee01d2b46 Merge branch 'for-next/misc' 2015-08-06 12:33:15 +02:00
Sascha Hauer
b32e327d3e Merge branch 'for-next/logo' 2015-08-06 12:33:13 +02:00
Sascha Hauer
a8525f691d Merge branch 'for-next/imx' 2015-08-06 12:33:06 +02:00
Sascha Hauer
3c92473a9e Merge branch 'for-next/fbcon' 2015-08-06 12:33:06 +02:00
Sascha Hauer
ebd6f26412 Merge branch 'for-next/exitcall' 2015-08-06 12:33:06 +02:00
Sascha Hauer
66f4cbdc89 Merge branch 'for-next/efi' 2015-08-06 12:33:05 +02:00
Sascha Hauer
937c85a302 Merge branch 'for-next/dts' 2015-08-06 12:33:05 +02:00
Sascha Hauer
563468c1ec Merge branch 'for-next/am335x' 2015-08-06 12:33:05 +02:00
Antony Pavlov
4f37af47a8 mtd: nand_base: replace ifdef with IS_ENABLE
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-06 12:30:18 +02:00
Daniel Schultz
99b03a709d commands: Add dhrystone
This tool will help to measure the system performance.

Some SoCs haven't the possibility to route their clocks to the output pins.
So you can use dhrystone to get a feedback about the clock speed.

Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-06 12:30:17 +02:00
Sascha Hauer
4955c2c1bc mtd: concat: initialize *retlen
In concat_write and concat_read *retlen is only added to, but it's never
initialized. If the caller hasn't initialized retlen doesn't contain
valid values. Fix this by initializing *retlen properly.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-05 14:47:59 +02:00
Sascha Hauer
db48d9d190 mtd: cfi-flash: Fix info
Since

636d384 mtd: cfi-flash: Add mtd concat support

The devinfo output is broken. dev->priv no longer contains a
struct flash_info * but instead a struct cfi_priv *.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-05 14:47:36 +02:00
Sascha Hauer
21d2ef003f Release v2015.08.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-05 14:33:25 +02:00
Jan Luebbe
bde98d9c20 watchdog: add davinci watchdog driver
This driver is based on the Linux driver (v4.0).

Signed-off-by: Jan Luebbe <jluebbe@debian.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-03 10:37:07 +02:00
Jan Luebbe
077f9b7ef3 state: fix missing newline in error message
Signed-off-by: Jan Luebbe <jluebbe@debian.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-03 10:37:06 +02:00
Jan Luebbe
bf25de649d state: handle write-protection in the raw backend
Signed-off-by: Jan Luebbe <jluebbe@debian.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-03 10:37:06 +02:00
Juergen Borleis
8e04a039a9 PPC/PCM030: provide EEPROM support to read factory settings
Above the 0x800 offset the manufacturer provides the board type, a serial
number and the MAC as three simple strings. Extract these strings, provide
their value as global variables and set the MAC into the ethernet unit.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-03 08:52:50 +02:00
Juergen Borleis
90c52fe07a PPC/MPC5200: re-use the IMX I2C master driver for MPC5200
This IP core is shared between many FSL SoCs. The MPC5200 provides this
core as well.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-03 08:52:43 +02:00
Juergen Borleis
d2e8305b34 PPC/MPC52xx: unify header file name for clock API
In preparation to re-use the i.MX I2C driver for the MPC5200 SoC use
clock.h instead of clocks.h for the clock API.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-03 08:52:43 +02:00
Juergen Borleis
c641d9d3ca PPC/PCM030: enable USB/OHCI pin support
This change in the port config register enables the USB/OHCI support and
makes USB work on the PCM030's regular development baseboard.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-03 08:52:43 +02:00
Juergen Borleis
e841fd10b0 PPC/PCM030: fix reference clock
In order to enable and use USB/OHCI on the MPC5200 the USB PLL register must be
set.

It's not easy to find a correct value for this register, it seems it depends on
the used external reference frequency and some other 'magic' things. There are
some values out in the wild for the 33,333333 MHz and 33,333000 MHz reference
frequency case, but they are not consistent over the boards.

The value used here in this change for the USB PLL register is from the first
days of support for this platform and works at least on the reference
baseboard.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-03 08:52:43 +02:00
Juergen Borleis
2afe1f23ce PPC/PCM030: remove nowhere used definitions
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-08-03 08:52:43 +02:00
Teresa Remmet
bc4ec43ede ARM: dts: beaglebone: Strip MLO device tree
Reduce size of beaglebone MLO image.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
Tested-by: Daniel Schultz <d.schultz@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-31 10:21:51 +02:00
Stefan Christ
60427aac46 ARM: [phyFLEX,phyCARD]-i.MX6: rename define in flash-headers
The files flash-header-*.imxfg contains two defines which are use in
include files flash-header-phytec-*.h. The first define is SETUP_MDCFG0.
In the second define name some RAM size value were used, e.g.
SETUP_S_DL_512MB_1GB or SETUP_1GIB_2GIB_4GIB.

It's better to name also the second define after the register names,
here MMDC1_MDCTL and MMDC1_MDASP, because these values changes for every
RAM configurations and it's consistent with the first define.

Signed-off-by: Stefan Christ <s.christ@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-31 08:49:44 +02:00
Philipp Zabel
f3f8e8fd87 ARM: imx6: rename SPI NOR device to /dev/spinor0
Barebox currently names the SPI NOR device "/dev/sst25vf016b",
but the barebox update handler still points to "/dev/m25p80",
causing barebox_update to fail.
Choose a descriptive name instead.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-31 08:49:43 +02:00
Sascha Hauer
e871a2de75 ata: sata-imx: Add delay to prevent link timeout
On the Utilite board this delay is necessary to prevent a link timeout.
It seems the values written to GPR13 have to settle for some time before
further accesses may be made.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-31 08:49:43 +02:00
Sascha Hauer
459c7f3213 ARM: i.MX6 cm-fx6: Fix area for get_ram_size
for bank2_size get_ram_size must be called with the CS1 area. With the
recent fix to calculate CS1 start this now starts at 0x90000000 and no
longer at 0x80000000.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-31 08:49:43 +02:00
Sascha Hauer
44dfce99f5 ARM: i.MX6 cm-fx6: Fix Chip density for DDR_64BIT_2GB case
DDR_64BIT_2GB corresponds to two chip selects (ncs = 2) with 1GiB
each. In this case cs_density must be configured to 8Gb (1GiB).

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-31 08:49:43 +02:00
Sascha Hauer
a5003e4eff ARM: imx6-mmdc: Fix cs0_end calculation
The current calculation does not take the 0x10000000 offset where
SDRAM starts into account. For example with a 1GiB chip density
the current code calculates cs1 start to 0x40000000, but it
has to be 0x10000000 + 0x40000000 = 0x50000000. Add the missing
8 32MiB chunks.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-31 08:49:43 +02:00
Sascha Hauer
3c9b56e90b ARM: initial cm-fx6 support
The cm-fx6 board is a module from Compulab with different i.MX6 SoCs.
This module is also found in the Utilite Mini Computer this patch
also adds support for.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-31 08:49:43 +02:00
Sascha Hauer
8d48e07c4d ARM: i.MX: make early UART functions independent of DEBUG_LL
We have functions to setup the i.MX uart for early use, but these all
depend on DEBUG_LL. Move them to imx-uart.h to make them usable for
the regular PBL console.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-31 08:49:43 +02:00
Sascha Hauer
ca8a4b0ff5 PBL: console: Make independent of DEBUG_LL
With more stuff being done in PBL regular console support gets more and more
useful. This makes the PBL console independent of DEBUG_LL which is only
meant for early debugging but not regular output.
To use the regular PBL console a board must call pbl_set_putc() which stores
a pointer to the putc function to be used.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-31 08:49:42 +02:00
Sascha Hauer
37b8e17135 ARM: i.MX: xload: implement esdhc xload for i.MX6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-31 08:46:20 +02:00
Sascha Hauer
ab8e23f239 net: phy: at803x: Use genphy_config_init
Based on the Linux commit:

6ff01db net: phy: at803x: use genphy_config_init()

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-29 17:17:01 +02:00
Sascha Hauer
b20f5632aa Limit data_abort_mask to !PBL
To make memory_display usable in PBL

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-29 10:22:05 +02:00
Sascha Hauer
493d20a200 ARM: i.MX6: Add DDR setup code from U-Boot
Several i.MX6 boards like to do their SDRAM setup in code rather than
in DCD tables. Add the SDRAM setup code from U-Boot to make it easy
to adopt the SDRAM setup from the U-Boot port of these boards.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-29 09:16:20 +02:00
Sascha Hauer
2fd7d15426 ARM: i.MX: Add SPI xload code
Add PBL xload code to load an image from SPI NOR flash. Currently implemented
for i.MX6.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-29 09:16:19 +02:00
Lucas Stach
dfdb59af9b pinctrl: imx-iomux-v2: correct names in EXPORT_SYMBOL macros
The functions have been renamed, but this has not been reflected in the
EXPORT_SYMBOL macros. Do that now.

Fixes several errors like this:
drivers/pinctrl/imx-iomux-v2.c:61:15: error:
	'mxc_iomux_mode' undeclared here (not in a function)
 EXPORT_SYMBOL(mxc_iomux_mode);

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-29 08:01:15 +02:00
Lucas Stach
9624f66652 ARM: imx: guf-neso: only try to enable USB if USB_ULPI is configured
Avoids a build failure if the config does not include ULPI support.
This is similar to what has been done to the PCA100 board.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-29 08:01:15 +02:00
Lucas Stach
7a022d7287 net: enc28j60: fix set mac function signature
Fixes:
drivers/net/enc28j60.c: In function 'enc28j60_probe':
drivers/net/enc28j60.c:947:20: warning: assignment from incompatible pointer type
  edev->set_ethaddr = enc28j60_set_ethaddr;

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-29 08:01:15 +02:00
Lucas Stach
1c9535cff8 video: backlight-pwm: depend on GPIOLIB
The PWM backlight driver does not only control PWMs but also GPIOs.

Fixes:
In file included from include/gpio.h:4:0,
                 from drivers/video/backlight-pwm.c:27:
arch/arm/include/asm/gpio.h:5:23: fatal error: mach/gpio.h: No such file or directory

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-29 08:01:15 +02:00
Sascha Hauer
65681ac201 net: make eth_register_ethaddr work on registered network devices
When eth_register_ethaddr is called after the device has been registered
it should work aswell.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-28 08:00:03 +02:00
Juergen Borleis
04ac96fa2d Devicetree/PPC: fix devicetree's fixup
Currently Barebox fails to boot a kernel/devicetree pair on PowerPC.

With of_find_node_by_path() the framework uses a global variable to find
the root node and fails. With of_find_node_by_path_from() and forwarding
the 'root' parameter it works again as expected.

This fixes the following error message at run-time:

Loading U-Boot uImage '/tmp/tftpcmd/kernel'
Loading devicetree from '/tmp/tftpcmd/oftree'
bootm: No devicetree given.
handler failed with: Invalid argument

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-27 07:46:53 +02:00
Michael Grzeschik
f53a2c1bfa xload: fix use after free
The variable partname is used in the error path for debugging.
We have to free it after this use.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-27 07:38:10 +02:00
Michael Olbrich
89aef0fb85 efi: enable blspec in the defconfig
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-27 07:23:56 +02:00