OMAP3: ZOOM2/3/3630SDP: Add display board file for OMAP3 (a6490335) · Commits · 戴 / test

arch/arm/mach-omap2/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -187,16 +187,19 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
		hsmmc.o
		obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom.o \
		board-zoom-peripherals.o \
		board-zoom-display.o \
		board-flash.o \
		hsmmc.o \
		board-zoom-debugboard.o
		obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom.o \
		board-zoom-peripherals.o \
		board-zoom-display.o \
		board-flash.o \
		hsmmc.o \
		board-zoom-debugboard.o
		obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \
		board-zoom-peripherals.o \
		board-zoom-display.o \
		board-flash.o \
		hsmmc.o
		obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \

arch/arm/mach-omap2/board-zoom-display.c

0 → 100644

+168 −0

Original line number	Diff line number	Diff line
		/*
		* 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 <plat/display.h>

		#define LCD_PANEL_RESET_GPIO_PROD 96
		#define LCD_PANEL_RESET_GPIO_PILOT 55
		#define LCD_PANEL_QVGA_GPIO 56

		static void zoom_lcd_panel_init(void)
		{
		int ret;
		unsigned char lcd_panel_reset_gpio;

		lcd_panel_reset_gpio = (omap_rev() > OMAP3430_REV_ES3_0) ?
		LCD_PANEL_RESET_GPIO_PROD :
		LCD_PANEL_RESET_GPIO_PILOT;

		ret = gpio_request(lcd_panel_reset_gpio, "lcd reset");
		if (ret) {
		pr_err("Failed to get LCD reset GPIO (gpio%d).\n",
		lcd_panel_reset_gpio);
		return;
		}
		gpio_direction_output(lcd_panel_reset_gpio, 1);

		ret = gpio_request(LCD_PANEL_QVGA_GPIO, "lcd qvga");
		if (ret) {
		pr_err("Failed to get LCD_PANEL_QVGA_GPIO (gpio%d).\n",
		LCD_PANEL_QVGA_GPIO);
		goto err0;
		}
		gpio_direction_output(LCD_PANEL_QVGA_GPIO, 1);

		return;
		err0:
		gpio_free(lcd_panel_reset_gpio);
		}

		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)
		{
		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);

		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 platform_device zoom_dss_device = {
		.name = "omapdss",
		.id = -1,
		.dev = {
		.platform_data = &zoom_dss_data,
		},
		};

		static struct omap2_mcspi_device_config dss_lcd_mcspi_config = {
		.turbo_mode = 1,
		.single_channel = 1, /* 0: slave, 1: master */
		};

		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,
		},
		};

		static struct platform_device *zoom_display_devices[] __initdata = {
		&zoom_dss_device,
		};

		void __init zoom_display_init(void)
		{
		platform_add_devices(zoom_display_devices,
		ARRAY_SIZE(zoom_display_devices));
		spi_register_board_info(nec_8048_spi_board_info,
		ARRAY_SIZE(nec_8048_spi_board_info));
		zoom_lcd_panel_init();
		}

arch/arm/mach-omap2/board-zoom-peripherals.c

+47 −2

Original line number	Diff line number	Diff line
		@@ -35,6 +35,8 @@
		#define OMAP_ZOOM_WLAN_PMENA_GPIO (101)
		#define OMAP_ZOOM_WLAN_IRQ_GPIO (162)

		#define LCD_PANEL_ENABLE_GPIO (7 + OMAP_MAX_GPIO_LINES)

		/* Zoom2 has Qwerty keyboard*/
		static uint32_t board_keymap[] = {
		KEY(0, 0, KEY_E),
		@@ -224,9 +226,43 @@ static struct omap2_hsmmc_info mmc[] = {
		{} /* Terminator */
		};

		static struct regulator_consumer_supply zoom_vpll2_supply =
		REGULATOR_SUPPLY("vdds_dsi", "omapdss");

		static struct regulator_consumer_supply zoom_vdda_dac_supply =
		REGULATOR_SUPPLY("vdda_dac", "omapdss");

		static struct regulator_init_data zoom_vpll2 = {
		.constraints = {
		.min_uV = 1800000,
		.max_uV = 1800000,
		.valid_modes_mask = REGULATOR_MODE_NORMAL
		\| REGULATOR_MODE_STANDBY,
		.valid_ops_mask = REGULATOR_CHANGE_MODE
		\| REGULATOR_CHANGE_STATUS,
		},
		.num_consumer_supplies = 1,
		.consumer_supplies = &zoom_vpll2_supply,
		};

		static struct regulator_init_data zoom_vdac = {
		.constraints = {
		.min_uV = 1800000,
		.max_uV = 1800000,
		.valid_modes_mask = REGULATOR_MODE_NORMAL
		\| REGULATOR_MODE_STANDBY,
		.valid_ops_mask = REGULATOR_CHANGE_MODE
		\| REGULATOR_CHANGE_STATUS,
		},
		.num_consumer_supplies = 1,
		.consumer_supplies = &zoom_vdda_dac_supply,
		};

		static int zoom_twl_gpio_setup(struct device *dev,
		unsigned gpio, unsigned ngpio)
		{
		int ret;

		/* gpio + 0 is "mmc0_cd" (input/IRQ) */
		mmc[0].gpio_cd = gpio + 0;
		omap2_hsmmc_init(mmc);
		@@ -238,7 +274,15 @@ static int zoom_twl_gpio_setup(struct device *dev,
		zoom_vsim_supply.dev = mmc[0].dev;
		zoom_vmmc2_supply.dev = mmc[1].dev;

		return 0;
		ret = gpio_request(LCD_PANEL_ENABLE_GPIO, "lcd enable");
		if (ret) {
		pr_err("Failed to get LCD_PANEL_ENABLE_GPIO (gpio%d).\n",
		LCD_PANEL_ENABLE_GPIO);
		return ret;
		}
		gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 0);

		return ret;
		}

		/* EXTMUTE callback function */
		@@ -301,7 +345,8 @@ static struct twl4030_platform_data zoom_twldata = {
		.vmmc1 = &zoom_vmmc1,
		.vmmc2 = &zoom_vmmc2,
		.vsim = &zoom_vsim,

		.vpll2 = &zoom_vpll2,
		.vdac = &zoom_vdac,
		};

		static struct i2c_board_info __initdata zoom_i2c_boardinfo[] = {

arch/arm/mach-omap2/include/mach/board-zoom.h

+3 −0

Original line number	Diff line number	Diff line
		/*
		* Defines for zoom boards
		*/
		#include <plat/display.h>

		#define ZOOM_NAND_CS 0

		extern int __init zoom_debugboard_init(void);
		extern void __init zoom_peripherals_init(void);
		extern void __init zoom_display_init(void);

		#define ZOOM2_HEADSET_EXTMUTE_GPIO 153

Admin message