u-boot.git/drivers, branch v2014.07-rc1 Unnamed repository; edit this file 'description' to name the repository. Merge branch 'master' of git://git.denx.de/u-boot-arm 2014-05-09T15:18:45+00:00 Tom Rini trini@ti.com 2014-05-09T15:18:45+00:00 bcb879c0e37db1cf527ff408df93918f155012ea 






Merge branch 'u-boot/master'
2014-05-09T09:50:14+00:00

Albert ARIBAUD
albert.u.boot@aribaud.net

2014-05-09T08:47:05+00:00

d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19

Conflicts:
	drivers/net/Makefile

(trivial merge)





Conflicts:
	drivers/net/Makefile

(trivial merge)







i2c: zynq: Fixed compilation errors when using DEBUG
2014-05-08T05:03:37+00:00

Jesper B. Christensen
jesper.christensen@cobham.com

2014-04-25T13:46:17+00:00

5146fc2b37a3098f0973b2f2339e069adfc7d272

Signed-off-by: Jesper B. Christensen <jesper.christensen@cobham.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>





Signed-off-by: Jesper B. Christensen <jesper.christensen@cobham.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>







Merge branch 'serial' of git://www.denx.de/git/u-boot-microblaze
2014-05-06T18:55:45+00:00

Tom Rini
trini@ti.com

2014-05-06T18:55:45+00:00

173d294b94cfec10063a5be40934d6d8fb7981ce












Merge branch 'net' of git://www.denx.de/git/u-boot-microblaze
2014-05-06T18:50:22+00:00

Tom Rini
trini@ti.com

2014-05-06T18:50:22+00:00

a1a1f6e938a9de13c353064ba80eb705ba7422e9












serial: zynq: Fix typo in suffix function name
2014-05-06T11:47:42+00:00

Michal Simek
michal.simek@xilinx.com

2014-04-25T11:46:28+00:00

870e0bda43c9ea18a5f2fae5e48905c3b44ea18b

's/zynq_serial_initalize/zynq_serial_initialize/g'
serial_initialize is used by all serial drivers.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>





's/zynq_serial_initalize/zynq_serial_initialize/g'
serial_initialize is used by all serial drivers.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>







serial: zynq: Remove sparse warnings
2014-05-06T11:47:41+00:00

Michal Simek
michal.simek@xilinx.com

2014-04-25T11:45:08+00:00

6c4da359960bd15c1adbda2fc9639f2791f04e44

Warnings:
drivers/serial/serial_zynq.c:181:1: warning: symbol 'uart_zynq0_init' was not declared. Should it be static?
drivers/serial/serial_zynq.c:181:1: warning: symbol 'uart_zynq0_setbrg' was not declared. Should it be static?
drivers/serial/serial_zynq.c:181:1: warning: symbol 'uart_zynq0_getc' was not declared. Should it be static?
drivers/serial/serial_zynq.c:181:1: warning: symbol 'uart_zynq0_tstc' was not declared. Should it be static?
drivers/serial/serial_zynq.c:181:1: warning: symbol 'uart_zynq0_putc' was not declared. Should it be static?
drivers/serial/serial_zynq.c:181:1: warning: symbol 'uart_zynq0_puts' was not declared. Should it be static?
drivers/serial/serial_zynq.c:182:22: warning: symbol 'uart_zynq_serial0_device' was not declared. Should it be static?
drivers/serial/serial_zynq.c:184:1: warning: symbol 'uart_zynq1_init' was not declared. Should it be static?
drivers/serial/serial_zynq.c:184:1: warning: symbol 'uart_zynq1_setbrg' was not declared. Should it be static?
drivers/serial/serial_zynq.c:184:1: warning: symbol 'uart_zynq1_getc' was not declared. Should it be static?
drivers/serial/serial_zynq.c:184:1: warning: symbol 'uart_zynq1_tstc' was not declared. Should it be static?
drivers/serial/serial_zynq.c:184:1: warning: symbol 'uart_zynq1_putc' was not declared. Should it be static?
drivers/serial/serial_zynq.c:184:1: warning: symbol 'uart_zynq1_puts' was not declared. Should it be static?
drivers/serial/serial_zynq.c:185:22: warning: symbol 'uart_zynq_serial1_device' was not declared. Should it be static?

Signed-off-by: Michal Simek <michal.simek@xilinx.com>





Warnings:
drivers/serial/serial_zynq.c:181:1: warning: symbol 'uart_zynq0_init' was not declared. Should it be static?
drivers/serial/serial_zynq.c:181:1: warning: symbol 'uart_zynq0_setbrg' was not declared. Should it be static?
drivers/serial/serial_zynq.c:181:1: warning: symbol 'uart_zynq0_getc' was not declared. Should it be static?
drivers/serial/serial_zynq.c:181:1: warning: symbol 'uart_zynq0_tstc' was not declared. Should it be static?
drivers/serial/serial_zynq.c:181:1: warning: symbol 'uart_zynq0_putc' was not declared. Should it be static?
drivers/serial/serial_zynq.c:181:1: warning: symbol 'uart_zynq0_puts' was not declared. Should it be static?
drivers/serial/serial_zynq.c:182:22: warning: symbol 'uart_zynq_serial0_device' was not declared. Should it be static?
drivers/serial/serial_zynq.c:184:1: warning: symbol 'uart_zynq1_init' was not declared. Should it be static?
drivers/serial/serial_zynq.c:184:1: warning: symbol 'uart_zynq1_setbrg' was not declared. Should it be static?
drivers/serial/serial_zynq.c:184:1: warning: symbol 'uart_zynq1_getc' was not declared. Should it be static?
drivers/serial/serial_zynq.c:184:1: warning: symbol 'uart_zynq1_tstc' was not declared. Should it be static?
drivers/serial/serial_zynq.c:184:1: warning: symbol 'uart_zynq1_putc' was not declared. Should it be static?
drivers/serial/serial_zynq.c:184:1: warning: symbol 'uart_zynq1_puts' was not declared. Should it be static?
drivers/serial/serial_zynq.c:185:22: warning: symbol 'uart_zynq_serial1_device' was not declared. Should it be static?

Signed-off-by: Michal Simek <michal.simek@xilinx.com>







net: zynq: Fix sparse warnings in gem
2014-05-06T11:41:55+00:00

Michal Simek
michal.simek@xilinx.com

2014-04-25T12:17:38+00:00

2fd2489b7aa36478433ae2a1f4de9f66e0a80322

Add missing header.

Warnings:
drivers/net/zynq_gem.c:491:5: warning: symbol 'zynq_gem_initialize' was not declared. Should it be static?
drivers/net/zynq_gem.c:542:5: warning: symbol 'zynq_gem_of_init' was not declared. Should it be static?

Signed-off-by: Michal Simek <michal.simek@xilinx.com>





Add missing header.

Warnings:
drivers/net/zynq_gem.c:491:5: warning: symbol 'zynq_gem_initialize' was not declared. Should it be static?
drivers/net/zynq_gem.c:542:5: warning: symbol 'zynq_gem_of_init' was not declared. Should it be static?

Signed-off-by: Michal Simek <michal.simek@xilinx.com>







net: zynq: Use predefined macros instead of hardcoded value
2014-05-06T11:41:33+00:00

Michal Simek
michal.simek@xilinx.com

2014-02-25T09:25:38+00:00

c1a9fa4ba67971f45ee106250340963cef7d020a

MII is used by this driver.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>





MII is used by this driver.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>







USB: gadget: save driver name before registering it
2014-05-05T06:33:13+00:00

Stephen Warren
swarren@nvidia.com

2014-05-01T21:45:16+00:00

25fbf96b24fd3fe0a5252c374b445be32f42b0c8

g_dnl_register() currently first attempts to register a composite
driver by name, and then saves the driver name once it's registered.
Internally to the registration code, g_dnl_do_config() is called and
attempts to compare the composite device's name with the list of known
device names. This fails since the composite device's name has not yet
been stored. This means that the first time "ums 0 0" is run, it fails,
but subsequent attempts succeed.

Re-order the name-saving and registration code to solve this.

Fixes: e5b834e07f51 ("USB: gadget: added a saner gadget downloader registration API")
Signed-off-by: Stephen Warren <swarren@nvidia.com>





g_dnl_register() currently first attempts to register a composite
driver by name, and then saves the driver name once it's registered.
Internally to the registration code, g_dnl_do_config() is called and
attempts to compare the composite device's name with the list of known
device names. This fails since the composite device's name has not yet
been stored. This means that the first time "ums 0 0" is run, it fails,
but subsequent attempts succeed.

Re-order the name-saving and registration code to solve this.

Fixes: e5b834e07f51 ("USB: gadget: added a saner gadget downloader registration API")
Signed-off-by: Stephen Warren <swarren@nvidia.com>