* Benoit Cousson <b-cousson@xxxxxx> [101223 06:14]: > Smartreflex is missing the recently introduced SIDLE_SMART_WKUP > flag in idlemodes field. So this actually also changes something too? > The merge of the DMA and SR series on top of the already modified > omap_hwmod_data_44xx.c moved the dma_system structure at the wrong > position in the file. The same thing happened for the SR structure. > - Re-order the structures properly. > > In order to be fully aligned with the Python generator output, > change a couple of fields. > - Add tab in class and dev_attr structures to align fields > - Add a comma at the end of the following line to simplify the > code generation: > ".pre_shutdown = &omap2_wd_timer_disable," To me it sounds like this should be at least two separate patches: One that adds the SIDLE_SMART_WKUP, then another patch that only does clean-up with no functional changes. Also this patch applied (contactenated multiple patches?) turns into a hard to read interleaved patch for some parts: -static struct omap_hwmod_irq_info omap44xx_uart2_irqs[] = { - { .irq = 73 + OMAP44XX_IRQ_GIC_START }, -}; - -static struct omap_hwmod_dma_info omap44xx_uart2_sdma_reqs[] = { - { .name = "tx", .dma_req = 50 + OMAP44XX_DMA_REQ_START }, - { .name = "rx", .dma_req = 51 + OMAP44XX_DMA_REQ_START }, +/* smartreflex_iva */ +static struct omap_hwmod omap44xx_smartreflex_iva_hwmod; +static struct omap_hwmod_irq_info omap44xx_smartreflex_iva_irqs[] = { + { .irq = 102 + OMAP44XX_IRQ_GIC_START }, }; -static struct omap_hwmod_addr_space omap44xx_uart2_addrs[] = { +static struct omap_hwmod_addr_space omap44xx_smartreflex_iva_addrs[] = { { - .pa_start = 0x4806c000, - .pa_end = 0x4806c0ff, + .pa_start = 0x4a0db000, + .pa_end = 0x4a0db03f, .flags = ADDR_TYPE_RT }, }; ... So sounds like your original three patches would be the better way to go. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html