Commit bbf5e9743fd6c9b4ef8a34db8a9502baf4191524
Exists in
master
and in
4 other branches
Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc
* 'fixes' of git://git.linaro.org/people/arnd/arm-soc: ARM: mach-ux500: enable fix for ARM errata 754322 ARM: OMAP: musb: Remove a redundant omap4430_phy_init call in usb_musb_init ARM: OMAP: Fix i2c init for twl4030 ARM: OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1
Showing 4 changed files Side-by-side Diff
arch/arm/mach-omap2/board-2430sdp.c
| ... | ... | @@ -193,7 +193,8 @@ |
| 193 | 193 | { |
| 194 | 194 | omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo, |
| 195 | 195 | ARRAY_SIZE(sdp2430_i2c1_boardinfo)); |
| 196 | - omap2_pmic_init("twl4030", &sdp2430_twldata); | |
| 196 | + omap_pmic_init(2, 100, "twl4030", INT_24XX_SYS_NIRQ, | |
| 197 | + &sdp2430_twldata); | |
| 197 | 198 | return 0; |
| 198 | 199 | } |
| 199 | 200 |
arch/arm/mach-omap2/hsmmc.c
| ... | ... | @@ -137,8 +137,7 @@ |
| 137 | 137 | */ |
| 138 | 138 | reg = omap4_ctrl_pad_readl(control_pbias_offset); |
| 139 | 139 | reg &= ~(OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK | |
| 140 | - OMAP4_MMC1_PWRDNZ_MASK | | |
| 141 | - OMAP4_USBC1_ICUSB_PWRDNZ_MASK); | |
| 140 | + OMAP4_MMC1_PWRDNZ_MASK); | |
| 142 | 141 | omap4_ctrl_pad_writel(reg, control_pbias_offset); |
| 143 | 142 | } |
| 144 | 143 | |
| ... | ... | @@ -156,8 +155,7 @@ |
| 156 | 155 | else |
| 157 | 156 | reg |= OMAP4_MMC1_PBIASLITE_VMODE_MASK; |
| 158 | 157 | reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK | |
| 159 | - OMAP4_MMC1_PWRDNZ_MASK | | |
| 160 | - OMAP4_USBC1_ICUSB_PWRDNZ_MASK); | |
| 158 | + OMAP4_MMC1_PWRDNZ_MASK); | |
| 161 | 159 | omap4_ctrl_pad_writel(reg, control_pbias_offset); |
| 162 | 160 | |
| 163 | 161 | timeout = jiffies + msecs_to_jiffies(5); |
| 164 | 162 | |
| ... | ... | @@ -171,16 +169,14 @@ |
| 171 | 169 | if (reg & OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK) { |
| 172 | 170 | pr_err("Pbias Voltage is not same as LDO\n"); |
| 173 | 171 | /* Caution : On VMODE_ERROR Power Down MMC IO */ |
| 174 | - reg &= ~(OMAP4_MMC1_PWRDNZ_MASK | | |
| 175 | - OMAP4_USBC1_ICUSB_PWRDNZ_MASK); | |
| 172 | + reg &= ~(OMAP4_MMC1_PWRDNZ_MASK); | |
| 176 | 173 | omap4_ctrl_pad_writel(reg, control_pbias_offset); |
| 177 | 174 | } |
| 178 | 175 | } else { |
| 179 | 176 | reg = omap4_ctrl_pad_readl(control_pbias_offset); |
| 180 | 177 | reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK | |
| 181 | 178 | OMAP4_MMC1_PWRDNZ_MASK | |
| 182 | - OMAP4_MMC1_PBIASLITE_VMODE_MASK | | |
| 183 | - OMAP4_USBC1_ICUSB_PWRDNZ_MASK); | |
| 179 | + OMAP4_MMC1_PBIASLITE_VMODE_MASK); | |
| 184 | 180 | omap4_ctrl_pad_writel(reg, control_pbias_offset); |
| 185 | 181 | } |
| 186 | 182 | } |
arch/arm/mach-omap2/usb-musb.c
| ... | ... | @@ -137,9 +137,6 @@ |
| 137 | 137 | musb_plat.mode = board_data->mode; |
| 138 | 138 | musb_plat.extvbus = board_data->extvbus; |
| 139 | 139 | |
| 140 | - if (cpu_is_omap44xx()) | |
| 141 | - omap4430_phy_init(dev); | |
| 142 | - | |
| 143 | 140 | if (cpu_is_omap3517() || cpu_is_omap3505()) { |
| 144 | 141 | oh_name = "am35x_otg_hs"; |
| 145 | 142 | name = "musb-am35x"; |