diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/fpga/lattice.c | 6 | ||||
| -rw-r--r-- | drivers/i2c/mxc_i2c.c | 5 | ||||
| -rw-r--r-- | drivers/mtd/spi/winbond.c | 8 | ||||
| -rw-r--r-- | drivers/video/Makefile | 7 | ||||
| -rw-r--r-- | drivers/video/mb86r0xgdc.c | 1 |
5 files changed, 15 insertions, 12 deletions
diff --git a/drivers/fpga/lattice.c b/drivers/fpga/lattice.c index c3b2355..50d9e542 100644 --- a/drivers/fpga/lattice.c +++ b/drivers/fpga/lattice.c @@ -34,7 +34,7 @@ #include <lattice.h> static lattice_board_specific_func *pfns; -static char *fpga_image; +static const char *fpga_image; static unsigned long read_bytes; static unsigned long bufsize; static unsigned short expectedCRC; @@ -302,7 +302,7 @@ static int lattice_validate(Lattice_desc *desc, const char *fn) return ret_val; } -int lattice_load(Lattice_desc *desc, void *buf, size_t bsize) +int lattice_load(Lattice_desc *desc, const void *buf, size_t bsize) { int ret_val = FPGA_FAIL; @@ -335,7 +335,7 @@ int lattice_load(Lattice_desc *desc, void *buf, size_t bsize) return ret_val; } -int lattice_dump(Lattice_desc *desc, void *buf, size_t bsize) +int lattice_dump(Lattice_desc *desc, const void *buf, size_t bsize) { puts("Dump not supported for Lattice FPGA\n"); diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 89d1973..ebde3c5 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -89,14 +89,11 @@ void i2c_init(int speed, int unused) #if defined(CONFIG_MX31) struct clock_control_regs *sc_regs = (struct clock_control_regs *)CCM_BASE; - - freq = mx31_get_ipg_clk(); /* start the required I2C clock */ writel(readl(&sc_regs->cgr0) | (3 << I2C_CLK_OFFSET), &sc_regs->cgr0); -#else - freq = mxc_get_clock(MXC_IPG_PERCLK); #endif + freq = mxc_get_clock(MXC_IPG_PERCLK); for (i = 0; i < 0x1f; i++) if (freq / div[i] <= speed) diff --git a/drivers/mtd/spi/winbond.c b/drivers/mtd/spi/winbond.c index 45bd146..a6a6653 100644 --- a/drivers/mtd/spi/winbond.c +++ b/drivers/mtd/spi/winbond.c @@ -36,6 +36,14 @@ struct winbond_spi_flash_params { static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { { + .id = 0x3013, + .l2_page_size = 8, + .pages_per_sector = 16, + .sectors_per_block = 16, + .nr_blocks = 8, + .name = "W25X40", + }, + { .id = 0x3015, .l2_page_size = 8, .pages_per_sector = 16, diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 226684ad..3790f91 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -30,21 +30,20 @@ COBJS-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o COBJS-$(CONFIG_CFB_CONSOLE) += cfb_console.o COBJS-$(CONFIG_FSL_DIU_FB) += fsl_diu_fb.o videomodes.o COBJS-$(CONFIG_S6E63D6) += s6e63d6.o +COBJS-$(CONFIG_SED156X) += sed156x.o COBJS-$(CONFIG_VIDEO_AMBA) += amba.o COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o videomodes.o COBJS-$(CONFIG_VIDEO_MB86R0xGDC) += mb86r0xgdc.o videomodes.o COBJS-$(CONFIG_VIDEO_MX3) += mx3fb.o COBJS-$(CONFIG_VIDEO_MX5) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o +COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o videomodes.o COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o -COBJS-$(CONFIG_SED156X) += sed156x.o COBJS-$(CONFIG_VIDEO_SM501) += sm501.o COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o -COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o -COBJS-y += videomodes.o -COBJS := $(COBJS-y) +COBJS := $(sort $(COBJS-y)) SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/drivers/video/mb86r0xgdc.c b/drivers/video/mb86r0xgdc.c index 5425c9d..345a73b 100644 --- a/drivers/video/mb86r0xgdc.c +++ b/drivers/video/mb86r0xgdc.c @@ -57,7 +57,6 @@ static void dsp_init(struct mb86r0x_gdc_dsp *dsp, char *modestr, u16 l2dx, l2dy, l2wx, l2wy, l2ww, l2wh; unsigned long div; int bpp; - u32 i; bpp = video_get_params(&var_mode, modestr); |