tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds bbf5e974 3faf12cd

+7 -12
+2 -1
arch/arm/mach-omap2/board-2430sdp.c
··· 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
+4 -8
arch/arm/mach-omap2/hsmmc.c
··· 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 ··· 155 156 else 156 157 reg |= OMAP4_MMC1_PBIASLITE_VMODE_MASK; 157 158 reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK | 158 - OMAP4_MMC1_PWRDNZ_MASK | 159 - OMAP4_USBC1_ICUSB_PWRDNZ_MASK); 159 + OMAP4_MMC1_PWRDNZ_MASK); 160 160 omap4_ctrl_pad_writel(reg, control_pbias_offset); 161 161 162 162 timeout = jiffies + msecs_to_jiffies(5); ··· 169 171 if (reg & OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK) { 170 172 pr_err("Pbias Voltage is not same as LDO\n"); 171 173 /* Caution : On VMODE_ERROR Power Down MMC IO */ 172 - reg &= ~(OMAP4_MMC1_PWRDNZ_MASK | 173 - OMAP4_USBC1_ICUSB_PWRDNZ_MASK); 174 + reg &= ~(OMAP4_MMC1_PWRDNZ_MASK); 174 175 omap4_ctrl_pad_writel(reg, control_pbias_offset); 175 176 } 176 177 } else { 177 178 reg = omap4_ctrl_pad_readl(control_pbias_offset); 178 179 reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK | 179 180 OMAP4_MMC1_PWRDNZ_MASK | 180 - OMAP4_MMC1_PBIASLITE_VMODE_MASK | 181 - OMAP4_USBC1_ICUSB_PWRDNZ_MASK); 181 + OMAP4_MMC1_PBIASLITE_VMODE_MASK); 182 182 omap4_ctrl_pad_writel(reg, control_pbias_offset); 183 183 } 184 184 }
-3
arch/arm/mach-omap2/usb-musb.c
··· 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";
+1
arch/arm/mach-ux500/Kconfig
··· 6 6 select ARM_GIC 7 7 select HAS_MTU 8 8 select ARM_ERRATA_753970 9 + select ARM_ERRATA_754322 9 10 10 11 menu "Ux500 SoC" 11 12