diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 9db53b2..3b572eb 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -256,6 +256,7 @@ config MACH_ANIMEO_IP bool "Somfy Animeo IP" + depends on !CONSOLE_NONE config MACH_AT91SAM9260EK bool "Atmel AT91SAM9260-EK" diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index f0d29ad..9ee7042 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -222,6 +222,7 @@ select I2C_IMX select MFD_MC13XXX select ARM_BOARD_APPEND_ATAG + select ARM_LINUX help Say Y here if you are using the fourth or fifth generation Amazon Kindle Model No. D01100 (Kindle Wi-Fi), D01200 (Kindle Touch) or @@ -750,6 +751,7 @@ select HAB select IMX_OCOTP depends on ARCH_IMX6 + depends on OFDEVICE help High Assurance Boot, as found on i.MX28/i.MX6. diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h index 572cabb..e0bb78e 100644 --- a/arch/mips/include/asm/cpu.h +++ b/arch/mips/include/asm/cpu.h @@ -51,6 +51,7 @@ #define PRID_IMP_24K 0x9300 #define PRID_IMP_24KE 0x9600 +#define PRID_IMP_74K 0x9700 /* * These are the PRID's for when 23:16 == PRID_COMP_BROADCOM @@ -105,6 +106,7 @@ * MIPS32 class processors */ CPU_24K, + CPU_74K, CPU_BMIPS3300, CPU_JZRISC, CPU_LOONGSON1, diff --git a/arch/mips/lib/cpu-probe.c b/arch/mips/lib/cpu-probe.c index 71dbaf6..b5d63db 100644 --- a/arch/mips/lib/cpu-probe.c +++ b/arch/mips/lib/cpu-probe.c @@ -106,6 +106,10 @@ c->cputype = CPU_24K; __cpu_name = "MIPS 24Kc"; break; + case PRID_IMP_74K: + c->cputype = CPU_74K; + __cpu_name = "MIPS 74Kc"; + break; } } diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c index 0be4855..021c433 100644 --- a/drivers/clk/clk-fixed-factor.c +++ b/drivers/clk/clk-fixed-factor.c @@ -56,7 +56,6 @@ struct clk_fixed_factor *fix = container_of(clk, struct clk_fixed_factor, clk); if (clk->flags & CLK_SET_RATE_PARENT) { - printk("%s: %ld -> parent %ld\n", __func__, rate, rate * fix->div / fix->mult); return clk_set_rate(clk_get_parent(clk), rate * fix->div / fix->mult); } diff --git a/drivers/video/imx-ipu-v3/imx-ldb.c b/drivers/video/imx-ipu-v3/imx-ldb.c index 14a86a4..33dbade 100644 --- a/drivers/video/imx-ipu-v3/imx-ldb.c +++ b/drivers/video/imx-ipu-v3/imx-ldb.c @@ -114,6 +114,7 @@ int di) { struct imx_ldb *ldb = imx_ldb_ch->ldb; + int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; ldb->soc_data->prepare(imx_ldb_ch, di, PICOS2KHZ(mode->pixclock) * 1000UL); @@ -135,6 +136,10 @@ if (imx_ldb_ch == &ldb->channel[0]) { ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK; ldb->ldb_ctrl |= LDB_CH0_MODE_EN_TO_DI0; + if (dual) { + ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK; + ldb->ldb_ctrl |= LDB_CH1_MODE_EN_TO_DI0; + } } if (imx_ldb_ch == &ldb->channel[1]) { @@ -147,20 +152,11 @@ return 0; } -static int imx6q_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di, - unsigned long pixclk) +static int imx6q_set_clock(struct imx_ldb *ldb, int ipuno, int dino, int chno, unsigned long pixclk) { struct clk *diclk, *ldbclk; - struct imx_ldb *ldb = imx_ldb_ch->ldb; - int ret, ipuno, dino; char *clkname; - void __iomem *gpr3 = (void *)MX6_IOMUXC_BASE_ADDR + 0xc; - uint32_t val; - int shift; - int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; - - ipuno = ((di >> 1) & 1) + 1; - dino = di & 0x1; + int ret; clkname = basprintf("ipu%d_di%d_sel", ipuno, dino); diclk = clk_lookup(clkname); @@ -170,7 +166,7 @@ return PTR_ERR(diclk); } - clkname = basprintf("ldb_di%d_podf", imx_ldb_ch->chno); + clkname = basprintf("ldb_di%d_podf", chno); ldbclk = clk_lookup(clkname); free(clkname); if (IS_ERR(ldbclk)) { @@ -184,10 +180,34 @@ return ret; } + clk_set_rate(clk_get_parent(ldbclk), pixclk); + clk_set_rate(ldbclk, pixclk); + + return 0; +} +static int imx6q_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di, + unsigned long pixclk) +{ + struct imx_ldb *ldb = imx_ldb_ch->ldb; + int ipuno, dino; + + void __iomem *gpr3 = (void *)MX6_IOMUXC_BASE_ADDR + 0xc; + uint32_t val; + int shift; + int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; + + ipuno = ((di >> 1) & 1) + 1; + dino = di & 0x1; + if (!dual) pixclk *= 2; - clk_set_rate(clk_get_parent(ldbclk), pixclk); + if (dual) { + imx6q_set_clock(ldb, ipuno, dino, 0, pixclk); + imx6q_set_clock(ldb, ipuno, dino, 1, pixclk); + } else { + imx6q_set_clock(ldb, ipuno, dino, imx_ldb_ch->chno, pixclk); + } val = readl(gpr3); shift = (imx_ldb_ch->chno == 0) ? 6 : 8; diff --git a/drivers/video/ssd1307fb.c b/drivers/video/ssd1307fb.c index 7437d34..54e02e7 100644 --- a/drivers/video/ssd1307fb.c +++ b/drivers/video/ssd1307fb.c @@ -24,6 +24,7 @@ #include #include #include +#include #define SSD1307FB_DATA 0x40 #define SSD1307FB_COMMAND 0x80 @@ -70,6 +71,7 @@ u32 prechargep1; u32 prechargep2; int reset; + struct regulator *vbat; u32 seg_remap; u32 vcomh; u32 width; @@ -422,6 +424,12 @@ goto fb_alloc_error; } + par->vbat = regulator_get(&client->dev, "vbat-supply"); + if (IS_ERR(par->vbat)) { + dev_info(&client->dev, "Will not use VBAT"); + par->vbat = NULL; + } + ret = of_property_read_u32(node, "solomon,width", &par->width); if (ret) { dev_err(&client->dev, @@ -505,11 +513,26 @@ goto reset_oled_error; } + if (par->vbat) { + ret = regulator_disable(par->vbat); + if (ret < 0) + goto reset_oled_error; + } + i2c_set_clientdata(client, info); /* Reset the screen */ gpio_set_value(par->reset, 0); udelay(4); + + if (par->vbat) { + ret = regulator_enable(par->vbat); + if (ret < 0) + goto reset_oled_error; + } + + mdelay(100); + gpio_set_value(par->reset, 1); udelay(4); @@ -548,6 +571,7 @@ panel_init_error: reset_oled_error: fb_alloc_error: + regulator_disable(par->vbat); free(info); return ret; } diff --git a/drivers/video/tc358767.c b/drivers/video/tc358767.c index ab2e86e..d10dcf2 100644 --- a/drivers/video/tc358767.c +++ b/drivers/video/tc358767.c @@ -967,7 +967,7 @@ goto err_dpcd_read; if (tmp[0] != tc->assr) { - dev_warn(dev, "Failed to switch display ASSR to %d, falling back to unscrambled mode\n", + dev_dbg(dev, "Failed to switch display ASSR to %d, falling back to unscrambled mode\n", tc->assr); /* trying with disabled scrambler */ tc->link.scrambler_dis = 1;