Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC driver updates from Arnd Bergmann: "This contains driver changes that are tightly connected to SoC specific code. Aside from smaller cleanups and bug fixes, here is a list of the notable changes. New device drivers: - The Turris Mox router has a new "moxtet" bus driver for its on-board pluggable extension bus. The same platform also gains a firmware driver. - The Samsung Exynos family gains a new Chipid driver exporting using the soc device sysfs interface - A similar socinfo driver for Qualcomm Snapdragon chips. - A firmware driver for the NXP i.MX DSP IPC protocol using shared memory and a mailbox Other changes: - The i.MX reset controller driver now supports the NXP i.MX8MM chip - Amlogic SoC specific drivers gain support for the S905X3 and A311D chips - A rework of the TI Davinci framebuffer driver to allow important cleanups in the platform code - A couple of device drivers for removed ARM SoC platforms are removed. Most of the removals were picked up by other maintainers, this contains whatever was left" * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (123 commits) bus: uniphier-system-bus: use devm_platform_ioremap_resource() soc: ti: ti_sci_pm_domains: Add support for exclusive and shared access dt-bindings: ti_sci_pm_domains: Add support for exclusive and shared access firmware: ti_sci: Allow for device shared and exclusive requests bus: imx-weim: remove incorrect __init annotations fbdev: remove w90x900/nuc900 platform drivers spi: remove w90x900 driver net: remove w90p910-ether driver net: remove ks8695 driver firmware: turris-mox-rwtm: Add sysfs documentation firmware: Add Turris Mox rWTM firmware driver dt-bindings: firmware: Document cznic,turris-mox-rwtm binding bus: moxtet: fix unsigned comparison to less than zero bus: moxtet: remove set but not used variable 'dummy' ARM: scoop: Use the right include dt-bindings: power: add Amlogic Everything-Else power domains bindings soc: amlogic: Add support for Everything-Else power domains controller fbdev: da8xx: use resource management for dma fbdev: da8xx-fb: drop a redundant if fbdev: da8xx-fb: use devm_platform_ioremap_resource() ...
This commit is contained in:
@@ -36,6 +36,7 @@
|
||||
#include <linux/platform_data/ti-aemif.h>
|
||||
#include <linux/platform_data/spi-davinci.h>
|
||||
#include <linux/platform_data/uio_pruss.h>
|
||||
#include <linux/property.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
#include <linux/regulator/tps6507x.h>
|
||||
#include <linux/regulator/fixed.h>
|
||||
@@ -802,38 +803,80 @@ static const short da850_evm_mmcsd0_pins[] __initconst = {
|
||||
-1
|
||||
};
|
||||
|
||||
static void da850_panel_power_ctrl(int val)
|
||||
{
|
||||
/* lcd backlight */
|
||||
gpio_set_value(DA850_LCD_BL_PIN, val);
|
||||
static struct property_entry da850_lcd_backlight_props[] = {
|
||||
PROPERTY_ENTRY_BOOL("default-on"),
|
||||
{ }
|
||||
};
|
||||
|
||||
/* lcd power */
|
||||
gpio_set_value(DA850_LCD_PWR_PIN, val);
|
||||
}
|
||||
static struct gpiod_lookup_table da850_lcd_backlight_gpio_table = {
|
||||
.dev_id = "gpio-backlight",
|
||||
.table = {
|
||||
GPIO_LOOKUP("davinci_gpio", DA850_LCD_BL_PIN, NULL, 0),
|
||||
{ }
|
||||
},
|
||||
};
|
||||
|
||||
static const struct platform_device_info da850_lcd_backlight_info = {
|
||||
.name = "gpio-backlight",
|
||||
.id = PLATFORM_DEVID_NONE,
|
||||
.properties = da850_lcd_backlight_props,
|
||||
};
|
||||
|
||||
static struct regulator_consumer_supply da850_lcd_supplies[] = {
|
||||
REGULATOR_SUPPLY("lcd", NULL),
|
||||
};
|
||||
|
||||
static struct regulator_init_data da850_lcd_supply_data = {
|
||||
.consumer_supplies = da850_lcd_supplies,
|
||||
.num_consumer_supplies = ARRAY_SIZE(da850_lcd_supplies),
|
||||
.constraints = {
|
||||
.valid_ops_mask = REGULATOR_CHANGE_STATUS,
|
||||
},
|
||||
};
|
||||
|
||||
static struct fixed_voltage_config da850_lcd_supply = {
|
||||
.supply_name = "lcd",
|
||||
.microvolts = 33000000,
|
||||
.init_data = &da850_lcd_supply_data,
|
||||
};
|
||||
|
||||
static struct platform_device da850_lcd_supply_device = {
|
||||
.name = "reg-fixed-voltage",
|
||||
.id = 1, /* Dummy fixed regulator is 0 */
|
||||
.dev = {
|
||||
.platform_data = &da850_lcd_supply,
|
||||
},
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table da850_lcd_supply_gpio_table = {
|
||||
.dev_id = "reg-fixed-voltage.1",
|
||||
.table = {
|
||||
GPIO_LOOKUP("davinci_gpio", DA850_LCD_PWR_PIN, NULL, 0),
|
||||
{ }
|
||||
},
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table *da850_lcd_gpio_lookups[] = {
|
||||
&da850_lcd_backlight_gpio_table,
|
||||
&da850_lcd_supply_gpio_table,
|
||||
};
|
||||
|
||||
static int da850_lcd_hw_init(void)
|
||||
{
|
||||
struct platform_device *backlight;
|
||||
int status;
|
||||
|
||||
status = gpio_request(DA850_LCD_BL_PIN, "lcd bl");
|
||||
if (status < 0)
|
||||
gpiod_add_lookup_tables(da850_lcd_gpio_lookups,
|
||||
ARRAY_SIZE(da850_lcd_gpio_lookups));
|
||||
|
||||
backlight = platform_device_register_full(&da850_lcd_backlight_info);
|
||||
if (IS_ERR(backlight))
|
||||
return PTR_ERR(backlight);
|
||||
|
||||
status = platform_device_register(&da850_lcd_supply_device);
|
||||
if (status)
|
||||
return status;
|
||||
|
||||
status = gpio_request(DA850_LCD_PWR_PIN, "lcd pwr");
|
||||
if (status < 0) {
|
||||
gpio_free(DA850_LCD_BL_PIN);
|
||||
return status;
|
||||
}
|
||||
|
||||
gpio_direction_output(DA850_LCD_BL_PIN, 0);
|
||||
gpio_direction_output(DA850_LCD_PWR_PIN, 0);
|
||||
|
||||
/* Switch off panel power and backlight */
|
||||
da850_panel_power_ctrl(0);
|
||||
|
||||
/* Switch on panel power and backlight */
|
||||
da850_panel_power_ctrl(1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1443,7 +1486,6 @@ static __init void da850_evm_init(void)
|
||||
if (ret)
|
||||
pr_warn("%s: LCD initialization failed: %d\n", __func__, ret);
|
||||
|
||||
sharp_lk043t1dg01_pdata.panel_power_ctrl = da850_panel_power_ctrl,
|
||||
ret = da8xx_register_lcdc(&sharp_lk043t1dg01_pdata);
|
||||
if (ret)
|
||||
pr_warn("%s: LCDC registration failed: %d\n", __func__, ret);
|
||||
|
Reference in New Issue
Block a user