]> git.dujemihanovic.xyz Git - u-boot.git/log
u-boot.git
9 years agoboard/BuR/tseries: Add simplefb support
Hannes Petermaier [Fri, 24 Apr 2015 12:49:37 +0000 (14:49 +0200)]
board/BuR/tseries: Add simplefb support

Since the used AM3352 SoC doesn't have GPU it isn't allways necessary to build
in complete drm-stuff into linux kernel. In very small applications only we use
the simple-framebuffer.

So we have 2 use-cases:
- device operating on drm-driver (let simplefb node disabled)
- device operating on simplefb-driver (activate simplefb node and reserve mem)

The decision is made by means of "simplefb" environment variable.

simplefb = 0
we don't enable the (maybe) existing simplefb node and all the rest around
display is up to the linux-kernel. We just disable the backlight, beceause we
do not want see the flicker during take over of drm-driver.

simplefb = 1
we enable the (maybe) existing simplefb node and reserve framebuffers size
in memory.

Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
9 years agoboard/BuR/tseries: remove unnary CONFIG_LCD_NOSTDOUT
Hannes Petermaier [Fri, 24 Apr 2015 12:49:36 +0000 (14:49 +0200)]
board/BuR/tseries: remove unnary CONFIG_LCD_NOSTDOUT

the CONFIG_LCD_NOSTDOUT feature never had become mainline in uboot due to the
fact that the problem of "not writing out whole console to lcd" can be solved
with another way.

So we remove this unnary define.

Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
9 years agoboard/BuR/tseries: take usage of CONFIG_LCD_ROTATION
Hannes Petermaier [Fri, 24 Apr 2015 12:49:35 +0000 (14:49 +0200)]
board/BuR/tseries: take usage of CONFIG_LCD_ROTATION

We take use of the new LCD_ROTATION feature.
The information about how the display is rotated is taken from B&R specific
(/factory-settings/rotation) information in the devicetree.

The information there is stored as string (cw, ud, ccw, none) since starting
support of this devices and cannot be changed, so we have to convert it into

none = 0
cw   = 1
ud   = 2
ccw  = 3

Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
9 years agoimage: android: handle default kernel address
Maxime Ripard [Fri, 24 Apr 2015 10:53:12 +0000 (12:53 +0200)]
image: android: handle default kernel address

The two tools that create android boot images, mkbootimg and the fastboot
client, set the kernel address by default to 0x10008000.

U-boot always honors this field, and will try to relocate the kernel to
whatever value is set in the header, which won't be mapped to the actual RAM on
most platforms, resulting in the kernel obviously not booting.

All the targets in U-Boot right now will download the android boot image to
CONFIG_SYS_LOAD_ADDR, which means that it will already have been downloaded to
some location that is suitable for execution.

In order to have the kernel booting even with the default boot image kernel
address, if that address is used, just execute the kernel where it is.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
9 years agoRemove non-working address from MAINTAINER
Pavel Machek [Thu, 23 Apr 2015 07:10:36 +0000 (09:10 +0200)]
Remove non-working address from MAINTAINER

I checked with Detlev, and sadly removing that maintainers entry is
right thing to do.

Signed-off-by: Pavel Machek <pavel@denx.de>
9 years agoFix musl build
Jörg Krause [Wed, 22 Apr 2015 19:36:22 +0000 (21:36 +0200)]
Fix musl build

This patch fixes cross-compiling U-Boot tools with the musl C library:
  * including <sys/types.h> is needed for ulong
  * defining _GNU_SOURCE is needed for loff_t

Tested for target at91sam9261ek_dataflash_cs3.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Cc: Tom Rini <trini@konsulko.com>
9 years agomisc: led: Add PCA9551 LED driver
Stefan Roese [Thu, 12 Mar 2015 10:22:46 +0000 (11:22 +0100)]
misc: led: Add PCA9551 LED driver

This patch adds a driver for the PCA9551 LED controller.

Originated-by: Timo Herbrecher <t.herbrecher@gateware.de>
Signed-off-by: Stefan Roese <sr@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
Cc: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
9 years agoREADME: fix typo in 'currently'
Fabio Estevam [Sat, 25 Apr 2015 21:53:10 +0000 (18:53 -0300)]
README: fix typo in 'currently'

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
9 years agoti: am335x/am437x/omap5 devices: Unify network environment variables
Cooper Jr., Franklin [Tue, 21 Apr 2015 12:51:04 +0000 (07:51 -0500)]
ti: am335x/am437x/omap5 devices: Unify network environment variables

Across several devices network environment variables are duplicated.
Move these variables to a common include file which insures the environment
variables are reused and insures devices across product lines share the same
values.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
9 years agoMerge git://git.denx.de/u-boot-dm
Tom Rini [Fri, 8 May 2015 14:46:59 +0000 (10:46 -0400)]
Merge git://git.denx.de/u-boot-dm

9 years agogit-mailrc: add Dinh Nguyen as a contact for SoCFPGA
Dinh Nguyen [Thu, 7 May 2015 22:37:12 +0000 (17:37 -0500)]
git-mailrc: add Dinh Nguyen as a contact for SoCFPGA

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
9 years agogit-mailrc: add Marek as SOCFPGA maintainer
Masahiro Yamada [Tue, 21 Apr 2015 03:08:32 +0000 (12:08 +0900)]
git-mailrc: add Marek as SOCFPGA maintainer

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agoARM: socfpga: abolish CONFIG_SOCFPGA
Masahiro Yamada [Tue, 21 Apr 2015 11:38:23 +0000 (20:38 +0900)]
ARM: socfpga: abolish CONFIG_SOCFPGA

Replace CONFIG_SOCFPGA with CONFIG_ARCH_SOCFPGA.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agoARM: socfpga: move SoC headers to mach-socfpga/include/mach
Masahiro Yamada [Tue, 21 Apr 2015 11:38:22 +0000 (20:38 +0900)]
ARM: socfpga: move SoC headers to mach-socfpga/include/mach

Move headers to mach-socfpga as well.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agoARM: socfpga: move SoC sources to mach-socfpga
Masahiro Yamada [Tue, 21 Apr 2015 11:38:21 +0000 (20:38 +0900)]
ARM: socfpga: move SoC sources to mach-socfpga

Our recent trend is to collect SoC files into arch/arm/mach-(SOC).

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agoARM: socfpga: move board select into mach-socfpga/Kconfig
Masahiro Yamada [Tue, 21 Apr 2015 11:38:20 +0000 (20:38 +0900)]
ARM: socfpga: move board select into mach-socfpga/Kconfig

Switch to a more standard way of board select; put the SoC select
into arch/arm/Kconfig and move the board select menu under
arch/arm/mach-socfpga/Kconfig.

Also, consolidate SYS_BOARD, SYS_VENDOR, SYS_SOC, SYS_CONFIG_NAME.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agoARM: socfpga: remove redundant config.mk
Masahiro Yamada [Tue, 21 Apr 2015 11:38:19 +0000 (20:38 +0900)]
ARM: socfpga: remove redundant config.mk

Because all the SOCFPGA boards define CONFIG_SPL_FRAMEWORK
(see include/configs/socfpga_common.h), u-boot.img is automatically
added to the target image list by the top Makefile.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agoARM: socfpga: do not add board directory to header search path
Masahiro Yamada [Tue, 21 Apr 2015 11:38:18 +0000 (20:38 +0900)]
ARM: socfpga: do not add board directory to header search path

The compiler option "-Iboard/$(VENDOR)/$(BOARD)" just exists here
for iocsr_config.c to be able to include iocsr_config.h.

Use "..." instead of <...> to include a header in the same directory.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agodm: sf: Update default name of spi flash in structure udevice
Haikun.Wang@freescale.com [Wed, 6 May 2015 02:37:43 +0000 (10:37 +0800)]
dm: sf: Update default name of spi flash in structure udevice

Default name of spi flash like this "0:0", update it to "spi_flash@0:0".

Signed-off-by: Haikun Wang <haikun.wang@freescale.com>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agodm: usb: exynos: Drop legacy USB code
Simon Glass [Wed, 25 Mar 2015 18:23:07 +0000 (12:23 -0600)]
dm: usb: exynos: Drop legacy USB code

Drop the code that doesn't use driver model for USB.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agosandbox: Enable time unit test command
Simon Glass [Sat, 2 May 2015 15:25:03 +0000 (09:25 -0600)]
sandbox: Enable time unit test command

Enable this command for sandbox.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agotest: Add a simple time test
Simon Glass [Sat, 2 May 2015 15:25:02 +0000 (09:25 -0600)]
test: Add a simple time test

Sometimes the time functions are incorrect due to bad time support on a
board. Add a unit test which tries to detect this.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agosandbox: Don't try distro_bootcmd by default
Sjoerd Simons [Thu, 30 Apr 2015 20:16:09 +0000 (22:16 +0200)]
sandbox: Don't try distro_bootcmd by default

For the distro_bootcmds to succeed on the sandbox a bit of setup is
required (e.g. network configured or host image bound), so running them
by default isn't that useful.

Add a -b/--boot command to the sandbox binary, which triggers the
distro_bootcmds to run after the other command-line commands.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agousb: ohci: Don't log an error on interrupt packet timeout
Hans de Goede [Tue, 5 May 2015 21:56:14 +0000 (23:56 +0200)]
usb: ohci: Don't log an error on interrupt packet timeout

Interrupts transfers timing out is normal, so do not log an error for this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Marek Vasut <marex@denx.de>
9 years agousb: ohci: Add proper cache flushing / invalidating for non cache coherent cpus
Hans de Goede [Tue, 5 May 2015 21:56:13 +0000 (23:56 +0200)]
usb: ohci: Add proper cache flushing / invalidating for non cache coherent cpus

Add proper cache flushing / invalidating for non cache coherent cpus, for now
only enable this for new (driver-model) usb code to avoid regressions.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Marek Vasut <marex@denx.de>
9 years agousb: ohci: Fix ctrl in messages with a data-len of 0
Hans de Goede [Tue, 5 May 2015 21:56:12 +0000 (23:56 +0200)]
usb: ohci: Fix ctrl in messages with a data-len of 0

Fix taken from the Linux kernel ohci driver.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Marek Vasut <marex@denx.de>
9 years agousb: ohci: Move static func and var declarations from ohci.h to ohci-hcd.c
Hans de Goede [Tue, 5 May 2015 21:56:11 +0000 (23:56 +0200)]
usb: ohci: Move static func and var declarations from ohci.h to ohci-hcd.c

Non static function and variable declarations do not belong in a .h file.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Marek Vasut <marex@denx.de>
9 years agousb: ohci: Remove unnecessary phcca variable
Hans de Goede [Tue, 5 May 2015 21:56:10 +0000 (23:56 +0200)]
usb: ohci: Remove unnecessary phcca variable

This is a preparation patch for adding driver-model support.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Marek Vasut <marex@denx.de>
9 years agousb: ohci: Move the td array struct to inside the ohci_dev struct
Hans de Goede [Tue, 5 May 2015 21:56:09 +0000 (23:56 +0200)]
usb: ohci: Move the td array struct to inside the ohci_dev struct

This is a preparation patch for adding driver-model support.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Marek Vasut <marex@denx.de>
9 years agousb: ohci: Move the ohci_dev struct to inside the main ohci struct
Hans de Goede [Tue, 5 May 2015 21:56:08 +0000 (23:56 +0200)]
usb: ohci: Move the ohci_dev struct to inside the main ohci struct

This is a preparation patch for adding driver-model support.

Note we do keep ohci_dev as a separate struct so that we can later add
support for interrupt-queues which requires allocating a separate ohci_dev
per interrupt-queue.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Marek Vasut <marex@denx.de>
9 years agousb: ohci: Pass around a pointer to ohci_t rather then accessing global vars
Hans de Goede [Tue, 5 May 2015 21:56:07 +0000 (23:56 +0200)]
usb: ohci: Pass around a pointer to ohci_t rather then accessing global vars

This is a preparation patch for adding driver-model support.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Marek Vasut <marex@denx.de>
9 years agousb: ohci: Remove unused devgone global variable
Hans de Goede [Tue, 5 May 2015 21:56:06 +0000 (23:56 +0200)]
usb: ohci: Remove unused devgone global variable

devgone is never assigned a value, so the one comparisson reading it will
never be true, and devgone can be completely removed.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Marek Vasut <marex@denx.de>
9 years agousb: Fix maxpacketsize for first descriptor read for low-speed usb devs
Hans de Goede [Tue, 5 May 2015 21:56:04 +0000 (23:56 +0200)]
usb: Fix maxpacketsize for first descriptor read for low-speed usb devs

This fixes descriptor reading of lowspeed devices through ohci not working.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Marek Vasut <marex@denx.de>
9 years agodm: usb: Set desc_before_addr from ehci dm code
Hans de Goede [Tue, 5 May 2015 09:54:35 +0000 (11:54 +0200)]
dm: usb: Set desc_before_addr from ehci dm code

Without this usb-1 device descriptors do not get read properly.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agodm: usb: Fix finding of first upstream usb-2 hub in the ehci dm code
Hans de Goede [Tue, 5 May 2015 09:54:34 +0000 (11:54 +0200)]
dm: usb: Fix finding of first upstream usb-2 hub in the ehci dm code

The ehci driver model code for finding the first upstream usb-2 hub before
this commit has a number of issues:

1) "if (!ttdev->speed != USB_SPEED_HIGH)" does not work because the '!'
   takes presedence over the '!=' this should simply be
   "if (ttdev->speed == USB_SPEED_HIGH)"
2) It makes ttdev point to the first upstream usb-2 hub, but ttdev should
   point to the last usb-1 device before the first usb-2 hub (when going
   upstream from the device), as ttdev is used to find the port of the
   first usb-2 hub to which the the last usb-1 device is connected.
3) parent_devnum however should be set to the devnum of the first usb-2
   hub, so we need to keep pointers around to both usb_device structs.

To complicate things further during enumeration usb_device.dev will point
to the parent udevice, where as during normal use it will point to
the actual udevice, we must handle both cases correctly.

This commit fixes all this making usb-1 devices attached to usb-2 hubs,
including usb-1 devices attached to usb-1 hubs attached to usb-2 hubs, work.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agodm: usb: Use usb_get_bus in dm ehci code
Hans de Goede [Tue, 5 May 2015 09:54:33 +0000 (11:54 +0200)]
dm: usb: Use usb_get_bus in dm ehci code

Use usb_get_bus in dm ehci code rather then re-implementing it.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agodm: usb: Copy over usb_device values from usb_scan_device() to final usb_device
Hans de Goede [Tue, 5 May 2015 09:54:32 +0000 (11:54 +0200)]
dm: usb: Copy over usb_device values from usb_scan_device() to final usb_device

Currently we copy over a number of usb_device values stored in the on stack
struct usb_device probed in usb_scan_device() to the final driver-model managed
struct usb_device in usb_child_pre_probe() through usb_device_platdata, and
then call usb_select_config() to fill in the rest.

There are 3 problems with this approach:

1) It does not fill in enough fields before calling usb_select_config(),
specifically it does not fill in ep0's maxpacketsize causing a div by zero
exception in the ehci driver.

2) It unnecessarily redoes a number of usb requests making usb probing slower

3) Calling usb_select_config() a second time fails on some usb-1 devices
plugged into usb-2 hubs, causing u-boot to not recognize these devices.

This commit fixes these issues by removing (*) the usb_select_config() call
from usb_child_pre_probe(), and instead of copying over things field by field
through usb_device_platdata, store a pointer to the in stack usb_device
(which is still valid when usb_child_pre_probe() gets called) and copy
over the entire struct.

*) Except for devices which are explictly instantiated through device-tree
rather then discovered through usb_scan_device() such as emulated usb devices
in the sandbox.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agodm: usb: Make usb_get_bus easier to use for callers
Hans de Goede [Tue, 5 May 2015 09:54:31 +0000 (11:54 +0200)]
dm: usb: Make usb_get_bus easier to use for callers

Make usb_get_bus easier to use for callers, by directly returning the bus
rather then returning it via a pass-by-ref argument.

This also removes the error checking from the current callers, as
we already have an assert() for bus not being NULL in usb_get_bus().

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agodm: usb: Do not use bus->seq before device_probe(bus)
Hans de Goede [Mon, 4 May 2015 19:33:26 +0000 (21:33 +0200)]
dm: usb: Do not use bus->seq before device_probe(bus)

Do not use bus->seq before device_probe(bus), as bus->seq is not set until
after the device_probe() call. This fixes u-boot printing: "USB-1:   " for
each bus it scans.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agodm: i2c-gpio: Remove redundant dm_gpio_set_value() call
Axel Lin [Sun, 26 Apr 2015 03:05:38 +0000 (11:05 +0800)]
dm: i2c-gpio: Remove redundant dm_gpio_set_value() call

dm_gpio_set_dir_flags() will also set gpio output value when switching to
gpio output. So it's not necessary to call dm_gpio_set_value() after
dm_gpio_set_dir_flags() call.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agodm: rtc: Add tests for real-time clocks
Simon Glass [Mon, 20 Apr 2015 18:37:31 +0000 (12:37 -0600)]
dm: rtc: Add tests for real-time clocks

Add some simple tests to verify that the RTC uclass works correctly in
U-Boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: test: dts: Sort the aliases in the test device tree file
Simon Glass [Mon, 20 Apr 2015 18:37:30 +0000 (12:37 -0600)]
dm: test: dts: Sort the aliases in the test device tree file

Sort these aliases to avoid confusion as to what is present.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agodm: rtc: sandbox: Enable real-time clock support
Simon Glass [Mon, 20 Apr 2015 18:37:29 +0000 (12:37 -0600)]
dm: rtc: sandbox: Enable real-time clock support

Enable real-time-clock support in sandbox.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: sandbox: dts: Add a real-time clock attached to I2C
Simon Glass [Mon, 20 Apr 2015 18:37:28 +0000 (12:37 -0600)]
dm: sandbox: dts: Add a real-time clock attached to I2C

Add an emulated RTC device for sandbox, so that the 'date' command can be
used.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: net: rtc: Support using driver model for rtc in sntp
Simon Glass [Mon, 20 Apr 2015 18:37:27 +0000 (12:37 -0600)]
dm: net: rtc: Support using driver model for rtc in sntp

When setting the date, support driver model RTC also.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agodm: rtc: Convert 'date' command to support driver model
Simon Glass [Mon, 20 Apr 2015 18:37:26 +0000 (12:37 -0600)]
dm: rtc: Convert 'date' command to support driver model

Adjust this command so that it supports using driver model for I2C, i.e.
CONFIG_DM_I2C. This will permit it to be used in sandbox also.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: rtc: sandbox: Add a driver for the sandbox I2C RTC
Simon Glass [Mon, 20 Apr 2015 18:37:25 +0000 (12:37 -0600)]
dm: rtc: sandbox: Add a driver for the sandbox I2C RTC

Add a driver which communicates with the sandbox I2C emulation RTC device
and permits it to be used in U-Boot. This driver is very simple - it just
reads and writes selected I2C registers in the device.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: rtc: sandbox: Add an emulated I2C RTC device
Simon Glass [Mon, 20 Apr 2015 18:37:24 +0000 (12:37 -0600)]
dm: rtc: sandbox: Add an emulated I2C RTC device

Add a sandbox I2C emulation device which emulates a real-time clock. The
clock works off an offset from the current system time, and supports setting
and getting the clock, as well as access to byte-width regisers in the RTC.
It does not support changing the system time.

This device can be used for testing the 'date' command on sandbox, as well
as the RTC uclass.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: rtc: Add a uclass for real-time clocks
Simon Glass [Mon, 20 Apr 2015 18:37:23 +0000 (12:37 -0600)]
dm: rtc: Add a uclass for real-time clocks

Add a uclass for real-time clocks which support getting the current time,
setting it and resetting the chip to a known-working state. Some RTCs have
additional registers which can be used to store settings, so also provide
an interface to these.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: sandbox: Add os_localtime() to obtain the system time
Simon Glass [Mon, 20 Apr 2015 18:37:22 +0000 (12:37 -0600)]
dm: sandbox: Add os_localtime() to obtain the system time

Add a function to read the system time into U-Boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: rtc: Split structure definition into its own file
Simon Glass [Mon, 20 Apr 2015 18:37:21 +0000 (12:37 -0600)]
dm: rtc: Split structure definition into its own file

Move the definition of struct rtc_time into a separate file so that sandbox
can include it without requiring common.h and the like.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: Remove unnecessary types in bcd.h
Simon Glass [Mon, 20 Apr 2015 18:37:20 +0000 (12:37 -0600)]
dm: Remove unnecessary types in bcd.h

We don't need to use u8, and if we avoid it, it isn't so much of a problem
that rtc.h includes this header. With this change we can include rtc.h from
sandbox files.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: rtc: Rename mktime() and reduce the number of parameters
Simon Glass [Mon, 20 Apr 2015 18:37:19 +0000 (12:37 -0600)]
dm: rtc: Rename mktime() and reduce the number of parameters

Most callers unpack the structure and pass each member. It seems better to
pass the whole structure instead, as with the C library. Also add an rtc_
prefix.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Heiko Schocher <hs@denx.de>
9 years agodm: rtc: Rename to_tm() to rtc_to_tm() and add error code
Simon Glass [Mon, 20 Apr 2015 18:37:18 +0000 (12:37 -0600)]
dm: rtc: Rename to_tm() to rtc_to_tm() and add error code

Rename this function so that it is clear that it is provided by the RTC.
Also return an error when it cannot function as expected. This is unlikely
to occur since it works for dates since 1752 and many RTCs do not support
such old dates. Still it is better to be accurate.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Heiko Schocher <hs@denx.de>
9 years agodm: rtc: Rename gregorian day function
Simon Glass [Mon, 20 Apr 2015 18:37:17 +0000 (12:37 -0600)]
dm: rtc: Rename gregorian day function

Change this function name to something more descriptive. Also return a
failure code if it cannot calculate a correct value.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Heiko Schocher <hs@denx.de>
9 years agofdt: Correct warning in fdt_setup_simplefb_node()
Simon Glass [Mon, 20 Apr 2015 18:37:16 +0000 (12:37 -0600)]
fdt: Correct warning in fdt_setup_simplefb_node()

Adjust the printf() string to avoid a warning on sandbox.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: i2c: Add an explicit test mode to the sandbox I2C driver
Simon Glass [Mon, 20 Apr 2015 18:37:15 +0000 (12:37 -0600)]
dm: i2c: Add an explicit test mode to the sandbox I2C driver

At present this driver has a few test features. They are needed for running
the driver model unit tests but are confusing and unnecessary if using
sandbox at the command line. Add a flag to enable the test mode, and don't
enable it by default.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: i2c: Add functions to read and write a register
Simon Glass [Mon, 20 Apr 2015 18:37:14 +0000 (12:37 -0600)]
dm: i2c: Add functions to read and write a register

Add driver model versions of the legacy functions to read and write a
single byte register. These are a useful shortcut in many cases.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Heiko Schocher <hs@denx.de>
9 years agodm: i2c: sandbox: Add debugging to the speed limit
Simon Glass [Mon, 20 Apr 2015 18:37:13 +0000 (12:37 -0600)]
dm: i2c: sandbox: Add debugging to the speed limit

Print a debug() message with the I2C speed is exceeded.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Heiko Schocher <hs@denx.de>
9 years agodm: spi: Correct the comment on spi_get_ops()
Simon Glass [Mon, 20 Apr 2015 18:37:12 +0000 (12:37 -0600)]
dm: spi: Correct the comment on spi_get_ops()

This comment should refer to SPI, not serial.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
9 years agocros_ec: Handle the single duplex requirement in cros_ec
Simon Glass [Tue, 17 Feb 2015 22:29:37 +0000 (15:29 -0700)]
cros_ec: Handle the single duplex requirement in cros_ec

With several chips using the SPI protocol it seems better to put the single
duplex functionality in the EC rather than the SPI driver.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agocros_ec: Show the protocol version in the debug message
Simon Glass [Tue, 17 Feb 2015 22:29:36 +0000 (15:29 -0700)]
cros_ec: Show the protocol version in the debug message

When starting up, show the protocol version that has been negotiated with
the EC.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: spi: Avoid setting the speed with every transfer
Simon Glass [Tue, 17 Feb 2015 22:29:35 +0000 (15:29 -0700)]
dm: spi: Avoid setting the speed with every transfer

Only set the speed if it has changed from last time. Since the speed will
be 0 when the device is probed it will always be changed on the first
transfer after the device is probed.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agotest: dm: eth: Skip timeouts on ping tests
Joe Hershberger [Tue, 21 Apr 2015 18:57:20 +0000 (13:57 -0500)]
test: dm: eth: Skip timeouts on ping tests

Indicate to the emulated sandbox Ethernet driver when we expect a
timeout and tell it to leap forward.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agosandbox: eth: Add a function to skip ping timeouts
Joe Hershberger [Tue, 21 Apr 2015 18:57:19 +0000 (13:57 -0500)]
sandbox: eth: Add a function to skip ping timeouts

When called, the next call to receive will trigger a 10-second leap
forward in time to avoid waiting for time to pass when tests are
evaluating timeout behavior.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agosandbox: Add test function to advance time
Joe Hershberger [Tue, 21 Apr 2015 18:57:18 +0000 (13:57 -0500)]
sandbox: Add test function to advance time

Add a function that maintains an offset to include in the system timer
values returned from the lib/time.c APIs.

This will allow timeouts to be skipped instantly in tests

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agoPrepare v2015.07-rc1
Tom Rini [Tue, 5 May 2015 23:52:15 +0000 (19:52 -0400)]
Prepare v2015.07-rc1

Signed-off-by: Tom Rini <trini@konsulko.com>
9 years agofw_env.h: include autoconf.h
Max Krummenacher [Tue, 14 Apr 2015 19:50:47 +0000 (21:50 +0200)]
fw_env.h: include autoconf.h

Without this, when CONFIG_ENV_VARS_UBOOT_CONFIG is active we get
a compile time error when doing 'make env'.
In file included from tools/env/fw_env.c:117:0:
include/env_default.h:110:11: error: expected ‘}’ before ‘CONFIG_SYS_ARCH’

When building U-Boot this is included indirectly by the compiler switch
-include
/home/trdx/git.toradex.com/u-boot-2014.10-toradex/include/linux/kconfig.h

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
9 years agoMerge git://git.denx.de/u-boot-mpc85xx
Tom Rini [Tue, 5 May 2015 18:57:23 +0000 (14:57 -0400)]
Merge git://git.denx.de/u-boot-mpc85xx

9 years agoMerge git://git.denx.de/u-boot-marvell
Tom Rini [Tue, 5 May 2015 14:32:08 +0000 (10:32 -0400)]
Merge git://git.denx.de/u-boot-marvell

9 years agoarm: mvebu: Remove "u-boot.kwb" CONFIG_BUILD_TARGET for non-SPL targets
Stefan Roese [Mon, 4 May 2015 15:31:34 +0000 (17:31 +0200)]
arm: mvebu: Remove "u-boot.kwb" CONFIG_BUILD_TARGET for non-SPL targets

By removing this default build target, the "u-boot.kwb" target is not
automatically generated. This fixes a temporary build error when using
out-of-tree builds, as buildman does per default (reported by Simon).

When the full SPL support is added for these targets with the DDR training
code, the "u-boot-spl.kwb" image will be generated automatically.

Users providing a special bin_hdr binary (binary.0) file can always add
this binary file and generate the full firmware image by issuing the
"make u-boot.kwb" command directly.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Luka Perkov <luka.perkov@sartura.hr>
9 years agoarm: mvebu: db-mv784mp-gp: Fix ECC I2C address
Stefan Roese [Wed, 22 Apr 2015 16:36:39 +0000 (18:36 +0200)]
arm: mvebu: db-mv784mp-gp: Fix ECC I2C address

The macro to select the I2C address for ECC bus-width detection
was defined incorrectly for the Marvell DB-MV784MP-GP board. This
patch changes the macro to the correct value to fix this issue.

Signed-off-by: Stefan Roese <sr@denx.de>
9 years agoarm: mvebu: Add Armada A38x DB-88F6820-GP board support
Stefan Roese [Sat, 25 Apr 2015 04:29:56 +0000 (06:29 +0200)]
arm: mvebu: Add Armada A38x DB-88F6820-GP board support

This patch adds support for the Marvell DB-88F6820-GP Armada A38x
evaluation board.

Supported peripherals are:
- UART
- Ethernet (mvneta)
- I2C
- SPI (including SPI NOR flash)

Please note that this board support right now only supports the
main U-Boot. Without the bin_hdr integration (DDR training etc). This
will be added in a few days / weeks to complete this board port. But
till then this U-Boot version can be run on the target via the
original Marvell U-Boot via this command:

tftpboot 4000000 db-88f6820-gp/u-boot.bin;go 4000000

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
9 years agoarm: mvebu: Add d-cache invalidate before enabling the d-cache
Stefan Roese [Sat, 25 Apr 2015 04:29:55 +0000 (06:29 +0200)]
arm: mvebu: Add d-cache invalidate before enabling the d-cache

This solves some RX problems that have been seen, when using the
mvneta ethernet driver. The cache needs to be reset into a "clean"
state before using it.

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
9 years agoarm: mvebu: mv-common.h: Add CONFIG_PREBOOT
Stefan Roese [Sat, 25 Apr 2015 04:29:54 +0000 (06:29 +0200)]
arm: mvebu: mv-common.h: Add CONFIG_PREBOOT

This enables the usage of the "preboot" environment variable on Marvell
boards.

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
9 years agoarm: mvebu: Remove coherency configuration
Stefan Roese [Sat, 25 Apr 2015 04:29:53 +0000 (06:29 +0200)]
arm: mvebu: Remove coherency configuration

We are not using the coherency feature in U-Boot at all. So lets remove
this configuration from the mbus driver.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
9 years agoarm: mvebu: Change network init code to allow a more flexible setup
Stefan Roese [Sat, 25 Apr 2015 04:29:52 +0000 (06:29 +0200)]
arm: mvebu: Change network init code to allow a more flexible setup

With the introduction of the Armada 38x support, its necessary to change
the mvneta ethernet driver init call from always 4 times to a
configurable value. Lets make this init call more flexible by moving
the actually used devices to the config header.

Additionally this patch takes care of the slightly different base
addresses for the ethernet controllers on A38x.

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agoarm: mvebu: Add basic Armada 38x support
Stefan Roese [Sat, 25 Apr 2015 04:29:51 +0000 (06:29 +0200)]
arm: mvebu: Add basic Armada 38x support

This patch adds support for the Marvell Armada 38x SoC family.

Supported peripherals are:
- UART
- Ethernet (mvneta)
- I2C
- SPI (including SPI NOR flash)

Tested on Marvell DB-88F6820-GP evaluation board.

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
9 years agoarm: mvebu: Move CONFIG_SPL_LDSCRIPT to common header
Stefan Roese [Sat, 25 Apr 2015 04:29:50 +0000 (06:29 +0200)]
arm: mvebu: Move CONFIG_SPL_LDSCRIPT to common header

This way, new MVEBU boards don't need to specifiy the common location
for the SPL linker script.

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
9 years agoarm: mvebu: Only define MV88F78X60 for Armada XP
Stefan Roese [Sat, 25 Apr 2015 04:29:49 +0000 (06:29 +0200)]
arm: mvebu: Only define MV88F78X60 for Armada XP

This define is used by the DDR training code for Armada XP. With the
upcoming addition of Armada 38x support, lets only define it for
Armada XP in this common header.

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
9 years agoarm: mvebu: Remove unreferenced define
Stefan Roese [Sat, 25 Apr 2015 04:29:48 +0000 (06:29 +0200)]
arm: mvebu: Remove unreferenced define

MAX_MVNETA_DEVS is not used anywhere in U-Boot. So lets remove it.

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
9 years agoarm: mvebu: Change header macros from ARMADA_XP to MVEBU
Stefan Roese [Sat, 25 Apr 2015 04:29:47 +0000 (06:29 +0200)]
arm: mvebu: Change header macros from ARMADA_XP to MVEBU

Since these files will be used for other MVEBU SoC's, lets reflect this
in the headers marcos as well.

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
9 years agoarm: mvebu: Move mvebu-common into mach-mvebu
Stefan Roese [Sat, 25 Apr 2015 04:29:46 +0000 (06:29 +0200)]
arm: mvebu: Move mvebu-common into mach-mvebu

Now that the mach-mvebu directory exists and is used by Armada XP we can
move the mvebu-common files into this directory as well.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
9 years agoarm: armada-xp: Move SoC headers to mach-mvebu/include/mach
Stefan Roese [Sat, 25 Apr 2015 04:29:45 +0000 (06:29 +0200)]
arm: armada-xp: Move SoC headers to mach-mvebu/include/mach

Move arch/arm/include/asm/arch-armada-xp/*
     -> arch/arm/mach-mvebu/include/mach/*

Additionally the SYS_SOC is renamed from "armada-xp" to "mvebu". With this
change all these files can better be shared with other, newer Mavell
MVEBU SoC's. Like the upcoming Armada 38x support.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
9 years agoarm: armada-xp: Move SoC sources to mach-mvebu
Stefan Roese [Sat, 25 Apr 2015 04:29:44 +0000 (06:29 +0200)]
arm: armada-xp: Move SoC sources to mach-mvebu

Move arch/arm/cpu/armv7armada-xp/* -> arch/arm/mach-mvebu/*

Since this platform will be extended to support other Marvell SoC's as
well, lets rename it directly to mvebu.

This will be used by the upcoming Armada 38x suport (A38x).

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
9 years agoMerge branch 'master' of git://git.denx.de/u-boot-mmc
Tom Rini [Tue, 5 May 2015 11:00:38 +0000 (07:00 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-mmc

9 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Tue, 5 May 2015 11:00:11 +0000 (07:00 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

9 years agoARM: mmc: bcm283x: Remove get_timer_us() from mmc driver
Marek Vasut [Mon, 4 May 2015 20:54:36 +0000 (22:54 +0200)]
ARM: mmc: bcm283x: Remove get_timer_us() from mmc driver

The get_timer_us() function is something which is no longer
existing in case we use generic timer framework, so replace
it with get_timer().

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Tyler Baker <tyler.baker@linaro.org>
9 years agotegra: mmc: Set the removable flag correctly
Simon Glass [Mon, 4 May 2015 17:31:16 +0000 (11:31 -0600)]
tegra: mmc: Set the removable flag correctly

If the mmc device is non-removable (as indicated by the device tree), set
the flag so that users of the device know.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agommc: bcm2835_sdhci: Use calloc to allocate bcm2835_sdhci_host
Alexander Stein [Fri, 17 Apr 2015 15:33:17 +0000 (17:33 +0200)]
mmc: bcm2835_sdhci: Use calloc to allocate bcm2835_sdhci_host

We need to clear the allocated memory explicitly as the included
struct sdhci_host has function pointers. Those are compared to NULL to
test if this (optional) feature is supported. Leaving them undefined let
u-boot jump to arbitrary memory.

Signed-off-by: Alexander Stein <alexanders83@web.de>
9 years agommc: fsl_esdhc: update eMMC44 adapter card erase timeout
Yangbo Lu [Wed, 15 Apr 2015 02:13:12 +0000 (10:13 +0800)]
mmc: fsl_esdhc: update eMMC44 adapter card erase timeout

Freescale eMMC44 adapter card uses Micron N2M400FDB311A3CF eMMC
memory. According to the silicon datasheet, secure erase timeout
is 600ms. So increase erase timeout value from 250ms to 600ms.

Signed-off-by: Yangbo Lu <yangbo.lu@freescale.com>
Cc: York Sun <yorksun@freescale.com>
9 years agommc: sdhci: add timeout setting for response busy command
Kevin Liu [Mon, 23 Mar 2015 22:57:00 +0000 (17:57 -0500)]
mmc: sdhci: add timeout setting for response busy command

Timeout interrupt also work for response busy command(R1b) like
cmd38/cmd6. So need to set it accordingly. Current code only
set timeout for data command.

Signed-off-by: Kevin Liu <kliu5@marvell.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
9 years agommc: remove the MMC_MODE_HC flag
Rob Herring [Mon, 23 Mar 2015 22:56:59 +0000 (17:56 -0500)]
mmc: remove the MMC_MODE_HC flag

High capacity support is not a host capability, but a device capability
that is queried via the OCR. The flag in the operating conditions
request argument can just be set unconditionally. This matches the Linux
implementation.

[panto] Hand merged and renumbering MMC_MODE_DDR_52MHz.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Cc: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
9 years agommc: Fix splitting device initialization
Andrew Gabbasov [Thu, 19 Mar 2015 12:44:07 +0000 (07:44 -0500)]
mmc: Fix splitting device initialization

Starting part of device initialization sets the init_in_progress flag
only if the MMC card did not yet come to ready state and needs to continue
polling. If the card is SD or if the MMC card became ready quickly,
the flag is not set and (if using pre-initialization) the starting
phase will be re-executed from mmc_init function.

Set the init_in_progress flag in all non-error cases. Also, move flags
setting statements around so that the flags are not set in error paths.
Also, IN_PROGRESS return status becomes unnecessary, so get rid of it.

Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
9 years agommc: Restructure polling loops to avoid extra delays
Andrew Gabbasov [Thu, 19 Mar 2015 12:44:06 +0000 (07:44 -0500)]
mmc: Restructure polling loops to avoid extra delays

The polling loops in sd_send_op_cond and mmc_complete_op_cond functions
check the ready flag state at the end of the loop, that is after executing
a delay inside the loop, which, in case of exiting with no error,
is not needed. Also, one of these loops, as well as the loop
in mmc_send_status, have the delay just before exiting on timeout
conditions.

Restructure all these loops to check the respective conditions before making
a delay for the next loop pass, and to appropriately exit without the delay.

Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
9 years agommc: Continue polling MMC card for OCR only if it is still not ready
Andrew Gabbasov [Thu, 19 Mar 2015 12:44:05 +0000 (07:44 -0500)]
mmc: Continue polling MMC card for OCR only if it is still not ready

Some MMC cards come to ready state quite quickly, so that the respective
flag appears to be set in mmc_send_op_cond already. In this case trying
to continue polling the card with CMD1 in mmc_complete_op_cond is incorrect
and may lead to unpredictable results. So check the flag before polling
and skip it appropriately.

Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
9 years agommc: Do not pass external mmc_cmd structure to mmc_send_op_cond_iter()
Andrew Gabbasov [Thu, 19 Mar 2015 12:44:04 +0000 (07:44 -0500)]
mmc: Do not pass external mmc_cmd structure to mmc_send_op_cond_iter()

The previous change to use 'ocr' structure field for storing send_op_cond
command response also stopped using command response directly
outside of mmc_send_op_cond_iter(). Now it becomes possible to use
command structure in mmc_send_op_cond_iter() locally, removing a necessity
to pass it as an argument from the caller.

Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
9 years agommc: Avoid extra duplicate entry in mmc device structure
Andrew Gabbasov [Thu, 19 Mar 2015 12:44:03 +0000 (07:44 -0500)]
mmc: Avoid extra duplicate entry in mmc device structure

The 'op_cond_response' field in mmc structure contains the response
from the last SEND_OP_COND MMC command while making iterational
polling of the card. Later it is copied to 'ocr' field, designed
to contain the OCR register value, which is actually the same
response from the same command. So, these fields have actually
the same data, just in different time periods. It's easier to use
the same 'ocr' field in both cases at once, without temporary using
of the 'op_cond_response' field.

Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
9 years agommc: Fix typo in MMC type checking macro
Andrew Gabbasov [Thu, 19 Mar 2015 12:44:02 +0000 (07:44 -0500)]
mmc: Fix typo in MMC type checking macro

The version flag constant name used in IS_MMC macro is incorrect/undefined.

Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
9 years agoMerge branch 'u-boot/master' into 'u-boot-arm/master'
Albert ARIBAUD [Tue, 5 May 2015 08:09:06 +0000 (10:09 +0200)]
Merge branch 'u-boot/master' into 'u-boot-arm/master'