mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 05:01:48 +00:00
d61b7a572b
Quite a bit of code gets removed, and some stuff moved around, mostly the old samsung s3c24xx stuff. There should be no functional changes in this series otherwise. Some cleanups have dependencies on other arm-soc branches and will be sent in the second round. Signed-off-by: Arnd Bergmann <arnd@arndb.de> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIVAwUAT2pCjGCrR//JCVInAQLd8RAAqCxhzSc4ewTUP/974gVhujj3TrpiEQcS FKvYWF76yP38Lbf3CJZBZaONRtrQNOhYpVQ0jb3WCV4F8mEH9PCes2q9RObeBYiY TNX8VdcuVjX2U9HaH0+RQtBUdujNLHpEOqtO57un7T5UDNssR5JOive1tNAooRv1 pL0Hgx3AVqUbNOPpqQqHzy/MDdd67S6dX80yysANjFGMX87Nvp/ztYAdNnIdta+Z pDJt+DPlmK8LvjoSL3SEUN0p3Thk75621cCuauGq88PLIB2w62tzF0NFFbvIAgJT 3aMlHM2flOiTJAWkUvA8zJiUzwv/0vYvH3xPoTo84abve3lVfZcY+fHNcfxE/Gge ri2MmkHyimVP3rNeyM0GbN1RTej1TN1MezeQW3nq2wP6nvS2k0/t32ObLLtWU7XA 6iA0hKVMSnhqj4ln6jPAmyaDkaWHyYz97urhgetHqGadvLTiGPXCSBPalSiFmyMo 11tvuqwUNz9tw4nsvGboFQwS2ZoVquC5inoHp5seqZETkGCB67JyeRGxtAM4gbP/ wIRa3OBLY99yo1on6QovWNnSOMC6X4cOvBI/qHIjSEY/T9JVkslY87gRg3LkxCBR XpXfZ6iuLHoSRUGcIjE8D6KHjMgWIDPRnLkIliK4H+3Jn08g0R1MxCplevFCRtis egswZ8C24Xw= =o5Xl -----END PGP SIGNATURE----- Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull "ARM: global cleanups" from Arnd Bergmann: "Quite a bit of code gets removed, and some stuff moved around, mostly the old samsung s3c24xx stuff. There should be no functional changes in this series otherwise. Some cleanups have dependencies on other arm-soc branches and will be sent in the second round. Signed-off-by: Arnd Bergmann <arnd@arndb.de>" Fixed up trivial conflicts mainly due to #include's being changes on both sides. * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits) ep93xx: Remove unnecessary includes of ep93xx-regs.h ep93xx: Move EP93XX_SYSCON defines to SoC private header ep93xx: Move crunch code to mach-ep93xx directory ep93xx: Make syscon access functions private to SoC ep93xx: Configure GPIO ports in core code ep93xx: Move peripheral defines to local SoC header ep93xx: Convert the watchdog driver into a platform device. ep93xx: Use ioremap for backlight driver ep93xx: Move GPIO defines to gpio-ep93xx.h ep93xx: Don't use system controller defines in audio drivers ep93xx: Move PHYS_BASE defines to local SoC header file ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver ARM: EXYNOS: add clock registers for exynos4x12-cpufreq PM / devfreq: update the name of EXYNOS clock registers that were omitted PM / devfreq: update the name of EXYNOS clock register ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock ARM: EXYNOS: use static declaration on regarding clock ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs ARM: OMAP2+: Fix build error after merge ARM: S3C24XX: remove call to s3c24xx_setup_clocks ...
144 lines
3.6 KiB
C
144 lines
3.6 KiB
C
/*
|
|
* Copyright (C) 2010 Texas Instruments Inc.
|
|
*
|
|
* Modified from mach-omap2/board-zoom-peripherals.c
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/i2c/twl.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <plat/mcspi.h>
|
|
#include <video/omapdss.h>
|
|
|
|
#define LCD_PANEL_RESET_GPIO_PROD 96
|
|
#define LCD_PANEL_RESET_GPIO_PILOT 55
|
|
#define LCD_PANEL_QVGA_GPIO 56
|
|
|
|
static struct gpio zoom_lcd_gpios[] __initdata = {
|
|
{ -EINVAL, GPIOF_OUT_INIT_HIGH, "lcd reset" },
|
|
{ LCD_PANEL_QVGA_GPIO, GPIOF_OUT_INIT_HIGH, "lcd qvga" },
|
|
};
|
|
|
|
static void __init zoom_lcd_panel_init(void)
|
|
{
|
|
zoom_lcd_gpios[0].gpio = (omap_rev() > OMAP3430_REV_ES3_0) ?
|
|
LCD_PANEL_RESET_GPIO_PROD :
|
|
LCD_PANEL_RESET_GPIO_PILOT;
|
|
|
|
if (gpio_request_array(zoom_lcd_gpios, ARRAY_SIZE(zoom_lcd_gpios)))
|
|
pr_err("%s: Failed to get LCD GPIOs.\n", __func__);
|
|
}
|
|
|
|
static int zoom_panel_enable_lcd(struct omap_dss_device *dssdev)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static void zoom_panel_disable_lcd(struct omap_dss_device *dssdev)
|
|
{
|
|
}
|
|
|
|
/*
|
|
* PWMA/B register offsets (TWL4030_MODULE_PWMA)
|
|
*/
|
|
#define TWL_INTBR_PMBR1 0xD
|
|
#define TWL_INTBR_GPBR1 0xC
|
|
#define TWL_LED_PWMON 0x0
|
|
#define TWL_LED_PWMOFF 0x1
|
|
|
|
static int zoom_set_bl_intensity(struct omap_dss_device *dssdev, int level)
|
|
{
|
|
#ifdef CONFIG_TWL4030_CORE
|
|
unsigned char c;
|
|
u8 mux_pwm, enb_pwm;
|
|
|
|
if (level > 100)
|
|
return -1;
|
|
|
|
twl_i2c_read_u8(TWL4030_MODULE_INTBR, &mux_pwm, TWL_INTBR_PMBR1);
|
|
twl_i2c_read_u8(TWL4030_MODULE_INTBR, &enb_pwm, TWL_INTBR_GPBR1);
|
|
|
|
if (level == 0) {
|
|
/* disable pwm1 output and clock */
|
|
enb_pwm = enb_pwm & 0xF5;
|
|
/* change pwm1 pin to gpio pin */
|
|
mux_pwm = mux_pwm & 0xCF;
|
|
twl_i2c_write_u8(TWL4030_MODULE_INTBR,
|
|
enb_pwm, TWL_INTBR_GPBR1);
|
|
twl_i2c_write_u8(TWL4030_MODULE_INTBR,
|
|
mux_pwm, TWL_INTBR_PMBR1);
|
|
return 0;
|
|
}
|
|
|
|
if (!((enb_pwm & 0xA) && (mux_pwm & 0x30))) {
|
|
/* change gpio pin to pwm1 pin */
|
|
mux_pwm = mux_pwm | 0x30;
|
|
/* enable pwm1 output and clock*/
|
|
enb_pwm = enb_pwm | 0x0A;
|
|
twl_i2c_write_u8(TWL4030_MODULE_INTBR,
|
|
mux_pwm, TWL_INTBR_PMBR1);
|
|
twl_i2c_write_u8(TWL4030_MODULE_INTBR,
|
|
enb_pwm, TWL_INTBR_GPBR1);
|
|
}
|
|
|
|
c = ((50 * (100 - level)) / 100) + 1;
|
|
twl_i2c_write_u8(TWL4030_MODULE_PWM1, 0x7F, TWL_LED_PWMOFF);
|
|
twl_i2c_write_u8(TWL4030_MODULE_PWM1, c, TWL_LED_PWMON);
|
|
#else
|
|
pr_warn("Backlight not enabled\n");
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct omap_dss_device zoom_lcd_device = {
|
|
.name = "lcd",
|
|
.driver_name = "NEC_8048_panel",
|
|
.type = OMAP_DISPLAY_TYPE_DPI,
|
|
.phy.dpi.data_lines = 24,
|
|
.platform_enable = zoom_panel_enable_lcd,
|
|
.platform_disable = zoom_panel_disable_lcd,
|
|
.max_backlight_level = 100,
|
|
.set_backlight = zoom_set_bl_intensity,
|
|
};
|
|
|
|
static struct omap_dss_device *zoom_dss_devices[] = {
|
|
&zoom_lcd_device,
|
|
};
|
|
|
|
static struct omap_dss_board_info zoom_dss_data = {
|
|
.num_devices = ARRAY_SIZE(zoom_dss_devices),
|
|
.devices = zoom_dss_devices,
|
|
.default_device = &zoom_lcd_device,
|
|
};
|
|
|
|
static struct omap2_mcspi_device_config dss_lcd_mcspi_config = {
|
|
.turbo_mode = 1,
|
|
};
|
|
|
|
static struct spi_board_info nec_8048_spi_board_info[] __initdata = {
|
|
[0] = {
|
|
.modalias = "nec_8048_spi",
|
|
.bus_num = 1,
|
|
.chip_select = 2,
|
|
.max_speed_hz = 375000,
|
|
.controller_data = &dss_lcd_mcspi_config,
|
|
},
|
|
};
|
|
|
|
void __init zoom_display_init(void)
|
|
{
|
|
omap_display_init(&zoom_dss_data);
|
|
spi_register_board_info(nec_8048_spi_board_info,
|
|
ARRAY_SIZE(nec_8048_spi_board_info));
|
|
zoom_lcd_panel_init();
|
|
}
|
|
|