| Message ID | 200907102005.44655.sshtylyov@ru.mvista.com (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
Sergei Shtylyov <sshtylyov@ru.mvista.com> writes: > DM646x has MUSB connected to IRQs 13 and 14 (unlike IRQ12 on other platforms), > so pass the correct IRQ resources with the platform device. > > Signed-off-by: Dmitry Krivoschekov <dkrivoschekov@ru.mvista.com> > Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> > > --- > The patch has been reworked based on Kevin's suggestion. > I've nearly forgotten about it... :-) Looks good, except needs some whitespace cleanup, checkpatch reports: ERROR: code indent should use tabs where possible #72: FILE: arch/arm/mach-davinci/usb.c:94: + ^I^I/* Override the defaults as DM6467 uses different IRQs. */$ ERROR: code indent should use tabs where possible #73: FILE: arch/arm/mach-davinci/usb.c:95: + ^I^Iusb_dev.resource[1].start = IRQ_DM646X_USBINT;$ ERROR: code indent should use tabs where possible #74: FILE: arch/arm/mach-davinci/usb.c:96: + ^I^Iusb_dev.resource[2].start = IRQ_DM646X_USBDMAINT;$ total: 3 errors, 0 warnings, 31 lines checked Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
Hello. Kevin Hilman wrote: >>DM646x has MUSB connected to IRQs 13 and 14 (unlike IRQ12 on other platforms), >>so pass the correct IRQ resources with the platform device. >>Signed-off-by: Dmitry Krivoschekov <dkrivoschekov@ru.mvista.com> >>Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> >>--- >>The patch has been reworked based on Kevin's suggestion. >>I've nearly forgotten about it... :-) > Looks good, except needs some whitespace cleanup, checkpatch reports: > ERROR: code indent should use tabs where possible > #72: FILE: arch/arm/mach-davinci/usb.c:94: > + ^I^I/* Override the defaults as DM6467 uses different IRQs. */$ > ERROR: code indent should use tabs where possible > #73: FILE: arch/arm/mach-davinci/usb.c:95: > + ^I^Iusb_dev.resource[1].start = IRQ_DM646X_USBINT;$ > ERROR: code indent should use tabs where possible > #74: FILE: arch/arm/mach-davinci/usb.c:96: > + ^I^Iusb_dev.resource[2].start = IRQ_DM646X_USBDMAINT;$ > total: 3 errors, 0 warnings, 31 lines checked > Your patch has style problems, please review. If any of these errors > are false positives report them to the maintainer, see > CHECKPATCH in MAINTAINERS. Oops, must be a result of resolving reject. :-< WBR, Sergei
Index: linux-davinci/arch/arm/mach-davinci/usb.c =================================================================== --- linux-davinci.orig/arch/arm/mach-davinci/usb.c +++ linux-davinci/arch/arm/mach-davinci/usb.c @@ -13,6 +13,7 @@ #include <mach/common.h> #include <mach/hardware.h> #include <mach/irqs.h> +#include <mach/cputype.h> #define DAVINCI_USB_OTG_BASE 0x01C64000 @@ -64,6 +65,10 @@ static struct resource usb_resources[] = .start = IRQ_USBINT, .flags = IORESOURCE_IRQ, }, + { + /* placeholder for the dedicated CPPI IRQ */ + .flags = IORESOURCE_IRQ, + }, }; static u64 usb_dmamask = DMA_BIT_MASK(32); @@ -84,6 +89,14 @@ void __init setup_usb(unsigned mA, unsig { usb_data.power = mA / 2; usb_data.potpgt = potpgt_msec / 2; + + if (cpu_is_davinci_dm646x()) { + /* Override the defaults as DM6467 uses different IRQs. */ + usb_dev.resource[1].start = IRQ_DM646X_USBINT; + usb_dev.resource[2].start = IRQ_DM646X_USBDMAINT; + } else /* other devices don't have dedicated CPPI IRQ */ + usb_dev.num_resources = 2; + platform_device_register(&usb_dev); }