Merge branch 'omap/fixes' into fixes
This commit is contained in:
commit
519dc3cdfd
|
@ -193,7 +193,8 @@ static int __init omap2430_i2c_init(void)
|
||||||
{
|
{
|
||||||
omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo,
|
omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo,
|
||||||
ARRAY_SIZE(sdp2430_i2c1_boardinfo));
|
ARRAY_SIZE(sdp2430_i2c1_boardinfo));
|
||||||
omap2_pmic_init("twl4030", &sdp2430_twldata);
|
omap_pmic_init(2, 100, "twl4030", INT_24XX_SYS_NIRQ,
|
||||||
|
&sdp2430_twldata);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,7 @@ static const int sdp4430_keymap[] = {
|
||||||
KEY(7, 6, KEY_OK),
|
KEY(7, 6, KEY_OK),
|
||||||
KEY(7, 7, KEY_DOWN),
|
KEY(7, 7, KEY_DOWN),
|
||||||
};
|
};
|
||||||
static struct omap_device_pad keypad_pads[] __initdata = {
|
static struct omap_device_pad keypad_pads[] = {
|
||||||
{ .name = "kpd_col1.kpd_col1",
|
{ .name = "kpd_col1.kpd_col1",
|
||||||
.enable = OMAP_WAKEUP_EN | OMAP_MUX_MODE1,
|
.enable = OMAP_WAKEUP_EN | OMAP_MUX_MODE1,
|
||||||
},
|
},
|
||||||
|
|
|
@ -137,8 +137,7 @@ static void omap4_hsmmc1_before_set_reg(struct device *dev, int slot,
|
||||||
*/
|
*/
|
||||||
reg = omap4_ctrl_pad_readl(control_pbias_offset);
|
reg = omap4_ctrl_pad_readl(control_pbias_offset);
|
||||||
reg &= ~(OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
|
reg &= ~(OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
|
||||||
OMAP4_MMC1_PWRDNZ_MASK |
|
OMAP4_MMC1_PWRDNZ_MASK);
|
||||||
OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
|
|
||||||
omap4_ctrl_pad_writel(reg, control_pbias_offset);
|
omap4_ctrl_pad_writel(reg, control_pbias_offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -156,8 +155,7 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,
|
||||||
else
|
else
|
||||||
reg |= OMAP4_MMC1_PBIASLITE_VMODE_MASK;
|
reg |= OMAP4_MMC1_PBIASLITE_VMODE_MASK;
|
||||||
reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
|
reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
|
||||||
OMAP4_MMC1_PWRDNZ_MASK |
|
OMAP4_MMC1_PWRDNZ_MASK);
|
||||||
OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
|
|
||||||
omap4_ctrl_pad_writel(reg, control_pbias_offset);
|
omap4_ctrl_pad_writel(reg, control_pbias_offset);
|
||||||
|
|
||||||
timeout = jiffies + msecs_to_jiffies(5);
|
timeout = jiffies + msecs_to_jiffies(5);
|
||||||
|
@ -171,16 +169,14 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,
|
||||||
if (reg & OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK) {
|
if (reg & OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK) {
|
||||||
pr_err("Pbias Voltage is not same as LDO\n");
|
pr_err("Pbias Voltage is not same as LDO\n");
|
||||||
/* Caution : On VMODE_ERROR Power Down MMC IO */
|
/* Caution : On VMODE_ERROR Power Down MMC IO */
|
||||||
reg &= ~(OMAP4_MMC1_PWRDNZ_MASK |
|
reg &= ~(OMAP4_MMC1_PWRDNZ_MASK);
|
||||||
OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
|
|
||||||
omap4_ctrl_pad_writel(reg, control_pbias_offset);
|
omap4_ctrl_pad_writel(reg, control_pbias_offset);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
reg = omap4_ctrl_pad_readl(control_pbias_offset);
|
reg = omap4_ctrl_pad_readl(control_pbias_offset);
|
||||||
reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
|
reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
|
||||||
OMAP4_MMC1_PWRDNZ_MASK |
|
OMAP4_MMC1_PWRDNZ_MASK |
|
||||||
OMAP4_MMC1_PBIASLITE_VMODE_MASK |
|
OMAP4_MMC1_PBIASLITE_VMODE_MASK);
|
||||||
OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
|
|
||||||
omap4_ctrl_pad_writel(reg, control_pbias_offset);
|
omap4_ctrl_pad_writel(reg, control_pbias_offset);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -165,8 +165,8 @@ static void __init omap_init_irq(u32 base, int nr_irqs)
|
||||||
|
|
||||||
omap_irq_bank_init_one(bank);
|
omap_irq_bank_init_one(bank);
|
||||||
|
|
||||||
for (i = 0, j = 0; i < bank->nr_irqs; i += 32, j += 0x20)
|
for (j = 0; j < bank->nr_irqs; j += 32)
|
||||||
omap_alloc_gc(bank->base_reg + j, i, 32);
|
omap_alloc_gc(bank->base_reg + j, j, 32);
|
||||||
|
|
||||||
nr_of_irqs += bank->nr_irqs;
|
nr_of_irqs += bank->nr_irqs;
|
||||||
nr_banks++;
|
nr_banks++;
|
||||||
|
|
|
@ -137,9 +137,6 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)
|
||||||
musb_plat.mode = board_data->mode;
|
musb_plat.mode = board_data->mode;
|
||||||
musb_plat.extvbus = board_data->extvbus;
|
musb_plat.extvbus = board_data->extvbus;
|
||||||
|
|
||||||
if (cpu_is_omap44xx())
|
|
||||||
omap4430_phy_init(dev);
|
|
||||||
|
|
||||||
if (cpu_is_omap3517() || cpu_is_omap3505()) {
|
if (cpu_is_omap3517() || cpu_is_omap3505()) {
|
||||||
oh_name = "am35x_otg_hs";
|
oh_name = "am35x_otg_hs";
|
||||||
name = "musb-am35x";
|
name = "musb-am35x";
|
||||||
|
|
Loading…
Reference in a new issue