mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 21:21:47 +00:00
20a2078ce7
Pull drm updates from Dave Airlie: "This is the main drm pull request for 3.10. Wierd bits: - OMAP drm changes required OMAP dss changes, in drivers/video, so I took them in here. - one more fbcon fix for font handover - VT switch avoidance in pm code - scatterlist helpers for gpu drivers - have acks from akpm Highlights: - qxl kms driver - driver for the spice qxl virtual GPU Nouveau: - fermi/kepler VRAM compression - GK110/nvf0 modesetting support. Tegra: - host1x core merged with 2D engine support i915: - vt switchless resume - more valleyview support - vblank fixes - modesetting pipe config rework radeon: - UVD engine support - SI chip tiling support - GPU registers initialisation from golden values. exynos: - device tree changes - fimc block support Otherwise: - bunches of fixes all over the place." * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (513 commits) qxl: update to new idr interfaces. drm/nouveau: fix build with nv50->nvc0 drm/radeon: fix handling of v6 power tables drm/radeon: clarify family checks in pm table parsing drm/radeon: consolidate UVD clock programming drm/radeon: fix UPLL_REF_DIV_MASK definition radeon: add bo tracking debugfs drm/radeon: add new richland pci ids drm/radeon: add some new SI PCI ids drm/radeon: fix scratch reg handling for UVD fence drm/radeon: allocate SA bo in the requested domain drm/radeon: fix possible segfault when parsing pm tables drm/radeon: fix endian bugs in atom_allocate_fb_scratch() OMAPDSS: TFP410: return EPROBE_DEFER if the i2c adapter not found OMAPDSS: VENC: Add error handling for venc_probe_pdata OMAPDSS: HDMI: Add error handling for hdmi_probe_pdata OMAPDSS: RFBI: Add error handling for rfbi_probe_pdata OMAPDSS: DSI: Add error handling for dsi_probe_pdata OMAPDSS: SDI: Add error handling for sdi_probe_pdata OMAPDSS: DPI: Add error handling for dpi_probe_pdata ...
261 lines
6.1 KiB
C
261 lines
6.1 KiB
C
/*
|
|
* linux/arch/arm/mach-omap2/board-2430sdp.c
|
|
*
|
|
* Copyright (C) 2006 Texas Instruments
|
|
*
|
|
* Modified from mach-omap2/board-generic.c
|
|
*
|
|
* Initial Code : Based on a patch from Komal Shah and Richard Woodruff
|
|
* Updated the Code for 2430 SDP : Syed Mohammed Khasim
|
|
*
|
|
* 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/mtd/mtd.h>
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/mtd/physmap.h>
|
|
#include <linux/mmc/host.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/i2c/twl.h>
|
|
#include <linux/regulator/machine.h>
|
|
#include <linux/err.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/io.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/usb/phy.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include "common.h"
|
|
#include "gpmc.h"
|
|
#include "gpmc-smc91x.h"
|
|
|
|
#include <video/omapdss.h>
|
|
#include <video/omap-panel-data.h>
|
|
|
|
#include "mux.h"
|
|
#include "hsmmc.h"
|
|
#include "common-board-devices.h"
|
|
|
|
#define SDP2430_CS0_BASE 0x04000000
|
|
#define SECONDARY_LCD_GPIO 147
|
|
|
|
static struct mtd_partition sdp2430_partitions[] = {
|
|
/* bootloader (U-Boot, etc) in first sector */
|
|
{
|
|
.name = "bootloader",
|
|
.offset = 0,
|
|
.size = SZ_256K,
|
|
.mask_flags = MTD_WRITEABLE, /* force read-only */
|
|
},
|
|
/* bootloader params in the next sector */
|
|
{
|
|
.name = "params",
|
|
.offset = MTDPART_OFS_APPEND,
|
|
.size = SZ_128K,
|
|
.mask_flags = 0,
|
|
},
|
|
/* kernel */
|
|
{
|
|
.name = "kernel",
|
|
.offset = MTDPART_OFS_APPEND,
|
|
.size = SZ_2M,
|
|
.mask_flags = 0
|
|
},
|
|
/* file system */
|
|
{
|
|
.name = "filesystem",
|
|
.offset = MTDPART_OFS_APPEND,
|
|
.size = MTDPART_SIZ_FULL,
|
|
.mask_flags = 0
|
|
}
|
|
};
|
|
|
|
static struct physmap_flash_data sdp2430_flash_data = {
|
|
.width = 2,
|
|
.parts = sdp2430_partitions,
|
|
.nr_parts = ARRAY_SIZE(sdp2430_partitions),
|
|
};
|
|
|
|
static struct resource sdp2430_flash_resource = {
|
|
.start = SDP2430_CS0_BASE,
|
|
.end = SDP2430_CS0_BASE + SZ_64M - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
};
|
|
|
|
static struct platform_device sdp2430_flash_device = {
|
|
.name = "physmap-flash",
|
|
.id = 0,
|
|
.dev = {
|
|
.platform_data = &sdp2430_flash_data,
|
|
},
|
|
.num_resources = 1,
|
|
.resource = &sdp2430_flash_resource,
|
|
};
|
|
|
|
static struct platform_device *sdp2430_devices[] __initdata = {
|
|
&sdp2430_flash_device,
|
|
};
|
|
|
|
/* LCD */
|
|
#define SDP2430_LCD_PANEL_BACKLIGHT_GPIO 91
|
|
#define SDP2430_LCD_PANEL_ENABLE_GPIO 154
|
|
|
|
static struct panel_generic_dpi_data sdp2430_panel_data = {
|
|
.name = "nec_nl2432dr22-11b",
|
|
.num_gpios = 2,
|
|
.gpios = {
|
|
SDP2430_LCD_PANEL_ENABLE_GPIO,
|
|
SDP2430_LCD_PANEL_BACKLIGHT_GPIO,
|
|
},
|
|
};
|
|
|
|
static struct omap_dss_device sdp2430_lcd_device = {
|
|
.name = "lcd",
|
|
.driver_name = "generic_dpi_panel",
|
|
.type = OMAP_DISPLAY_TYPE_DPI,
|
|
.phy.dpi.data_lines = 16,
|
|
.data = &sdp2430_panel_data,
|
|
};
|
|
|
|
static struct omap_dss_device *sdp2430_dss_devices[] = {
|
|
&sdp2430_lcd_device,
|
|
};
|
|
|
|
static struct omap_dss_board_info sdp2430_dss_data = {
|
|
.num_devices = ARRAY_SIZE(sdp2430_dss_devices),
|
|
.devices = sdp2430_dss_devices,
|
|
.default_device = &sdp2430_lcd_device,
|
|
};
|
|
|
|
#if IS_ENABLED(CONFIG_SMC91X)
|
|
|
|
static struct omap_smc91x_platform_data board_smc91x_data = {
|
|
.cs = 5,
|
|
.gpio_irq = 149,
|
|
.flags = GPMC_MUX_ADD_DATA | GPMC_TIMINGS_SMC91C96 |
|
|
IORESOURCE_IRQ_LOWLEVEL,
|
|
|
|
};
|
|
|
|
static void __init board_smc91x_init(void)
|
|
{
|
|
omap_mux_init_gpio(149, OMAP_PIN_INPUT);
|
|
gpmc_smc91x_init(&board_smc91x_data);
|
|
}
|
|
|
|
#else
|
|
|
|
static inline void board_smc91x_init(void)
|
|
{
|
|
}
|
|
|
|
#endif
|
|
|
|
static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = {
|
|
REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
|
|
};
|
|
|
|
/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
|
|
static struct regulator_init_data sdp2430_vmmc1 = {
|
|
.constraints = {
|
|
.min_uV = 1850000,
|
|
.max_uV = 3150000,
|
|
.valid_modes_mask = REGULATOR_MODE_NORMAL
|
|
| REGULATOR_MODE_STANDBY,
|
|
.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
|
|
| REGULATOR_CHANGE_MODE
|
|
| REGULATOR_CHANGE_STATUS,
|
|
},
|
|
.num_consumer_supplies = ARRAY_SIZE(sdp2430_vmmc1_supplies),
|
|
.consumer_supplies = &sdp2430_vmmc1_supplies[0],
|
|
};
|
|
|
|
static struct twl4030_gpio_platform_data sdp2430_gpio_data = {
|
|
};
|
|
|
|
static struct twl4030_platform_data sdp2430_twldata = {
|
|
/* platform_data for children goes here */
|
|
.gpio = &sdp2430_gpio_data,
|
|
.vmmc1 = &sdp2430_vmmc1,
|
|
};
|
|
|
|
static struct i2c_board_info __initdata sdp2430_i2c1_boardinfo[] = {
|
|
{
|
|
I2C_BOARD_INFO("isp1301_omap", 0x2D),
|
|
.flags = I2C_CLIENT_WAKE,
|
|
},
|
|
};
|
|
|
|
static int __init omap2430_i2c_init(void)
|
|
{
|
|
sdp2430_i2c1_boardinfo[0].irq = gpio_to_irq(78);
|
|
omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo,
|
|
ARRAY_SIZE(sdp2430_i2c1_boardinfo));
|
|
omap_pmic_init(2, 100, "twl4030", 7 + OMAP_INTC_START,
|
|
&sdp2430_twldata);
|
|
return 0;
|
|
}
|
|
|
|
static struct omap2_hsmmc_info mmc[] __initdata = {
|
|
{
|
|
.mmc = 1,
|
|
.caps = MMC_CAP_4_BIT_DATA,
|
|
.gpio_cd = -EINVAL,
|
|
.gpio_wp = -EINVAL,
|
|
.ext_clock = 1,
|
|
},
|
|
{} /* Terminator */
|
|
};
|
|
|
|
#ifdef CONFIG_OMAP_MUX
|
|
static struct omap_board_mux board_mux[] __initdata = {
|
|
{ .reg_offset = OMAP_MUX_TERMINATOR },
|
|
};
|
|
#endif
|
|
|
|
static void __init omap_2430sdp_init(void)
|
|
{
|
|
omap2430_mux_init(board_mux, OMAP_PACKAGE_ZAC);
|
|
|
|
omap2430_i2c_init();
|
|
|
|
platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));
|
|
omap_serial_init();
|
|
omap_sdrc_init(NULL, NULL);
|
|
omap_hsmmc_init(mmc);
|
|
|
|
omap_mux_init_signal("usb0hs_stp", OMAP_PULL_ENA | OMAP_PULL_UP);
|
|
usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb");
|
|
usb_musb_init(NULL);
|
|
|
|
board_smc91x_init();
|
|
|
|
/* Turn off secondary LCD backlight */
|
|
gpio_request_one(SECONDARY_LCD_GPIO, GPIOF_OUT_INIT_LOW,
|
|
"Secondary LCD backlight");
|
|
|
|
omap_display_init(&sdp2430_dss_data);
|
|
}
|
|
|
|
MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board")
|
|
/* Maintainer: Syed Khasim - Texas Instruments Inc */
|
|
.atag_offset = 0x100,
|
|
.reserve = omap_reserve,
|
|
.map_io = omap243x_map_io,
|
|
.init_early = omap2430_init_early,
|
|
.init_irq = omap2_init_irq,
|
|
.handle_irq = omap2_intc_handle_irq,
|
|
.init_machine = omap_2430sdp_init,
|
|
.init_late = omap2430_init_late,
|
|
.init_time = omap2_sync32k_timer_init,
|
|
.restart = omap2xxx_restart,
|
|
MACHINE_END
|