On 04/17/2012 10:57 PM, Dan Carpenter wrote: > On Tue, Apr 17, 2012 at 07:08:20PM +0200, Roland Stigge wrote: >> @@ -435,6 +436,7 @@ static int __devinit usb_hcd_nxp_probe(s >> } >> >> __raw_writel(__raw_readl(USB_CTRL) | USB_HOST_NEED_CLK_EN, USB_CTRL); >> + __raw_writel(__raw_readl(USB_CTRL) & ~USB_DEV_NEED_CLK_EN, USB_CTRL); >> >> /* Set to enable all needed USB clocks */ >> __raw_writel(USB_CLOCK_MASK, USB_OTG_CLK_CTRL); > > What does this chunk do? Is this part of the "* Fixed controller > initialization (bits)" bullet point? How does it affect the user? > Should it be included in the 3.4 kernel? Thanks for the hint! I will drop this hunk. Originally, it made sure that USB_DEV_NEED_CLK_EN is disabled but due to another change: usb_hcd_nxp_probe() { ... __raw_writel(USB_SLAVE_HCLK_EN | PAD_CONTROL_LAST_DRIVEN, USB_CTRL); this bit is already cleared anyway. (Would have been uncritical for v3.4 anyway, relating only to the other changes introduced in my 3.5 patches.) Roland -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html