imx-features-board-20120411
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCAAGBQJPi887AAoJEPFlmONMx+ezT3kQAK7CNsXsfKfXGce8jpFHcIkp UB20Xp4TUdBYIR4+z8UyizLcXxVSefIXdAqthHf7NNKEmN1AI8sbil0EO+/dnDae Psskexl43Fy6d3KUYdCpzeXwTZ9TXOWQpNZOtRzsLL1sjWcyqZCTEI6+NA7ZaDw7 YBfP8ZKcVfDSI1/2j8rRQULf6KSki9xC5aSfWoWwUGLxRIxuGjTpHnMAQH5iGq2T fAGQCrWchcdPWNWlTNmSqXF5wCF7dGTZBhdyfkvrjaU5Zbg1GVpcUv9FgpMXye6R 2N0h7QLFxnKTyIPbWxSbvaOOZr6HvoObPvK12trApA5IWjJXtOKXhYF7hcZzWAcK p8xAgObP8aZ2GBOEj+UqIuvniRASCi7TSgl6pJukf7eVR5KVGlrODlxMTXGeupQl rVXln1FR10LCjvedC/3ocL6xAr39KsxTKuCXuHgwo26ZInseeE6/LoMlaLIhhNM6 NqwqTlcwKPtxqumAOqGE1X8OFMjrns/nEQ2FIoMXKmMYyXGjNiVfeRCJNxCoNHaj rNHY0wVSHbDSeIcOjt0wZ4cCe6DXA2JIfhyczW+rN6rdvxrCwp5lWqZWMekZfhZi jkSfE2qqhQd9wG/Lq65CPYVT0EvNLdxU8OVOp/uL++xYtC65jtVdP2ZLQfcLIbIT V4pn5L4f2iNECo0RBQ47 =CXzC -----END PGP SIGNATURE----- Merge tag 'imx-features-board-20120411-2' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards * tag 'imx-features-board-20120411-2' of git://git.pengutronix.de/git/imx/linux-2.6: ARM i.MX: Visstrim_M10: Add board version detection. ARM: imx_v4_v5_defconfig: enable adc and touch driver of mc13783 ARM: i.MX: i.MX35-PDK: Add regulator support
This commit is contained in:
Olof Johansson
commit
fd273d4415
|
|
@ -92,6 +92,7 @@ CONFIG_INPUT_EVDEV=y
|
|||
# CONFIG_INPUT_MOUSE is not set
|
||||
CONFIG_INPUT_TOUCHSCREEN=y
|
||||
CONFIG_TOUCHSCREEN_ADS7846=m
|
||||
CONFIG_TOUCHSCREEN_MC13783=m
|
||||
# CONFIG_SERIO is not set
|
||||
# CONFIG_LEGACY_PTYS is not set
|
||||
CONFIG_SERIAL_8250=m
|
||||
|
|
@ -107,7 +108,8 @@ CONFIG_SPI_SPIDEV=y
|
|||
CONFIG_W1=y
|
||||
CONFIG_W1_MASTER_MXC=y
|
||||
CONFIG_W1_SLAVE_THERM=y
|
||||
# CONFIG_HWMON is not set
|
||||
CONFIG_HWMON=m
|
||||
CONFIG_SENSORS_MC13783_ADC=m
|
||||
CONFIG_WATCHDOG=y
|
||||
CONFIG_IMX2_WDT=y
|
||||
CONFIG_MFD_MC13XXX=y
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/mach/time.h>
|
||||
#include <asm/system.h>
|
||||
#include <mach/common.h>
|
||||
#include <mach/iomux-mx27.h>
|
||||
|
||||
|
|
@ -48,6 +49,14 @@
|
|||
#define OTG_PHY_CS_GPIO (GPIO_PORTF + 17)
|
||||
#define SDHC1_IRQ IRQ_GPIOB(25)
|
||||
|
||||
#define MOTHERBOARD_BIT2 (GPIO_PORTD + 31)
|
||||
#define MOTHERBOARD_BIT1 (GPIO_PORTD + 30)
|
||||
#define MOTHERBOARD_BIT0 (GPIO_PORTD + 29)
|
||||
|
||||
#define EXPBOARD_BIT2 (GPIO_PORTD + 25)
|
||||
#define EXPBOARD_BIT1 (GPIO_PORTD + 27)
|
||||
#define EXPBOARD_BIT0 (GPIO_PORTD + 28)
|
||||
|
||||
static const int visstrim_m10_pins[] __initconst = {
|
||||
/* UART1 (console) */
|
||||
PE12_PF_UART1_TXD,
|
||||
|
|
@ -119,6 +128,23 @@ static const int visstrim_m10_pins[] __initconst = {
|
|||
PB19_PF_CSI_D7,
|
||||
PB20_PF_CSI_VSYNC,
|
||||
PB21_PF_CSI_HSYNC,
|
||||
/* mother board version */
|
||||
MOTHERBOARD_BIT2 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
|
||||
MOTHERBOARD_BIT1 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
|
||||
MOTHERBOARD_BIT0 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
|
||||
/* expansion board version */
|
||||
EXPBOARD_BIT2 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
|
||||
EXPBOARD_BIT1 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
|
||||
EXPBOARD_BIT0 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
|
||||
};
|
||||
|
||||
static struct gpio visstrim_m10_version_gpios[] = {
|
||||
{ EXPBOARD_BIT0, GPIOF_IN, "exp-version-0" },
|
||||
{ EXPBOARD_BIT1, GPIOF_IN, "exp-version-1" },
|
||||
{ EXPBOARD_BIT2, GPIOF_IN, "exp-version-2" },
|
||||
{ MOTHERBOARD_BIT0, GPIOF_IN, "mother-version-0" },
|
||||
{ MOTHERBOARD_BIT1, GPIOF_IN, "mother-version-1" },
|
||||
{ MOTHERBOARD_BIT2, GPIOF_IN, "mother-version-2" },
|
||||
};
|
||||
|
||||
/* Camera */
|
||||
|
|
@ -369,11 +395,40 @@ static const struct imx_ssi_platform_data visstrim_m10_ssi_pdata __initconst = {
|
|||
.flags = IMX_SSI_DMA | IMX_SSI_SYN,
|
||||
};
|
||||
|
||||
static void __init visstrim_m10_revision(void)
|
||||
{
|
||||
int exp_version = 0;
|
||||
int mo_version = 0;
|
||||
int ret;
|
||||
|
||||
ret = gpio_request_array(visstrim_m10_version_gpios,
|
||||
ARRAY_SIZE(visstrim_m10_version_gpios));
|
||||
if (ret) {
|
||||
pr_err("Failed to request version gpios");
|
||||
return;
|
||||
}
|
||||
|
||||
/* Get expansion board version (negative logic) */
|
||||
exp_version |= !gpio_get_value(EXPBOARD_BIT2) << 2;
|
||||
exp_version |= !gpio_get_value(EXPBOARD_BIT1) << 1;
|
||||
exp_version |= !gpio_get_value(EXPBOARD_BIT0);
|
||||
|
||||
/* Get mother board version (negative logic) */
|
||||
mo_version |= !gpio_get_value(MOTHERBOARD_BIT2) << 2;
|
||||
mo_version |= !gpio_get_value(MOTHERBOARD_BIT1) << 1;
|
||||
mo_version |= !gpio_get_value(MOTHERBOARD_BIT0);
|
||||
|
||||
system_rev = 0x27000;
|
||||
system_rev |= (mo_version << 4);
|
||||
system_rev |= exp_version;
|
||||
}
|
||||
|
||||
static void __init visstrim_m10_board_init(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
imx27_soc_init();
|
||||
visstrim_m10_revision();
|
||||
|
||||
ret = mxc_gpio_setup_multiple_pins(visstrim_m10_pins,
|
||||
ARRAY_SIZE(visstrim_m10_pins), "VISSTRIM_M10");
|
||||
|
|
|
|||
|
|
@ -34,6 +34,8 @@
|
|||
#include <linux/usb/otg.h>
|
||||
|
||||
#include <linux/mtd/physmap.h>
|
||||
#include <linux/mfd/mc13892.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
|
|
@ -253,6 +255,8 @@ static iomux_v3_cfg_t mx35pdk_pads[] = {
|
|||
MX35_PAD_CSI_MCLK__IPU_CSI_MCLK,
|
||||
MX35_PAD_CSI_PIXCLK__IPU_CSI_PIXCLK,
|
||||
MX35_PAD_CSI_VSYNC__IPU_CSI_VSYNC,
|
||||
/*PMIC IRQ*/
|
||||
MX35_PAD_GPIO2_0__GPIO2_0,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -317,6 +321,193 @@ static struct platform_device mx35_3ds_ov2640 = {
|
|||
},
|
||||
};
|
||||
|
||||
static struct regulator_consumer_supply sw1_consumers[] = {
|
||||
{
|
||||
.supply = "cpu_vcc",
|
||||
}
|
||||
};
|
||||
|
||||
static struct regulator_consumer_supply vcam_consumers[] = {
|
||||
/* sgtl5000 */
|
||||
REGULATOR_SUPPLY("VDDA", "0-000a"),
|
||||
};
|
||||
|
||||
static struct regulator_consumer_supply vaudio_consumers[] = {
|
||||
REGULATOR_SUPPLY("cmos_vio", "soc-camera-pdrv.0"),
|
||||
};
|
||||
|
||||
static struct regulator_init_data sw1_init = {
|
||||
.constraints = {
|
||||
.name = "SW1",
|
||||
.min_uV = 600000,
|
||||
.max_uV = 1375000,
|
||||
.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
|
||||
.valid_modes_mask = 0,
|
||||
.always_on = 1,
|
||||
.boot_on = 1,
|
||||
},
|
||||
.num_consumer_supplies = ARRAY_SIZE(sw1_consumers),
|
||||
.consumer_supplies = sw1_consumers,
|
||||
};
|
||||
|
||||
static struct regulator_init_data sw2_init = {
|
||||
.constraints = {
|
||||
.name = "SW2",
|
||||
.always_on = 1,
|
||||
.boot_on = 1,
|
||||
}
|
||||
};
|
||||
|
||||
static struct regulator_init_data sw3_init = {
|
||||
.constraints = {
|
||||
.name = "SW3",
|
||||
.always_on = 1,
|
||||
.boot_on = 1,
|
||||
}
|
||||
};
|
||||
|
||||
static struct regulator_init_data sw4_init = {
|
||||
.constraints = {
|
||||
.name = "SW4",
|
||||
.always_on = 1,
|
||||
.boot_on = 1,
|
||||
}
|
||||
};
|
||||
|
||||
static struct regulator_init_data viohi_init = {
|
||||
.constraints = {
|
||||
.name = "VIOHI",
|
||||
.boot_on = 1,
|
||||
}
|
||||
};
|
||||
|
||||
static struct regulator_init_data vusb_init = {
|
||||
.constraints = {
|
||||
.name = "VUSB",
|
||||
.boot_on = 1,
|
||||
}
|
||||
};
|
||||
|
||||
static struct regulator_init_data vdig_init = {
|
||||
.constraints = {
|
||||
.name = "VDIG",
|
||||
.boot_on = 1,
|
||||
}
|
||||
};
|
||||
|
||||
static struct regulator_init_data vpll_init = {
|
||||
.constraints = {
|
||||
.name = "VPLL",
|
||||
.boot_on = 1,
|
||||
}
|
||||
};
|
||||
|
||||
static struct regulator_init_data vusb2_init = {
|
||||
.constraints = {
|
||||
.name = "VUSB2",
|
||||
.boot_on = 1,
|
||||
}
|
||||
};
|
||||
|
||||
static struct regulator_init_data vvideo_init = {
|
||||
.constraints = {
|
||||
.name = "VVIDEO",
|
||||
.boot_on = 1
|
||||
}
|
||||
};
|
||||
|
||||
static struct regulator_init_data vaudio_init = {
|
||||
.constraints = {
|
||||
.name = "VAUDIO",
|
||||
.min_uV = 2300000,
|
||||
.max_uV = 3000000,
|
||||
.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
|
||||
.boot_on = 1
|
||||
},
|
||||
.num_consumer_supplies = ARRAY_SIZE(vaudio_consumers),
|
||||
.consumer_supplies = vaudio_consumers,
|
||||
};
|
||||
|
||||
static struct regulator_init_data vcam_init = {
|
||||
.constraints = {
|
||||
.name = "VCAM",
|
||||
.min_uV = 2500000,
|
||||
.max_uV = 3000000,
|
||||
.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
|
||||
REGULATOR_CHANGE_MODE,
|
||||
.valid_modes_mask = REGULATOR_MODE_FAST | REGULATOR_MODE_NORMAL,
|
||||
.boot_on = 1
|
||||
},
|
||||
.num_consumer_supplies = ARRAY_SIZE(vcam_consumers),
|
||||
.consumer_supplies = vcam_consumers,
|
||||
};
|
||||
|
||||
static struct regulator_init_data vgen1_init = {
|
||||
.constraints = {
|
||||
.name = "VGEN1",
|
||||
}
|
||||
};
|
||||
|
||||
static struct regulator_init_data vgen2_init = {
|
||||
.constraints = {
|
||||
.name = "VGEN2",
|
||||
.boot_on = 1,
|
||||
}
|
||||
};
|
||||
|
||||
static struct regulator_init_data vgen3_init = {
|
||||
.constraints = {
|
||||
.name = "VGEN3",
|
||||
}
|
||||
};
|
||||
|
||||
static struct mc13xxx_regulator_init_data mx35_3ds_regulators[] = {
|
||||
{ .id = MC13892_SW1, .init_data = &sw1_init },
|
||||
{ .id = MC13892_SW2, .init_data = &sw2_init },
|
||||
{ .id = MC13892_SW3, .init_data = &sw3_init },
|
||||
{ .id = MC13892_SW4, .init_data = &sw4_init },
|
||||
{ .id = MC13892_VIOHI, .init_data = &viohi_init },
|
||||
{ .id = MC13892_VPLL, .init_data = &vpll_init },
|
||||
{ .id = MC13892_VDIG, .init_data = &vdig_init },
|
||||
{ .id = MC13892_VUSB2, .init_data = &vusb2_init },
|
||||
{ .id = MC13892_VVIDEO, .init_data = &vvideo_init },
|
||||
{ .id = MC13892_VAUDIO, .init_data = &vaudio_init },
|
||||
{ .id = MC13892_VCAM, .init_data = &vcam_init },
|
||||
{ .id = MC13892_VGEN1, .init_data = &vgen1_init },
|
||||
{ .id = MC13892_VGEN2, .init_data = &vgen2_init },
|
||||
{ .id = MC13892_VGEN3, .init_data = &vgen3_init },
|
||||
{ .id = MC13892_VUSB, .init_data = &vusb_init },
|
||||
};
|
||||
|
||||
static struct mc13xxx_platform_data mx35_3ds_mc13892_data = {
|
||||
.flags = MC13XXX_USE_RTC | MC13XXX_USE_TOUCHSCREEN,
|
||||
.regulators = {
|
||||
.num_regulators = ARRAY_SIZE(mx35_3ds_regulators),
|
||||
.regulators = mx35_3ds_regulators,
|
||||
},
|
||||
};
|
||||
|
||||
#define GPIO_PMIC_INT IMX_GPIO_NR(2, 0)
|
||||
|
||||
static struct i2c_board_info mx35_3ds_i2c_mc13892 = {
|
||||
|
||||
I2C_BOARD_INFO("mc13892", 0x08),
|
||||
.platform_data = &mx35_3ds_mc13892_data,
|
||||
.irq = IMX_GPIO_TO_IRQ(GPIO_PMIC_INT),
|
||||
};
|
||||
|
||||
static void __init imx35_3ds_init_mc13892(void)
|
||||
{
|
||||
int ret = gpio_request_one(GPIO_PMIC_INT, GPIOF_DIR_IN, "pmic irq");
|
||||
|
||||
if (ret) {
|
||||
pr_err("failed to get pmic irq: %d\n", ret);
|
||||
return;
|
||||
}
|
||||
|
||||
i2c_register_board_info(0, &mx35_3ds_i2c_mc13892, 1);
|
||||
}
|
||||
|
||||
static int mx35_3ds_otg_init(struct platform_device *pdev)
|
||||
{
|
||||
return mx35_initialize_usb_hw(pdev->id, MXC_EHCI_INTERNAL_PHY);
|
||||
|
|
@ -412,6 +603,8 @@ static void __init mx35_3ds_init(void)
|
|||
imx35_fb_pdev = imx35_add_mx3_sdc_fb(&mx3fb_pdata);
|
||||
mx35_3ds_lcd.dev.parent = &imx35_fb_pdev->dev;
|
||||
platform_device_register(&mx35_3ds_lcd);
|
||||
|
||||
imx35_3ds_init_mc13892();
|
||||
}
|
||||
|
||||
static void __init mx35pdk_timer_init(void)
|
||||
|
|
|
|||
Loading…
Reference in New Issue