History

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 committed 15 years ago

Commit bbf5e972 parents 3faf12c aab3a704 files · +7 −12Browse files

Unified · Split

4 files
  1. arch/arm/mach-omap2/board-2430sdp.c +2 −1
  2. arch/arm/mach-omap2/hsmmc.c +4 −8
  3. arch/arm/mach-omap2/usb-musb.c +0 −3
  4. arch/arm/mach-ux500/Kconfig +1 −0
arch/arm/mach-omap2/board-2430sdp.c+2−1
@@ -193,7 +193,8 @@ static int __init omap2430_i2c_init(void) · 192 unmodified lines
193{193{
194 omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo,194 omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo,
195 ARRAY_SIZE(sdp2430_i2c1_boardinfo));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 return 0;198 return 0;
198}199}
199 200
arch/arm/mach-omap2/hsmmc.c+4−8
@@ -137,8 +137,7 @@ static void omap4_hsmmc1_before_set_reg(struct device *dev, int slot, · 136 unmodified lines
137 */137 */
138 reg = omap4_ctrl_pad_readl(control_pbias_offset);138 reg = omap4_ctrl_pad_readl(control_pbias_offset);
139 reg &= ~(OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |139 reg &= ~(OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
140 OMAP4_MMC1_PWRDNZ_MASK |140 OMAP4_MMC1_PWRDNZ_MASK);
141 OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
142 omap4_ctrl_pad_writel(reg, control_pbias_offset);141 omap4_ctrl_pad_writel(reg, control_pbias_offset);
143}142}
144 143
@@ -156,8 +155,7 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot, · 11 unmodified lines
156 else155 else
157 reg |= OMAP4_MMC1_PBIASLITE_VMODE_MASK;156 reg |= OMAP4_MMC1_PBIASLITE_VMODE_MASK;
158 reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |157 reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
159 OMAP4_MMC1_PWRDNZ_MASK |158 OMAP4_MMC1_PWRDNZ_MASK);
160 OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
161 omap4_ctrl_pad_writel(reg, control_pbias_offset);159 omap4_ctrl_pad_writel(reg, control_pbias_offset);
162 160
163 timeout = jiffies + msecs_to_jiffies(5);161 timeout = jiffies + msecs_to_jiffies(5);
@@ -171,16 +169,14 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot, · 7 unmodified lines
171 if (reg & OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK) {169 if (reg & OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK) {
172 pr_err("Pbias Voltage is not same as LDO\n");170 pr_err("Pbias Voltage is not same as LDO\n");
173 /* Caution : On VMODE_ERROR Power Down MMC IO */171 /* Caution : On VMODE_ERROR Power Down MMC IO */
174 reg &= ~(OMAP4_MMC1_PWRDNZ_MASK |172 reg &= ~(OMAP4_MMC1_PWRDNZ_MASK);
175 OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
176 omap4_ctrl_pad_writel(reg, control_pbias_offset);173 omap4_ctrl_pad_writel(reg, control_pbias_offset);
177 }174 }
178 } else {175 } else {
179 reg = omap4_ctrl_pad_readl(control_pbias_offset);176 reg = omap4_ctrl_pad_readl(control_pbias_offset);
180 reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |177 reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
181 OMAP4_MMC1_PWRDNZ_MASK |178 OMAP4_MMC1_PWRDNZ_MASK |
182 OMAP4_MMC1_PBIASLITE_VMODE_MASK |179 OMAP4_MMC1_PBIASLITE_VMODE_MASK);
183 OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
184 omap4_ctrl_pad_writel(reg, control_pbias_offset);180 omap4_ctrl_pad_writel(reg, control_pbias_offset);
185 }181 }
186}182}
arch/arm/mach-omap2/usb-musb.c+0−3
@@ -137,9 +137,6 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data) · 136 unmodified lines
137 musb_plat.mode = board_data->mode;137 musb_plat.mode = board_data->mode;
138 musb_plat.extvbus = board_data->extvbus;138 musb_plat.extvbus = board_data->extvbus;
139 139
140 if (cpu_is_omap44xx())
141 omap4430_phy_init(dev);
142
143 if (cpu_is_omap3517() || cpu_is_omap3505()) {140 if (cpu_is_omap3517() || cpu_is_omap3505()) {
144 oh_name = "am35x_otg_hs";141 oh_name = "am35x_otg_hs";
145 name = "musb-am35x";142 name = "musb-am35x";
arch/arm/mach-ux500/Kconfig+1−0
@@ -6,6 +6,7 @@ config UX500_SOC_COMMON · 5 unmodified lines
6 select ARM_GIC6 select ARM_GIC
7 select HAS_MTU7 select HAS_MTU
8 select ARM_ERRATA_7539708 select ARM_ERRATA_753970
9 select ARM_ERRATA_754322
9 10
10menu "Ux500 SoC"11menu "Ux500 SoC"
11 12

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t