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

Merge branch 'for-next/randconfig-1'

This commit is contained in:
Sascha Hauer 2014-12-08 14:54:11 +01:00
parent 9b1d12fff0 ffc25a1195
commit b01bc4c810
16 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@ -154,6 +154,7 @@ config ARCH_ROCKCHIP
select CLKDEV_LOOKUP
select COMMON_CLK_OF_PROVIDER
select GPIOLIB
select PINCTRL
select PINCTRL_ROCKCHIP
select HAVE_PBL_MULTI_IMAGES

2
arch/arm/boards/edb93xx/edb93xx.c
View File

@ -45,7 +45,7 @@ static int ep93xx_mem_init(void)
#endif
#if (CONFIG_EP93XX_SDRAM_NUM_BANKS == 4)
arm_add_mem_device("ram3", CONFIG_EP93XX_SDRAM_BANK3_BASE,
CONFIG_EP93XX_SDRAM_BANK2_SIZE);
CONFIG_EP93XX_SDRAM_BANK3_SIZE);
#endif
return 0;

2
arch/arm/boards/friendlyarm-mini2440/mini2440.c
View File

@ -96,7 +96,6 @@ static struct fb_videomode s3c24x0_fb_modes[] = {
.pixclock = 41848,
.sync = FB_SYNC_USE_PWREN | FB_SYNC_DE_HIGH_ACT,
.vmode = FB_VMODE_NONINTERLACED,
.flag = 0,
},
#endif
#ifdef CONFIG_MINI2440_VIDEO_SVGA
@ -115,7 +114,6 @@ static struct fb_videomode s3c24x0_fb_modes[] = {
.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | FB_SYNC_DE_HIGH_ACT
/* | FB_SYNC_SWAP_HW */ /* FIXME maybe */ ,
.vmode = FB_VMODE_NONINTERLACED,
.flag = 0,
},
#endif
};

1
arch/arm/cpu/Kconfig
View File

@ -42,7 +42,6 @@ config CPU_ARM926T
# ARM946E-S
config CPU_ARM946E
bool
depends on !MMU
select CPU_32v4T
help
ARM946E-S is a member of the ARM9E-S family of high-

15
arch/arm/mach-at91/clock.c
View File

@ -336,8 +336,6 @@ EXPORT_SYMBOL(clk_get_rate);
/*------------------------------------------------------------------------*/
#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
/*
* For now, only the programmable clocks support reparenting (MCK could
* do this too, with care) or rate changing (the PLLs could do this too,
@ -379,6 +377,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
unsigned long prescale_offset, css_mask;
unsigned long actual;
if (!IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS))
return 0;
if (!clk_is_programmable(clk))
return -EINVAL;
if (clk->users)
@ -419,6 +420,9 @@ EXPORT_SYMBOL(clk_get_parent);
int clk_set_parent(struct clk *clk, struct clk *parent)
{
if (!IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS))
return -ENOSYS;
if (clk->users)
return -EBUSY;
if (!clk_is_primary(parent) || !clk_is_programmable(clk))
@ -453,8 +457,6 @@ static void init_programmable_clock(struct clk *clk)
clk->rate_hz = parent->rate_hz / pmc_prescaler_divider(pckr);
}
#endif /* CONFIG_AT91_PROGRAMMABLE_CLOCKS */
/*------------------------------------------------------------------------*/
/* Register a new clock */
@ -483,13 +485,10 @@ int clk_register(struct clk *clk)
else if (clk_is_sys(clk)) {
clk->parent = &mck;
clk->mode = pmc_sys_mode;
}
#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
else if (clk_is_programmable(clk)) {
} else if (IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS) && clk_is_programmable(clk)) {
clk->mode = pmc_sys_mode;
init_programmable_clock(clk);
}
#endif
at91_clk_add(clk);

3
arch/arm/mach-ep93xx/Kconfig
View File

@ -18,12 +18,15 @@ config ARCH_EP9302
bool "EP9302"
config ARCH_EP9307
depends on BROKEN
bool "EP9307"
config ARCH_EP9312
depends on BROKEN
bool "EP9312"
config ARCH_EP9315
depends on BROKEN
bool "EP9315"
endchoice

1
arch/arm/mach-omap/Kconfig
View File

@ -42,6 +42,7 @@ config ARCH_AM33XX
bool
select CPU_V7
select GENERIC_GPIO
select OFTREE
select OMAP_CLOCK_SOURCE_DMTIMER0
help
Say Y here if you are using Texas Instrument's AM33xx based platform

2
common/Kconfig
View File

@ -145,6 +145,7 @@ source "pbl/Kconfig"
config MMU
bool "Enable MMU"
depends on !CPU_ARM946E
help
Saying yes here enables the MMU. This is useful on some architectures
to enable the data cache which depends on the MMU. See Documentation/mmu.txt
@ -247,7 +248,6 @@ endmenu
config BROKEN
bool
prompt "Prompt for broken or incomplete code"
config EXPERIMENTAL
bool

1
drivers/firmware/Kconfig
View File

@ -3,6 +3,7 @@ menu "Firmware Drivers"
config FIRMWARE_ALTERA_SERIAL
bool "Altera SPI programming"
depends on OFDEVICE
depends on GENERIC_GPIO
depends on SPI
select FIRMWARE
help

2
drivers/mci/mxs.c
View File

@ -53,10 +53,8 @@ struct mxs_mci_host {
void __iomem *regs;
struct clk *clk;
unsigned clock; /* current clock speed in Hz ("0" if disabled) */
#ifdef CONFIG_MCI_INFO
unsigned f_min;
unsigned f_max;
#endif
unsigned bus_width:2; /* 0 = 1 bit, 1 = 4 bit, 2 = 8 bit */
};

2
drivers/spi/Kconfig
View File

@ -39,7 +39,7 @@ config DRIVER_SPI_IMX_2_3
config DRIVER_SPI_MXS
bool "i.MX (23,28) SPI Master driver"
depends on ARCH_IMX23 || ARCH_IMX28
depends on ARCH_IMX28
depends on SPI
config DRIVER_SPI_MVEBU

1
fs/Kconfig
View File

@ -61,6 +61,7 @@ source fs/ubifs/Kconfig
config FS_BPKFS
bool
select CRC32
prompt "BPKFS support"
help
Simple update file format developed for Somfy, tools and library are

11
include/asm-generic/gpio.h
View File

@ -1,17 +1,6 @@
#ifndef __ASM_GENERIC_GPIO_H
#define __ASM_GENERIC_GPIO_H
#define ARCH_NR_GPIOS 256
static inline int gpio_is_valid(int gpio)
{
if (gpio < 0)
return 0;
if (gpio < ARCH_NR_GPIOS)
return 1;
return 0;
}
void gpio_set_value(unsigned gpio, int value);
int gpio_get_value(unsigned gpio);
int gpio_direction_output(unsigned gpio, int value);

11
include/gpio.h
View File

@ -3,6 +3,17 @@
#include <asm/gpio.h>
#define ARCH_NR_GPIOS 256
static inline int gpio_is_valid(int gpio)
{
if (gpio < 0)
return 0;
if (gpio < ARCH_NR_GPIOS)
return 1;
return 0;
}
#define GPIOF_DIR_OUT (0 << 0)
#define GPIOF_DIR_IN (1 << 0)

4
include/param.h
View File

@ -67,7 +67,7 @@ struct param_d *dev_add_param_mac(struct device_d *dev, const char *name,
int (*get)(struct param_d *p, void *priv),
u8 *mac, void *priv);
int dev_add_param_fixed(struct device_d *dev, char *name, const char *value);
int dev_add_param_fixed(struct device_d *dev, const char *name, const char *value);
void dev_remove_param(struct param_d *p);
@ -161,7 +161,7 @@ static inline struct param_d *dev_add_param_mac(struct device_d *dev, const char
return NULL;
}
static inline int dev_add_param_fixed(struct device_d *dev, char *name, char *value)
static inline int dev_add_param_fixed(struct device_d *dev, const char *name, const char *value)
{
return 0;
}

2
lib/parameter.c
View File

@ -185,7 +185,7 @@ struct param_d *dev_add_param(struct device_d *dev, const char *name,
* @param name The name of the parameter
* @param value The value of the parameter
*/
int dev_add_param_fixed(struct device_d *dev, char *name, const char *value)
int dev_add_param_fixed(struct device_d *dev, const char *name, const char *value)
{
struct param_d *param;
int ret;