diff options
author | Lucas Stach <l.stach@pengutronix.de> | 2017-07-31 20:21:02 +0200 |
---|---|---|
committer | Lucas Stach <l.stach@pengutronix.de> | 2017-07-31 20:21:02 +0200 |
commit | 361c36d997789ac1f42d14ccd6f45449c8604958 (patch) | |
tree | 430d3161b9cf4a86fee7fe3eea70eba1d2453d25 /drivers | |
parent | 8b8d55e3c2a1f8b3b6323f59f90da6b51196402c (diff) | |
parent | 78c40c6e9e9bc23c46c9b5eda3bc8825cdf5e91a (diff) | |
download | barebox-361c36d997789ac1f42d14ccd6f45449c8604958.tar.gz barebox-361c36d997789ac1f42d14ccd6f45449c8604958.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/clk/clk-fixed-factor.c | 1 | ||||
-rw-r--r-- | drivers/video/imx-ipu-v3/imx-ldb.c | 46 | ||||
-rw-r--r-- | drivers/video/ssd1307fb.c | 24 | ||||
-rw-r--r-- | drivers/video/tc358767.c | 2 |
4 files changed, 58 insertions, 15 deletions
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c index 0be48558e6..021c43339f 100644 --- a/drivers/clk/clk-fixed-factor.c +++ b/drivers/clk/clk-fixed-factor.c @@ -56,7 +56,6 @@ static int clk_factor_set_rate(struct clk *clk, unsigned long rate, 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 14a86a42c1..33dbade870 100644 --- a/drivers/video/imx-ipu-v3/imx-ldb.c +++ b/drivers/video/imx-ipu-v3/imx-ldb.c @@ -114,6 +114,7 @@ static int imx_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, struct fb_videomo 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 @@ static int imx_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, struct fb_videomo 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 @@ static int imx_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, struct fb_videomo 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 @@ static int imx6q_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di, 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 @@ static int imx6q_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di, 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 7437d340ee..54e02e7220 100644 --- a/drivers/video/ssd1307fb.c +++ b/drivers/video/ssd1307fb.c @@ -24,6 +24,7 @@ #include <of_device.h> #include <gpio.h> #include <of_gpio.h> +#include <regulator.h> #define SSD1307FB_DATA 0x40 #define SSD1307FB_COMMAND 0x80 @@ -70,6 +71,7 @@ struct ssd1307fb_par { u32 prechargep1; u32 prechargep2; int reset; + struct regulator *vbat; u32 seg_remap; u32 vcomh; u32 width; @@ -422,6 +424,12 @@ static int ssd1307fb_probe(struct device_d *dev) 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 @@ static int ssd1307fb_probe(struct device_d *dev) 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 @@ static int ssd1307fb_probe(struct device_d *dev) 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 ab2e86ec43..d10dcf2f52 100644 --- a/drivers/video/tc358767.c +++ b/drivers/video/tc358767.c @@ -967,7 +967,7 @@ static int tc_main_link_setup(struct tc_data *tc) 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; |