sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/misc'

This commit is contained in:
Sascha Hauer 2012-08-01 17:49:27 +02:00
parent a8dbc3f762 d6a50c915f
commit 9204bf87d6
12 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boards/ccxmx51/ccxmx51.c
View File

@ -191,7 +191,6 @@ static struct spi_imx_master ecspi_0_data = {
static const struct spi_board_info ccxmx51_spi_board_info[] = {
{
.name = "mc13xxx-spi",
.max_speed_hz = 6000000,
.bus_num = 0,
.chip_select = 0,
},

1
arch/arm/boards/freescale-mx51-pdk/board.c
View File

@ -117,7 +117,6 @@ static struct spi_imx_master spi_0_data = {
static const struct spi_board_info mx51_babbage_spi_board_info[] = {
{
.name = "mc13xxx-spi",
.max_speed_hz = 300000,
.bus_num = 0,
.chip_select = 0,
},

1
arch/arm/boards/pcm038/pcm038.c
View File

@ -59,7 +59,6 @@ static struct spi_imx_master pcm038_spi_0_data = {
static struct spi_board_info pcm038_spi_board_info[] = {
{
.name = "mc13xxx-spi",
.max_speed_hz = 3000000,
.bus_num = 0,
.chip_select = 0,
}

3
arch/arm/mach-omap/include/mach/clocks.h
View File

@ -44,5 +44,8 @@
#ifdef CONFIG_ARCH_OMAP3
#include <mach/omap3-clock.h>
#endif
#ifdef CONFIG_ARCH_OMAP4
#include <mach/omap4-clock.h>
#endif
#endif /* __OMAP_CLOCKS_H_ */

4
arch/arm/mach-omap/omap4_clock.c
View File

@ -1,7 +1,7 @@
#include <common.h>
#include <mach/syslib.h>
#include <io.h>
#include <mach/omap4-clock.h>
#include <mach/syslib.h>
#include <mach/clocks.h>
#define LDELAY 12000000

5
arch/arm/mach-omap/omap4_generic.c
View File

@ -1,10 +1,9 @@
#include <common.h>
#include <init.h>
#include <mach/silicon.h>
#include <io.h>
#include <mach/omap4-silicon.h>
#include <mach/clocks.h>
#include <mach/silicon.h>
#include <mach/omap4-mux.h>
#include <mach/omap4-clock.h>
#include <mach/syslib.h>
#include <mach/xload.h>
#include <mach/gpmc.h>

2
commands/Makefile
View File

@ -1,4 +1,4 @@
obj-y += stddev.o
obj-$(CONFIG_STDDEV) += stddev.o
obj-$(CONFIG_CMD_BOOTM) += bootm.o
obj-$(CONFIG_CMD_UIMAGE) += uimage.o
obj-$(CONFIG_CMD_LINUX16) += linux16.o

5
common/Kconfig
View File

@ -50,6 +50,9 @@ config BINFMT
config GLOBALVAR
bool
config STDDEV
bool
menu "General Settings "
config LOCALVERSION
@ -283,6 +286,7 @@ choice
select COMMAND_SUPPORT
select PARAMETER
select BINFMT
select STDDEV
help
Enable hush support. This is the most advanced shell available
for barebox.
@ -292,6 +296,7 @@ choice
select ENVIRONMENT_VARIABLES
select COMMAND_SUPPORT
select PARAMETER
select STDDEV
help
simple shell. No if/then, no return values from commands, no loops

1
drivers/mfd/mc13xxx.c
View File

@ -297,6 +297,7 @@ static int mc_probe(struct device_d *dev, enum mc13xxx_mode mode)
mc_dev->spi = dev->type_data;
mc_dev->spi->mode = SPI_MODE_0 | SPI_CS_HIGH;
mc_dev->spi->bits_per_word = 32;
mc_dev->spi->max_speed_hz = 20000000;
}
mc_dev->cdev.size = 256;
mc_dev->cdev.dev = dev;

2
drivers/serial/serial_ns16550.c
View File

@ -263,7 +263,7 @@ static int ns16550_probe(struct device_d *dev)
* @brief Driver registration structure
*/
static struct driver_d ns16550_serial_driver = {
.name = "serial_ns16550",
.name = "ns16550_serial",
.probe = ns16550_probe,
};

2
include/driver.h
View File

@ -226,7 +226,7 @@ struct NS16550_plat;
static inline struct device_d *add_ns16550_device(int id, resource_size_t start,
resource_size_t size, int flags, struct NS16550_plat *pdata)
{
return add_generic_device("serial_ns16550", id, NULL, start, size,
return add_generic_device("ns16550_serial", id, NULL, start, size,
IORESOURCE_MEM | flags, pdata);
}

2
lib/Kconfig
View File

@ -1,4 +1,4 @@
menu "Library routines"
menu "Library routines "
config PARAMETER
bool