OMAP: hwmod: consolidate duplicate data across OMAP2xxx/3xxx files
Subsystems (5)
Paul Walmsley
maintainercover OMAP: hwmod: consolidate duplicate data across OMAP2xxx/3xxx files
Hello,
This series combines some duplicate omap_hwmod data across the OMAP2420, OMAP2430, and OMAP3 data files. The intention here is to reduce the amount of kernel source code in arch/arm/mach-omap2/, although there is also a small kernel size reduction.
Further cleanup and reorganization is forthcoming in later series; this is simply the first round.
Boot-tested on OMAP4430 ES2 PandaBoard and OMAP3530 BeagleBoard.
- Paul
---
Paul Walmsley (7):
omap_hwmod: use a null structure record to terminate omap_hwmod_addr_space arrays
omap_hwmod: share identical omap_hwmod_addr_space arrays
omap_hwmod: use a terminator record with omap_hwmod_mpu_irqs arrays
omap_hwmod: share identical omap_hwmod_mpu_irqs arrays
omap_hwmod: use a terminator record with omap_hwmod_dma_info arrays
omap_hwmod: share identical omap_hwmod_dma_info arrays
omap_hwmod: share identical omap_hwmod_class, omap_hwmod_class_sysconfig arrays
arch/arm/mach-omap2/Makefile | 16 arch/arm/mach-omap2/omap_hwmod.c | 101 ++ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 832 ++---------------- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 910 +++----------------- .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 173 ++++ .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 322 +++++++ .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 130 +++ arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 150 +++ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 654 +++----------- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 357 ++++---- arch/arm/mach-omap2/omap_hwmod_common_data.c | 20 arch/arm/mach-omap2/omap_hwmod_common_data.h | 93 ++ arch/arm/plat-omap/include/plat/omap_hwmod.h | 18 13 files changed, 1508 insertions(+), 2268 deletions(-) create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
Paul Walmsley
maintainerPATCH 2/7 omap_hwmod: share identical omap_hwmod_addr_space arrays
To reduce kernel source file data duplication, share struct omap_hwmod_addr_space arrays across OMAP2xxx and 3xxx hwmod data files.
--- arch/arm/mach-omap2/Makefile | 11 + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 291 ++---------------- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 319 ++------------------ .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 173 +++++++++++ .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 130 ++++++++ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 151 +-------- arch/arm/mach-omap2/omap_hwmod_common_data.h | 38 ++ 7 files changed, 414 insertions(+), 699 deletions(-) create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
arch/arm/mach-omap2/Makefile +8 -3
@@ -145,9 +145,14 @@ obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o obj-$(CONFIG_SOC_OMAP2430) += opp2430_data.o # hwmod data -obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2420_data.o -obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2430_data.o -obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o +obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_interconnect_data.o \ + omap_hwmod_2xxx_3xxx_interconnect_data.o \ + omap_hwmod_2420_data.o +obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2xxx_interconnect_data.o \ + omap_hwmod_2xxx_3xxx_interconnect_data.o \ + omap_hwmod_2430_data.o +obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_interconnect_data.o \ + omap_hwmod_3xxx_data.o obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o # EMU peripherals
arch/arm/mach-omap2/omap_hwmod_2420_data.c +26 -265
561 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_2430_data.c +26 -293
607 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c new file +173 -0
173 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c new file +130 -0
130 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +15 -136
295 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_common_data.h +36 -2
@@ -1,10 +1,10 @@/* * omap_hwmod_common_data.h - OMAP hwmod common macros and declarations * -* Copyright (C) 2010 Nokia Corporation +* Copyright (C) 2010-2011 Nokia Corporation * Paul Walmsley * -* Copyright (C) 2010 Texas Instruments, Inc. +* Copyright (C) 2010-2011 Texas Instruments, Inc. * Beno?t Cousson * * This program is free software; you can redistribute it and/or modify
@@ -16,10 +16,44 @@#include <plat/omap_hwmod.h> +/* Common address space across OMAP2xxx */ +extern struct omap_hwmod_addr_space omap2xxx_uart1_addr_space[]; +extern struct omap_hwmod_addr_space omap2xxx_uart2_addr_space[]; +extern struct omap_hwmod_addr_space omap2xxx_uart3_addr_space[]; +extern struct omap_hwmod_addr_space omap2xxx_timer2_addrs[]; +extern struct omap_hwmod_addr_space omap2xxx_timer3_addrs[]; +extern struct omap_hwmod_addr_space omap2xxx_timer4_addrs[]; +extern struct omap_hwmod_addr_space omap2xxx_timer5_addrs[]; +extern struct omap_hwmod_addr_space omap2xxx_timer6_addrs[]; +extern struct omap_hwmod_addr_space omap2xxx_timer7_addrs[]; +extern struct omap_hwmod_addr_space omap2xxx_timer8_addrs[]; +extern struct omap_hwmod_addr_space omap2xxx_timer9_addrs[]; +extern struct omap_hwmod_addr_space omap2xxx_timer12_addrs[]; +extern struct omap_hwmod_addr_space omap2xxx_mcbsp2_addrs[]; + +/* Common address space across OMAP2xxx/3xxx */ +extern struct omap_hwmod_addr_space omap2_i2c1_addr_space[]; +extern struct omap_hwmod_addr_space omap2_i2c2_addr_space[]; +extern struct omap_hwmod_addr_space omap2_dss_addrs[]; +extern struct omap_hwmod_addr_space omap2_dss_dispc_addrs[]; +extern struct omap_hwmod_addr_space omap2_dss_rfbi_addrs[]; +extern struct omap_hwmod_addr_space omap2_dss_venc_addrs[]; +extern struct omap_hwmod_addr_space omap2_timer10_addrs[]; +extern struct omap_hwmod_addr_space omap2_timer11_addrs[]; +extern struct omap_hwmod_addr_space omap2430_mmc1_addr_space[]; +extern struct omap_hwmod_addr_space omap2430_mmc2_addr_space[]; +extern struct omap_hwmod_addr_space omap2_mcspi1_addr_space[]; +extern struct omap_hwmod_addr_space omap2_mcspi2_addr_space[]; +extern struct omap_hwmod_addr_space omap2430_mcspi3_addr_space[]; +extern struct omap_hwmod_addr_space omap2_dma_system_addrs[]; +extern struct omap_hwmod_addr_space omap2_mailbox_addrs[]; +extern struct omap_hwmod_addr_space omap2_mcbsp1_addrs[]; +/* OMAP hwmod classes - forward declarations */ extern struct omap_hwmod_class l3_hwmod_class;extern struct omap_hwmod_class l4_hwmod_class;extern struct omap_hwmod_class mpu_hwmod_class;extern struct omap_hwmod_class iva_hwmod_class; +#endif
Paul Walmsley
maintainerPATCH 4/7 omap_hwmod: share identical omap_hwmod_mpu_irqs arrays
In reply to Paul WalmsleyTo reduce kernel source file data duplication, share struct omap_hwmod_mpu_irqs arrays across OMAP2xxx and 3xxx hwmod data files.
--- arch/arm/mach-omap2/Makefile | 11 + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 167 +++----------------- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 166 +++----------------- .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 142 +++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 21 +++ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 162 +++---------------- arch/arm/mach-omap2/omap_hwmod_common_data.h | 29 +++ 7 files changed, 275 insertions(+), 423 deletions(-) create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
arch/arm/mach-omap2/Makefile +8 -3
@@ -145,13 +145,18 @@ obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o obj-$(CONFIG_SOC_OMAP2430) += opp2430_data.o # hwmod data -obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_interconnect_data.o \ +obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_ipblock_data.o \ + omap_hwmod_2xxx_3xxx_ipblock_data.o \ + omap_hwmod_2xxx_interconnect_data.o \ omap_hwmod_2xxx_3xxx_interconnect_data.o \ omap_hwmod_2420_data.o -obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2xxx_interconnect_data.o \ +obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2xxx_ipblock_data.o \ + omap_hwmod_2xxx_3xxx_ipblock_data.o \ + omap_hwmod_2xxx_interconnect_data.o \ omap_hwmod_2xxx_3xxx_interconnect_data.o \ omap_hwmod_2430_data.o -obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_interconnect_data.o \ +obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_ipblock_data.o \ + omap_hwmod_2xxx_3xxx_interconnect_data.o \ omap_hwmod_3xxx_data.o obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o
arch/arm/mach-omap2/omap_hwmod_2420_data.c +25 -142
467 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_2430_data.c +25 -141
466 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c new file +142 -0
142 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c new file +21 -0
@@ -0,0 +1,21 @@ +/* +* omap_hwmod_2xxx_ipblock_data.c - common IP block data for OMAP2xxx +* +* Copyright (C) 2011 Nokia Corporation +* Paul Walmsley +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ +#include <plat/omap_hwmod.h> +#include <plat/serial.h> + +#include <mach/irqs.h> + +#include "omap_hwmod_common_data.h" + +struct omap_hwmod_irq_info omap2xxx_timer12_mpu_irqs[] = { + { .irq =48 , }, + { .irq =-1 } +};
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +25 -137
456 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_common_data.h +29 -0
@@ -49,6 +49,35 @@ extern struct omap_hwmod_addr_space omap2_dma_system_addrs[];extern struct omap_hwmod_addr_space omap2_mailbox_addrs[];extern struct omap_hwmod_addr_space omap2_mcbsp1_addrs[]; +/* Common IP block data across OMAP2xxx */ +extern struct omap_hwmod_irq_info omap2xxx_timer12_mpu_irqs[]; + +/* Common IP block data across OMAP2/3 */ +extern struct omap_hwmod_irq_info omap2_timer1_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_timer2_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_timer3_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_timer4_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_timer5_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_timer6_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_timer7_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_timer8_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_timer9_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_timer10_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_timer11_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_uart1_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_uart2_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_uart3_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_dispc_irqs[]; +extern struct omap_hwmod_irq_info omap2_i2c1_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_i2c2_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_gpio1_irqs[]; +extern struct omap_hwmod_irq_info omap2_gpio2_irqs[]; +extern struct omap_hwmod_irq_info omap2_gpio3_irqs[]; +extern struct omap_hwmod_irq_info omap2_gpio4_irqs[]; +extern struct omap_hwmod_irq_info omap2_dma_system_irqs[]; +extern struct omap_hwmod_irq_info omap2_mcspi1_mpu_irqs[]; +extern struct omap_hwmod_irq_info omap2_mcspi2_mpu_irqs[]; +/* OMAP hwmod classes - forward declarations */ extern struct omap_hwmod_class l3_hwmod_class;extern struct omap_hwmod_class l4_hwmod_class;
Paul Walmsley
maintainerPATCH 5/7 omap_hwmod: use a terminator record with omap_hwmod_dma_info arrays
In reply to Paul WalmsleyPreviously, struct omap_hwmod_dma_info arrays were unterminated; and users of these arrays used the ARRAY_SIZE() macro to determine the length of the array. However, ARRAY_SIZE() only works when the array is in the same scope as the macro user.
So far this hasn't been a problem. However, to reduce duplicated data, a subsequent patch will move common data to a separate, shared file. When this is done, ARRAY_SIZE() will no longer be usable.
This patch removes ARRAY_SIZE() usage for struct omap_hwmod_dma_info arrays and uses a sentinel value (irq == -1) as the array terminator instead.
--- arch/arm/mach-omap2/omap_hwmod.c | 30 ++++++++++++- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 20 ++++----- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 32 +++++++------- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 43 +++++++++---------- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 60 +++++++++++++------------- arch/arm/plat-omap/include/plat/omap_hwmod.h | 8 +-- 6 files changed, 106 insertions(+), 87 deletions(-)
arch/arm/mach-omap2/omap_hwmod.c +27 -3
@@ -702,6 +702,29 @@ static int _count_mpu_irqs(struct omap_hwmod *oh) }/** +* _count_sdma_reqs - count the number of SDMA request lines associated with @oh +* @oh: struct omap_hwmod *oh +* +* Count and return the number of SDMA request lines associated with +* the hwmod @oh. Used to allocate struct resource data. Returns 0 +* if @oh is NULL. +*/ +static int _count_sdma_reqs (struct omap_hwmod *oh) +{ +struct omap_hwmod_dma_info *ohdi; +int i =0 ; + +if (!oh || !oh->sdma_reqs) +return 0 ; + +do { + ohdi = &oh->sdma_reqs[i++]; + }while (ohdi->dma_req !=-1 ); + +return i; +} + +/** * _count_ocp_if_addr_spaces - count the number of address space entries for @oh * @oh: struct omap_hwmod *oh *
@@ -1987,7 +2010,7 @@ int omap_hwmod_count_resources(struct omap_hwmod *oh) {int ret, i; - ret =_count_mpu_irqs (oh) + oh->sdma_reqs_cnt; + ret =_count_mpu_irqs (oh) +_count_sdma_reqs (oh);for (i =0 ; i < oh->slaves_cnt; i++) ret +=_count_ocp_if_addr_spaces (oh->slaves[i]);
@@ -2007,7 +2030,7 @@ int omap_hwmod_count_resources(struct omap_hwmod *oh)*/ int omap_hwmod_fill_resources (struct omap_hwmod *oh,struct resource *res) { -int i, j, mpu_irqs_cnt; +int i, j, mpu_irqs_cnt, sdma_reqs_cnt;int r =0 ;/* For each IRQ, DMA, memory area, fill in array.*/
@@ -2021,7 +2044,8 @@ int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res) r++; } -for (i =0 ; i < oh->sdma_reqs_cnt; i++) { + sdma_reqs_cnt =_count_sdma_reqs (oh); +for (i =0 ; i < sdma_reqs_cnt; i++) { (res + r)->name = (oh->sdma_reqs + i)->name; (res + r)->start = (oh->sdma_reqs + i)->dma_req; (res + r)->end = (oh->sdma_reqs + i)->dma_req;
arch/arm/mach-omap2/omap_hwmod_2420_data.c +10 -10
@@ -831,6 +831,7 @@ static struct omap_hwmod_class uart_class = {static struct omap_hwmod_dma_info uart1_sdma_reqs[] = { { .name ="rx" , .dma_req =OMAP24XX_DMA_UART1_RX , }, { .name ="tx" , .dma_req =OMAP24XX_DMA_UART1_TX , }, + { .dma_req =-1 } };static struct omap_hwmod_ocp_if *omap2420_uart1_slaves[] = {
@@ -841,7 +842,6 @@ static struct omap_hwmod omap2420_uart1_hwmod = { .name = "uart1", .mpu_irqs = omap2_uart1_mpu_irqs, .sdma_reqs = uart1_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(uart1_sdma_reqs), .main_clk = "uart1_fck", .prcm = { .omap2 = {
@@ -863,6 +863,7 @@ static struct omap_hwmod omap2420_uart1_hwmod = {static struct omap_hwmod_dma_info uart2_sdma_reqs[] = { { .name ="rx" , .dma_req =OMAP24XX_DMA_UART2_RX , }, { .name ="tx" , .dma_req =OMAP24XX_DMA_UART2_TX , }, + { .dma_req =-1 } };static struct omap_hwmod_ocp_if *omap2420_uart2_slaves[] = {
@@ -873,7 +874,6 @@ static struct omap_hwmod omap2420_uart2_hwmod = { .name = "uart2", .mpu_irqs = omap2_uart2_mpu_irqs, .sdma_reqs = uart2_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(uart2_sdma_reqs), .main_clk = "uart2_fck", .prcm = { .omap2 = {
@@ -895,6 +895,7 @@ static struct omap_hwmod omap2420_uart2_hwmod = {static struct omap_hwmod_dma_info uart3_sdma_reqs[] = { { .name ="rx" , .dma_req =OMAP24XX_DMA_UART3_RX , }, { .name ="tx" , .dma_req =OMAP24XX_DMA_UART3_TX , }, + { .dma_req =-1 } };static struct omap_hwmod_ocp_if *omap2420_uart3_slaves[] = {
@@ -905,7 +906,6 @@ static struct omap_hwmod omap2420_uart3_hwmod = { .name = "uart3", .mpu_irqs = omap2_uart3_mpu_irqs, .sdma_reqs = uart3_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(uart3_sdma_reqs), .main_clk = "uart3_fck", .prcm = { .omap2 = {
@@ -942,6 +942,7 @@ static struct omap_hwmod_class omap2420_dss_hwmod_class = {static struct omap_hwmod_dma_info omap2420_dss_sdma_chs[] = { { .name ="dispc" , .dma_req =5 }, + { .dma_req =-1 } };/* dss */
@@ -980,7 +981,6 @@ static struct omap_hwmod omap2420_dss_core_hwmod = { .class = &omap2420_dss_hwmod_class, .main_clk = "dss1_fck", /* instead of dss_fck */ .sdma_reqs = omap2420_dss_sdma_chs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2420_dss_sdma_chs), .prcm = { .omap2 = { .prcm_reg_id = 1,
@@ -1186,6 +1186,7 @@ static struct omap_i2c_dev_attr i2c_dev_attr;static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = { { .name ="tx" , .dma_req =OMAP24XX_DMA_I2C1_TX }, { .name ="rx" , .dma_req =OMAP24XX_DMA_I2C1_RX }, + { .dma_req =-1 } };static struct omap_hwmod_ocp_if *omap2420_i2c1_slaves[] = {
@@ -1196,7 +1197,6 @@ static struct omap_hwmod omap2420_i2c1_hwmod = { .name = "i2c1", .mpu_irqs = omap2_i2c1_mpu_irqs, .sdma_reqs = i2c1_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(i2c1_sdma_reqs), .main_clk = "i2c1_fck", .prcm = { .omap2 = {
@@ -1220,6 +1220,7 @@ static struct omap_hwmod omap2420_i2c1_hwmod = {static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = { { .name ="tx" , .dma_req =OMAP24XX_DMA_I2C2_TX }, { .name ="rx" , .dma_req =OMAP24XX_DMA_I2C2_RX }, + { .dma_req =-1 } };static struct omap_hwmod_ocp_if *omap2420_i2c2_slaves[] = {
@@ -1230,7 +1231,6 @@ static struct omap_hwmod omap2420_i2c2_hwmod = { .name = "i2c2", .mpu_irqs = omap2_i2c2_mpu_irqs, .sdma_reqs = i2c2_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(i2c2_sdma_reqs), .main_clk = "i2c2_fck", .prcm = { .omap2 = {
@@ -1611,6 +1611,7 @@ static struct omap_hwmod_dma_info omap2420_mcspi1_sdma_reqs[] = { { .name = "rx2", .dma_req = 40 }, /* DMA_SPI1_RX2 */ { .name = "tx3", .dma_req = 41 }, /* DMA_SPI1_TX3 */ { .name = "rx3", .dma_req = 42 }, /* DMA_SPI1_RX3 */ + { .dma_req = -1 } };static struct omap_hwmod_ocp_if *omap2420_mcspi1_slaves[] = {
@@ -1625,7 +1626,6 @@ static struct omap_hwmod omap2420_mcspi1_hwmod = { .name = "mcspi1_hwmod", .mpu_irqs = omap2_mcspi1_mpu_irqs, .sdma_reqs = omap2420_mcspi1_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2420_mcspi1_sdma_reqs), .main_clk = "mcspi1_fck", .prcm = { .omap2 = {
@@ -1649,6 +1649,7 @@ static struct omap_hwmod_dma_info omap2420_mcspi2_sdma_reqs[] = { { .name = "rx0", .dma_req = 44 }, /* DMA_SPI2_RX0 */ { .name = "tx1", .dma_req = 45 }, /* DMA_SPI2_TX1 */ { .name = "rx1", .dma_req = 46 }, /* DMA_SPI2_RX1 */ + { .dma_req = -1 } };static struct omap_hwmod_ocp_if *omap2420_mcspi2_slaves[] = {
@@ -1663,7 +1664,6 @@ static struct omap_hwmod omap2420_mcspi2_hwmod = { .name = "mcspi2_hwmod", .mpu_irqs = omap2_mcspi2_mpu_irqs, .sdma_reqs = omap2420_mcspi2_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2420_mcspi2_sdma_reqs), .main_clk = "mcspi2_fck", .prcm = { .omap2 = {
@@ -1700,6 +1700,7 @@ static struct omap_hwmod_irq_info omap2420_mcbsp1_irqs[] = {static struct omap_hwmod_dma_info omap2420_mcbsp1_sdma_chs[] = { { .name ="rx" , .dma_req =32 }, { .name ="tx" , .dma_req =31 }, + { .dma_req =-1 } };/* l4_core -> mcbsp1 */
@@ -1721,7 +1722,6 @@ static struct omap_hwmod omap2420_mcbsp1_hwmod = { .class = &omap2420_mcbsp_hwmod_class, .mpu_irqs = omap2420_mcbsp1_irqs, .sdma_reqs = omap2420_mcbsp1_sdma_chs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2420_mcbsp1_sdma_chs), .main_clk = "mcbsp1_fck", .prcm = { .omap2 = {
@@ -1747,6 +1747,7 @@ static struct omap_hwmod_irq_info omap2420_mcbsp2_irqs[] = {static struct omap_hwmod_dma_info omap2420_mcbsp2_sdma_chs[] = { { .name ="rx" , .dma_req =34 }, { .name ="tx" , .dma_req =33 }, + { .dma_req =-1 } };/* l4_core -> mcbsp2 */
@@ -1768,7 +1769,6 @@ static struct omap_hwmod omap2420_mcbsp2_hwmod = { .class = &omap2420_mcbsp_hwmod_class, .mpu_irqs = omap2420_mcbsp2_irqs, .sdma_reqs = omap2420_mcbsp2_sdma_chs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2420_mcbsp2_sdma_chs), .main_clk = "mcbsp2_fck", .prcm = { .omap2 = {
arch/arm/mach-omap2/omap_hwmod_2430_data.c +16 -16
@@ -903,6 +903,7 @@ static struct omap_hwmod_class uart_class = {static struct omap_hwmod_dma_info uart1_sdma_reqs[] = { { .name ="rx" , .dma_req =OMAP24XX_DMA_UART1_RX , }, { .name ="tx" , .dma_req =OMAP24XX_DMA_UART1_TX , }, + { .dma_req =-1 } };static struct omap_hwmod_ocp_if *omap2430_uart1_slaves[] = {
@@ -913,7 +914,6 @@ static struct omap_hwmod omap2430_uart1_hwmod = { .name = "uart1", .mpu_irqs = omap2_uart1_mpu_irqs, .sdma_reqs = uart1_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(uart1_sdma_reqs), .main_clk = "uart1_fck", .prcm = { .omap2 = {
@@ -935,6 +935,7 @@ static struct omap_hwmod omap2430_uart1_hwmod = {static struct omap_hwmod_dma_info uart2_sdma_reqs[] = { { .name ="rx" , .dma_req =OMAP24XX_DMA_UART2_RX , }, { .name ="tx" , .dma_req =OMAP24XX_DMA_UART2_TX , }, + { .dma_req =-1 } };static struct omap_hwmod_ocp_if *omap2430_uart2_slaves[] = {
@@ -945,7 +946,6 @@ static struct omap_hwmod omap2430_uart2_hwmod = { .name = "uart2", .mpu_irqs = omap2_uart2_mpu_irqs, .sdma_reqs = uart2_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(uart2_sdma_reqs), .main_clk = "uart2_fck", .prcm = { .omap2 = {
@@ -967,6 +967,7 @@ static struct omap_hwmod omap2430_uart2_hwmod = {static struct omap_hwmod_dma_info uart3_sdma_reqs[] = { { .name ="rx" , .dma_req =OMAP24XX_DMA_UART3_RX , }, { .name ="tx" , .dma_req =OMAP24XX_DMA_UART3_TX , }, + { .dma_req =-1 } };static struct omap_hwmod_ocp_if *omap2430_uart3_slaves[] = {
@@ -977,7 +978,6 @@ static struct omap_hwmod omap2430_uart3_hwmod = { .name = "uart3", .mpu_irqs = omap2_uart3_mpu_irqs, .sdma_reqs = uart3_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(uart3_sdma_reqs), .main_clk = "uart3_fck", .prcm = { .omap2 = {
@@ -1014,6 +1014,7 @@ static struct omap_hwmod_class omap2430_dss_hwmod_class = {static struct omap_hwmod_dma_info omap2430_dss_sdma_chs[] = { { .name ="dispc" , .dma_req =5 }, + { .dma_req =-1 } };/* dss */
@@ -1046,7 +1047,6 @@ static struct omap_hwmod omap2430_dss_core_hwmod = { .class = &omap2430_dss_hwmod_class, .main_clk = "dss1_fck", /* instead of dss_fck */ .sdma_reqs = omap2430_dss_sdma_chs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2430_dss_sdma_chs), .prcm = { .omap2 = { .prcm_reg_id = 1,
@@ -1237,6 +1237,7 @@ static struct omap_i2c_dev_attr i2c_dev_attr = {static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = { { .name ="tx" , .dma_req =OMAP24XX_DMA_I2C1_TX }, { .name ="rx" , .dma_req =OMAP24XX_DMA_I2C1_RX }, + { .dma_req =-1 } };static struct omap_hwmod_ocp_if *omap2430_i2c1_slaves[] = {
@@ -1247,7 +1248,6 @@ static struct omap_hwmod omap2430_i2c1_hwmod = { .name = "i2c1", .mpu_irqs = omap2_i2c1_mpu_irqs, .sdma_reqs = i2c1_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(i2c1_sdma_reqs), .main_clk = "i2chs1_fck", .prcm = { .omap2 = {
@@ -1278,6 +1278,7 @@ static struct omap_hwmod omap2430_i2c1_hwmod = {static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = { { .name ="tx" , .dma_req =OMAP24XX_DMA_I2C2_TX }, { .name ="rx" , .dma_req =OMAP24XX_DMA_I2C2_RX }, + { .dma_req =-1 } };static struct omap_hwmod_ocp_if *omap2430_i2c2_slaves[] = {
@@ -1288,7 +1289,6 @@ static struct omap_hwmod omap2430_i2c2_hwmod = { .name = "i2c2", .mpu_irqs = omap2_i2c2_mpu_irqs, .sdma_reqs = i2c2_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(i2c2_sdma_reqs), .main_clk = "i2chs2_fck", .prcm = { .omap2 = {
@@ -1716,6 +1716,7 @@ static struct omap_hwmod_dma_info omap2430_mcspi1_sdma_reqs[] = { { .name = "rx2", .dma_req = 40 }, /* DMA_SPI1_RX2 */ { .name = "tx3", .dma_req = 41 }, /* DMA_SPI1_TX3 */ { .name = "rx3", .dma_req = 42 }, /* DMA_SPI1_RX3 */ + { .dma_req = -1 } };static struct omap_hwmod_ocp_if *omap2430_mcspi1_slaves[] = {
@@ -1730,7 +1731,6 @@ static struct omap_hwmod omap2430_mcspi1_hwmod = { .name = "mcspi1_hwmod", .mpu_irqs = omap2_mcspi1_mpu_irqs, .sdma_reqs = omap2430_mcspi1_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcspi1_sdma_reqs), .main_clk = "mcspi1_fck", .prcm = { .omap2 = {
@@ -1754,6 +1754,7 @@ static struct omap_hwmod_dma_info omap2430_mcspi2_sdma_reqs[] = { { .name = "rx0", .dma_req = 44 }, /* DMA_SPI2_RX0 */ { .name = "tx1", .dma_req = 45 }, /* DMA_SPI2_TX1 */ { .name = "rx1", .dma_req = 46 }, /* DMA_SPI2_RX1 */ + { .dma_req = -1 } };static struct omap_hwmod_ocp_if *omap2430_mcspi2_slaves[] = {
@@ -1768,7 +1769,6 @@ static struct omap_hwmod omap2430_mcspi2_hwmod = { .name = "mcspi2_hwmod", .mpu_irqs = omap2_mcspi2_mpu_irqs, .sdma_reqs = omap2430_mcspi2_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcspi2_sdma_reqs), .main_clk = "mcspi2_fck", .prcm = { .omap2 = {
@@ -1797,6 +1797,7 @@ static struct omap_hwmod_dma_info omap2430_mcspi3_sdma_reqs[] = { { .name = "rx0", .dma_req = 16 }, /* DMA_SPI3_RX0 */ { .name = "tx1", .dma_req = 23 }, /* DMA_SPI3_TX1 */ { .name = "rx1", .dma_req = 24 }, /* DMA_SPI3_RX1 */ + { .dma_req = -1 } };static struct omap_hwmod_ocp_if *omap2430_mcspi3_slaves[] = {
@@ -1811,7 +1812,6 @@ static struct omap_hwmod omap2430_mcspi3_hwmod = { .name = "mcspi3_hwmod", .mpu_irqs = omap2430_mcspi3_mpu_irqs, .sdma_reqs = omap2430_mcspi3_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcspi3_sdma_reqs), .main_clk = "mcspi3_fck", .prcm = { .omap2 = {
@@ -1915,6 +1915,7 @@ static struct omap_hwmod_irq_info omap2430_mcbsp1_irqs[] = {static struct omap_hwmod_dma_info omap2430_mcbsp1_sdma_chs[] = { { .name ="rx" , .dma_req =32 }, { .name ="tx" , .dma_req =31 }, + { .dma_req =-1 } };/* l4_core -> mcbsp1 */
@@ -1936,7 +1937,6 @@ static struct omap_hwmod omap2430_mcbsp1_hwmod = { .class = &omap2430_mcbsp_hwmod_class, .mpu_irqs = omap2430_mcbsp1_irqs, .sdma_reqs = omap2430_mcbsp1_sdma_chs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp1_sdma_chs), .main_clk = "mcbsp1_fck", .prcm = { .omap2 = {
@@ -1963,6 +1963,7 @@ static struct omap_hwmod_irq_info omap2430_mcbsp2_irqs[] = {static struct omap_hwmod_dma_info omap2430_mcbsp2_sdma_chs[] = { { .name ="rx" , .dma_req =34 }, { .name ="tx" , .dma_req =33 }, + { .dma_req =-1 } };/* l4_core -> mcbsp2 */
@@ -1984,7 +1985,6 @@ static struct omap_hwmod omap2430_mcbsp2_hwmod = { .class = &omap2430_mcbsp_hwmod_class, .mpu_irqs = omap2430_mcbsp2_irqs, .sdma_reqs = omap2430_mcbsp2_sdma_chs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp2_sdma_chs), .main_clk = "mcbsp2_fck", .prcm = { .omap2 = {
@@ -2011,6 +2011,7 @@ static struct omap_hwmod_irq_info omap2430_mcbsp3_irqs[] = {static struct omap_hwmod_dma_info omap2430_mcbsp3_sdma_chs[] = { { .name ="rx" , .dma_req =18 }, { .name ="tx" , .dma_req =17 }, + { .dma_req =-1 } };static struct omap_hwmod_addr_space omap2430_mcbsp3_addrs[] = {
@@ -2042,7 +2043,6 @@ static struct omap_hwmod omap2430_mcbsp3_hwmod = { .class = &omap2430_mcbsp_hwmod_class, .mpu_irqs = omap2430_mcbsp3_irqs, .sdma_reqs = omap2430_mcbsp3_sdma_chs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp3_sdma_chs), .main_clk = "mcbsp3_fck", .prcm = { .omap2 = {
@@ -2069,6 +2069,7 @@ static struct omap_hwmod_irq_info omap2430_mcbsp4_irqs[] = {static struct omap_hwmod_dma_info omap2430_mcbsp4_sdma_chs[] = { { .name ="rx" , .dma_req =20 }, { .name ="tx" , .dma_req =19 }, + { .dma_req =-1 } };static struct omap_hwmod_addr_space omap2430_mcbsp4_addrs[] = {
@@ -2100,7 +2101,6 @@ static struct omap_hwmod omap2430_mcbsp4_hwmod = { .class = &omap2430_mcbsp_hwmod_class, .mpu_irqs = omap2430_mcbsp4_irqs, .sdma_reqs = omap2430_mcbsp4_sdma_chs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp4_sdma_chs), .main_clk = "mcbsp4_fck", .prcm = { .omap2 = {
@@ -2127,6 +2127,7 @@ static struct omap_hwmod_irq_info omap2430_mcbsp5_irqs[] = {static struct omap_hwmod_dma_info omap2430_mcbsp5_sdma_chs[] = { { .name ="rx" , .dma_req =22 }, { .name ="tx" , .dma_req =21 }, + { .dma_req =-1 } };static struct omap_hwmod_addr_space omap2430_mcbsp5_addrs[] = {
@@ -2158,7 +2159,6 @@ static struct omap_hwmod omap2430_mcbsp5_hwmod = { .class = &omap2430_mcbsp_hwmod_class, .mpu_irqs = omap2430_mcbsp5_irqs, .sdma_reqs = omap2430_mcbsp5_sdma_chs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mcbsp5_sdma_chs), .main_clk = "mcbsp5_fck", .prcm = { .omap2 = {
@@ -2202,6 +2202,7 @@ static struct omap_hwmod_irq_info omap2430_mmc1_mpu_irqs[] = {static struct omap_hwmod_dma_info omap2430_mmc1_sdma_reqs[] = { { .name ="tx" , .dma_req =61 },/* DMA_MMC1_TX */ { .name ="rx" , .dma_req =62 },/* DMA_MMC1_RX */ + { .dma_req =-1 } };static struct omap_hwmod_opt_clk omap2430_mmc1_opt_clks[] = {
@@ -2221,7 +2222,6 @@ static struct omap_hwmod omap2430_mmc1_hwmod = { .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, .mpu_irqs = omap2430_mmc1_mpu_irqs, .sdma_reqs = omap2430_mmc1_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mmc1_sdma_reqs), .opt_clks = omap2430_mmc1_opt_clks, .opt_clks_cnt = ARRAY_SIZE(omap2430_mmc1_opt_clks), .main_clk = "mmchs1_fck",
@@ -2251,6 +2251,7 @@ static struct omap_hwmod_irq_info omap2430_mmc2_mpu_irqs[] = {static struct omap_hwmod_dma_info omap2430_mmc2_sdma_reqs[] = { { .name ="tx" , .dma_req =47 },/* DMA_MMC2_TX */ { .name ="rx" , .dma_req =48 },/* DMA_MMC2_RX */ + { .dma_req =-1 } };static struct omap_hwmod_opt_clk omap2430_mmc2_opt_clks[] = {
@@ -2266,7 +2267,6 @@ static struct omap_hwmod omap2430_mmc2_hwmod = { .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, .mpu_irqs = omap2430_mmc2_mpu_irqs, .sdma_reqs = omap2430_mmc2_sdma_reqs, - .sdma_reqs_cnt = ARRAY_SIZE(omap2430_mmc2_sdma_reqs), .opt_clks = omap2430_mmc2_opt_clks, .opt_clks_cnt = ARRAY_SIZE(omap2430_mmc2_opt_clks), .main_clk = "mmchs2_fck",
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +20 -23
289 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +30 -30
420 lines not on this page · raw message
arch/arm/plat-omap/include/plat/omap_hwmod.h +3 -5
@@ -112,7 +112,7 @@ struct omap_hwmod_irq_info {/** * struct omap_hwmod_dma_info - DMA channels used by the hwmod * @name: name of the DMA channel (module local name) -* @dma_req: DMA request ID +* @dma_req: DMA request ID (should be non-negative except -1 = terminator) * * @name should be something short, e.g., "tx" or "rx". It is for use * by platform_get_resource_byname(). It is defined locally to the
@@ -120,7 +120,7 @@ struct omap_hwmod_irq_info {*/ struct omap_hwmod_dma_info {const char *name; -u16 dma_req; +s16 dma_req; };/**
@@ -467,7 +467,7 @@ struct omap_hwmod_class {* @class: struct omap_hwmod_class * to the class of this hwmod * @od: struct omap_device currently associated with this hwmod (internal use) * @mpu_irqs: ptr to an array of MPU IRQs -* @sdma_reqs: ptr to an array of System DMA request IDs (see sdma_reqs_cnt) +* @sdma_reqs: ptr to an array of System DMA request IDs * @prcm: PRCM data pertaining to this hwmod * @main_clk: main clock: OMAP clock name * @_clk: pointer to the main struct clk (filled in at runtime)
@@ -480,7 +480,6 @@ struct omap_hwmod_class {* @_sysc_cache: internal-use hwmod flags * @_mpu_rt_va: cached register target start address (internal use) * @_mpu_port_index: cached MPU register target slave ID (internal use) -* @sdma_reqs_cnt: number of @sdma_reqs * @opt_clks_cnt: number of @opt_clks * @master_cnt: number of @master entries * @slaves_cnt: number of @slave entries
@@ -528,7 +527,6 @@ struct omap_hwmod {u16 flags;u8 _mpu_port_index;u8 response_lat; -u8 sdma_reqs_cnt;u8 rst_lines_cnt;u8 opt_clks_cnt;u8 masters_cnt;
Paul Walmsley
maintainerPATCH 6/7 omap_hwmod: share identical omap_hwmod_dma_info arrays
In reply to Paul WalmsleyTo reduce kernel source file data duplication, share struct omap_hwmod_dma_info arrays across OMAP2xxx and 3xxx hwmod data files.
--- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 87 ++---------------- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 95 ++------------------ .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 92 +++++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 6 + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 89 ++----------------- arch/arm/mach-omap2/omap_hwmod_common_data.c | 20 ---- arch/arm/mach-omap2/omap_hwmod_common_data.h | 15 +++ 7 files changed, 144 insertions(+), 260 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2420_data.c +10 -77
@@ -828,12 +828,6 @@ static struct omap_hwmod_class uart_class = {/* UART1 */ -static struct omap_hwmod_dma_info uart1_sdma_reqs[] = { - { .name ="rx" , .dma_req =OMAP24XX_DMA_UART1_RX , }, - { .name ="tx" , .dma_req =OMAP24XX_DMA_UART1_TX , }, - { .dma_req =-1 } -}; -static struct omap_hwmod_ocp_if *omap2420_uart1_slaves[] = { &omap2_l4_core__uart1, };
@@ -841,7 +835,7 @@ static struct omap_hwmod_ocp_if *omap2420_uart1_slaves[] = {static struct omap_hwmod omap2420_uart1_hwmod = { .name ="uart1" , .mpu_irqs = omap2_uart1_mpu_irqs, - .sdma_reqs = uart1_sdma_reqs, + .sdma_reqs = omap2_uart1_sdma_reqs, .main_clk ="uart1_fck" , .prcm = { .omap2 = {
@@ -860,12 +854,6 @@ static struct omap_hwmod omap2420_uart1_hwmod = {/* UART2 */ -static struct omap_hwmod_dma_info uart2_sdma_reqs[] = { - { .name ="rx" , .dma_req =OMAP24XX_DMA_UART2_RX , }, - { .name ="tx" , .dma_req =OMAP24XX_DMA_UART2_TX , }, - { .dma_req =-1 } -}; -static struct omap_hwmod_ocp_if *omap2420_uart2_slaves[] = { &omap2_l4_core__uart2, };
@@ -873,7 +861,7 @@ static struct omap_hwmod_ocp_if *omap2420_uart2_slaves[] = {static struct omap_hwmod omap2420_uart2_hwmod = { .name ="uart2" , .mpu_irqs = omap2_uart2_mpu_irqs, - .sdma_reqs = uart2_sdma_reqs, + .sdma_reqs = omap2_uart2_sdma_reqs, .main_clk ="uart2_fck" , .prcm = { .omap2 = {
@@ -892,12 +880,6 @@ static struct omap_hwmod omap2420_uart2_hwmod = {/* UART3 */ -static struct omap_hwmod_dma_info uart3_sdma_reqs[] = { - { .name ="rx" , .dma_req =OMAP24XX_DMA_UART3_RX , }, - { .name ="tx" , .dma_req =OMAP24XX_DMA_UART3_TX , }, - { .dma_req =-1 } -}; -static struct omap_hwmod_ocp_if *omap2420_uart3_slaves[] = { &omap2_l4_core__uart3, };
@@ -905,7 +887,7 @@ static struct omap_hwmod_ocp_if *omap2420_uart3_slaves[] = {static struct omap_hwmod omap2420_uart3_hwmod = { .name ="uart3" , .mpu_irqs = omap2_uart3_mpu_irqs, - .sdma_reqs = uart3_sdma_reqs, + .sdma_reqs = omap2_uart3_sdma_reqs, .main_clk ="uart3_fck" , .prcm = { .omap2 = {
@@ -940,11 +922,6 @@ static struct omap_hwmod_class omap2420_dss_hwmod_class = { .sysc = &omap2420_dss_sysc, }; -static struct omap_hwmod_dma_info omap2420_dss_sdma_chs[] = { - { .name ="dispc" , .dma_req =5 }, - { .dma_req =-1 } -}; -/* dss */ /* dss master ports */ static struct omap_hwmod_ocp_if *omap2420_dss_masters[] = {
@@ -980,7 +957,7 @@ static struct omap_hwmod omap2420_dss_core_hwmod = { .name = "dss_core", .class = &omap2420_dss_hwmod_class, .main_clk = "dss1_fck", /* instead of dss_fck */ - .sdma_reqs = omap2420_dss_sdma_chs, + .sdma_reqs = omap2xxx_dss_sdma_chs, .prcm = { .omap2 = { .prcm_reg_id = 1,
@@ -1183,12 +1160,6 @@ static struct omap_i2c_dev_attr i2c_dev_attr;/* I2C1 */ -static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = { - { .name ="tx" , .dma_req =OMAP24XX_DMA_I2C1_TX }, - { .name ="rx" , .dma_req =OMAP24XX_DMA_I2C1_RX }, - { .dma_req =-1 } -}; -static struct omap_hwmod_ocp_if *omap2420_i2c1_slaves[] = { &omap2420_l4_core__i2c1, };
@@ -1196,7 +1167,7 @@ static struct omap_hwmod_ocp_if *omap2420_i2c1_slaves[] = {static struct omap_hwmod omap2420_i2c1_hwmod = { .name ="i2c1" , .mpu_irqs = omap2_i2c1_mpu_irqs, - .sdma_reqs = i2c1_sdma_reqs, + .sdma_reqs = omap2_i2c1_sdma_reqs, .main_clk ="i2c1_fck" , .prcm = { .omap2 = {
@@ -1217,12 +1188,6 @@ static struct omap_hwmod omap2420_i2c1_hwmod = {/* I2C2 */ -static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = { - { .name ="tx" , .dma_req =OMAP24XX_DMA_I2C2_TX }, - { .name ="rx" , .dma_req =OMAP24XX_DMA_I2C2_RX }, - { .dma_req =-1 } -}; -static struct omap_hwmod_ocp_if *omap2420_i2c2_slaves[] = { &omap2420_l4_core__i2c2, };
@@ -1230,7 +1195,7 @@ static struct omap_hwmod_ocp_if *omap2420_i2c2_slaves[] = {static struct omap_hwmod omap2420_i2c2_hwmod = { .name ="i2c2" , .mpu_irqs = omap2_i2c2_mpu_irqs, - .sdma_reqs = i2c2_sdma_reqs, + .sdma_reqs = omap2_i2c2_sdma_reqs, .main_clk ="i2c2_fck" , .prcm = { .omap2 = {
@@ -1602,18 +1567,6 @@ static struct omap_hwmod_class omap2420_mcspi_class = { };/* mcspi1 */ -static struct omap_hwmod_dma_info omap2420_mcspi1_sdma_reqs[] = { - { .name ="tx0" , .dma_req =35 },/* DMA_SPI1_TX0 */ - { .name ="rx0" , .dma_req =36 },/* DMA_SPI1_RX0 */ - { .name ="tx1" , .dma_req =37 },/* DMA_SPI1_TX1 */ - { .name ="rx1" , .dma_req =38 },/* DMA_SPI1_RX1 */ - { .name ="tx2" , .dma_req =39 },/* DMA_SPI1_TX2 */ - { .name ="rx2" , .dma_req =40 },/* DMA_SPI1_RX2 */ - { .name ="tx3" , .dma_req =41 },/* DMA_SPI1_TX3 */ - { .name ="rx3" , .dma_req =42 },/* DMA_SPI1_RX3 */ - { .dma_req =-1 } -}; -static struct omap_hwmod_ocp_if *omap2420_mcspi1_slaves[] = { &omap2420_l4_core__mcspi1, };
@@ -1625,7 +1578,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {static struct omap_hwmod omap2420_mcspi1_hwmod = { .name ="mcspi1_hwmod" , .mpu_irqs = omap2_mcspi1_mpu_irqs, - .sdma_reqs = omap2420_mcspi1_sdma_reqs, + .sdma_reqs = omap2_mcspi1_sdma_reqs, .main_clk ="mcspi1_fck" , .prcm = { .omap2 = {
@@ -1644,14 +1597,6 @@ static struct omap_hwmod omap2420_mcspi1_hwmod = { };/* mcspi2 */ -static struct omap_hwmod_dma_info omap2420_mcspi2_sdma_reqs[] = { - { .name ="tx0" , .dma_req =43 },/* DMA_SPI2_TX0 */ - { .name ="rx0" , .dma_req =44 },/* DMA_SPI2_RX0 */ - { .name ="tx1" , .dma_req =45 },/* DMA_SPI2_TX1 */ - { .name ="rx1" , .dma_req =46 },/* DMA_SPI2_RX1 */ - { .dma_req =-1 } -}; -static struct omap_hwmod_ocp_if *omap2420_mcspi2_slaves[] = { &omap2420_l4_core__mcspi2, };
@@ -1663,7 +1608,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {static struct omap_hwmod omap2420_mcspi2_hwmod = { .name ="mcspi2_hwmod" , .mpu_irqs = omap2_mcspi2_mpu_irqs, - .sdma_reqs = omap2420_mcspi2_sdma_reqs, + .sdma_reqs = omap2_mcspi2_sdma_reqs, .main_clk ="mcspi2_fck" , .prcm = { .omap2 = {
@@ -1697,12 +1642,6 @@ static struct omap_hwmod_irq_info omap2420_mcbsp1_irqs[] = { { .irq = -1 } }; -static struct omap_hwmod_dma_info omap2420_mcbsp1_sdma_chs[] = { - { .name ="rx" , .dma_req =32 }, - { .name ="tx" , .dma_req =31 }, - { .dma_req =-1 } -}; -/* l4_core -> mcbsp1 */ static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp1 = { .master = &omap2420_l4_core_hwmod,
@@ -1721,7 +1660,7 @@ static struct omap_hwmod omap2420_mcbsp1_hwmod = { .name = "mcbsp1", .class = &omap2420_mcbsp_hwmod_class, .mpu_irqs = omap2420_mcbsp1_irqs, - .sdma_reqs = omap2420_mcbsp1_sdma_chs, + .sdma_reqs = omap2_mcbsp1_sdma_reqs, .main_clk = "mcbsp1_fck", .prcm = { .omap2 = {
@@ -1744,12 +1683,6 @@ static struct omap_hwmod_irq_info omap2420_mcbsp2_irqs[] = { { .irq = -1 } }; -static struct omap_hwmod_dma_info omap2420_mcbsp2_sdma_chs[] = { - { .name ="rx" , .dma_req =34 }, - { .name ="tx" , .dma_req =33 }, - { .dma_req =-1 } -}; -/* l4_core -> mcbsp2 */ static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp2 = { .master = &omap2420_l4_core_hwmod,
@@ -1768,7 +1701,7 @@ static struct omap_hwmod omap2420_mcbsp2_hwmod = { .name = "mcbsp2", .class = &omap2420_mcbsp_hwmod_class, .mpu_irqs = omap2420_mcbsp2_irqs, - .sdma_reqs = omap2420_mcbsp2_sdma_chs, + .sdma_reqs = omap2_mcbsp2_sdma_reqs, .main_clk = "mcbsp2_fck", .prcm = { .omap2 = {
arch/arm/mach-omap2/omap_hwmod_2430_data.c +11 -84
227 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c +92 -0
108 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +6 -0
@@ -10,6 +10,7 @@*/ #include <plat/omap_hwmod.h> #include <plat/serial.h> +#include <plat/dma.h> #include <mach/irqs.h>
@@ -19,3 +20,8 @@ struct omap_hwmod_irq_info omap2xxx_timer12_mpu_irqs[] = { { .irq = 48, }, { .irq = -1 } }; + +struct omap_hwmod_dma_info omap2xxx_dss_sdma_chs[] = { + { .name ="dispc" , .dma_req =5 }, + { .dma_req =-1 } +};
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +10 -79
215 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_common_data.c +0 -20
@@ -49,23 +49,3 @@ struct omap_hwmod_sysc_fields omap_hwmod_sysc_type2 = { .srst_shift = SYSC_TYPE2_SOFTRESET_SHIFT, }; - -/* -* omap_hwmod class data -*/ - -struct omap_hwmod_class l3_hwmod_class = { - .name ="l3" -}; - -struct omap_hwmod_class l4_hwmod_class = { - .name ="l4" -}; - -struct omap_hwmod_class mpu_hwmod_class = { - .name ="mpu" -}; - -struct omap_hwmod_class iva_hwmod_class = { - .name ="iva" -};
arch/arm/mach-omap2/omap_hwmod_common_data.h +15 -0
@@ -51,6 +51,21 @@ extern struct omap_hwmod_addr_space omap2_mcbsp1_addrs[];/* Common IP block data across OMAP2xxx */ extern struct omap_hwmod_irq_info omap2xxx_timer12_mpu_irqs[]; +extern struct omap_hwmod_dma_info omap2xxx_dss_sdma_chs[]; + +/* Common IP block data */ +extern struct omap_hwmod_dma_info omap2_uart1_sdma_reqs[]; +extern struct omap_hwmod_dma_info omap2_uart2_sdma_reqs[]; +extern struct omap_hwmod_dma_info omap2_uart3_sdma_reqs[]; +extern struct omap_hwmod_dma_info omap2_i2c1_sdma_reqs[]; +extern struct omap_hwmod_dma_info omap2_i2c2_sdma_reqs[]; +extern struct omap_hwmod_dma_info omap2_mcspi1_sdma_reqs[]; +extern struct omap_hwmod_dma_info omap2_mcspi2_sdma_reqs[]; +extern struct omap_hwmod_dma_info omap2_mcbsp1_sdma_reqs[]; +extern struct omap_hwmod_dma_info omap2_mcbsp2_sdma_reqs[]; + +/* Common IP block data on OMAP2430/OMAP3 */ +extern struct omap_hwmod_dma_info omap2_mcbsp3_sdma_reqs[];/* Common IP block data across OMAP2/3 */ extern struct omap_hwmod_irq_info omap2_timer1_mpu_irqs[];
Paul Walmsley
maintainerPATCH 7/7 omap_hwmod: share identical omap_hwmod_class, omap_hwmod_class_sysconfig arrays
In reply to Paul WalmsleyTo reduce kernel source file data duplication, share struct omap_hwmod_class and omap_hwmod_class_sysconfig arrays across OMAP2xxx and 3xxx hwmod data files.
--- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 267 ++------------------ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 273 ++------------------ .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 228 ++++++++++++----- arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 123 +++++++++ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 105 +------- arch/arm/mach-omap2/omap_hwmod_common_data.h | 11 + 6 files changed, 364 insertions(+), 643 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2420_data.c +30 -237
@@ -274,24 +274,6 @@ static struct omap_hwmod omap2420_iva_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) }; -/* Timer Common */ -static struct omap_hwmod_class_sysconfig omap2420_timer_sysc = { - .rev_offs =0x0000 , - .sysc_offs =0x0010 , - .syss_offs =0x0014 , - .sysc_flags = (SYSC_HAS_SIDLEMODE |SYSC_HAS_CLOCKACTIVITY | -SYSC_HAS_ENAWAKEUP |SYSC_HAS_SOFTRESET | -SYSC_HAS_AUTOIDLE ), - .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class omap2420_timer_hwmod_class = { - .name ="timer" , - .sysc = &omap2420_timer_sysc, - .rev =OMAP_TIMER_IP_VERSION_1 , -}; -/* timer1 */ static struct omap_hwmod omap2420_timer1_hwmod;
@@ -334,7 +316,7 @@ static struct omap_hwmod omap2420_timer1_hwmod = { }, .slaves = omap2420_timer1_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_timer1_slaves), - .class = &omap2420_timer_hwmod_class, + .class = &omap2xxx_timer_hwmod_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) };
@@ -371,7 +353,7 @@ static struct omap_hwmod omap2420_timer2_hwmod = { }, .slaves = omap2420_timer2_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_timer2_slaves), - .class = &omap2420_timer_hwmod_class, + .class = &omap2xxx_timer_hwmod_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) };
@@ -408,7 +390,7 @@ static struct omap_hwmod omap2420_timer3_hwmod = { }, .slaves = omap2420_timer3_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_timer3_slaves), - .class = &omap2420_timer_hwmod_class, + .class = &omap2xxx_timer_hwmod_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) };
@@ -445,7 +427,7 @@ static struct omap_hwmod omap2420_timer4_hwmod = { }, .slaves = omap2420_timer4_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_timer4_slaves), - .class = &omap2420_timer_hwmod_class, + .class = &omap2xxx_timer_hwmod_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) };
@@ -482,7 +464,7 @@ static struct omap_hwmod omap2420_timer5_hwmod = { }, .slaves = omap2420_timer5_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_timer5_slaves), - .class = &omap2420_timer_hwmod_class, + .class = &omap2xxx_timer_hwmod_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) };
@@ -520,7 +502,7 @@ static struct omap_hwmod omap2420_timer6_hwmod = { }, .slaves = omap2420_timer6_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_timer6_slaves), - .class = &omap2420_timer_hwmod_class, + .class = &omap2xxx_timer_hwmod_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) };
@@ -557,7 +539,7 @@ static struct omap_hwmod omap2420_timer7_hwmod = { }, .slaves = omap2420_timer7_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_timer7_slaves), - .class = &omap2420_timer_hwmod_class, + .class = &omap2xxx_timer_hwmod_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) };
@@ -594,7 +576,7 @@ static struct omap_hwmod omap2420_timer8_hwmod = { }, .slaves = omap2420_timer8_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_timer8_slaves), - .class = &omap2420_timer_hwmod_class, + .class = &omap2xxx_timer_hwmod_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) };
@@ -631,7 +613,7 @@ static struct omap_hwmod omap2420_timer9_hwmod = { }, .slaves = omap2420_timer9_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_timer9_slaves), - .class = &omap2420_timer_hwmod_class, + .class = &omap2xxx_timer_hwmod_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) };
@@ -668,7 +650,7 @@ static struct omap_hwmod omap2420_timer10_hwmod = { }, .slaves = omap2420_timer10_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_timer10_slaves), - .class = &omap2420_timer_hwmod_class, + .class = &omap2xxx_timer_hwmod_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) };
@@ -705,7 +687,7 @@ static struct omap_hwmod omap2420_timer11_hwmod = { }, .slaves = omap2420_timer11_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_timer11_slaves), - .class = &omap2420_timer_hwmod_class, + .class = &omap2xxx_timer_hwmod_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) };
@@ -742,7 +724,7 @@ static struct omap_hwmod omap2420_timer12_hwmod = { }, .slaves = omap2420_timer12_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_timer12_slaves), - .class = &omap2420_timer_hwmod_class, + .class = &omap2xxx_timer_hwmod_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) };
@@ -764,27 +746,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__wd_timer2 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* -* 'wd_timer' class -* 32-bit watchdog upward counter that generates a pulse on the reset pin on -* overflow condition -*/ - -static struct omap_hwmod_class_sysconfig omap2420_wd_timer_sysc = { - .rev_offs =0x0000 , - .sysc_offs =0x0010 , - .syss_offs =0x0014 , - .sysc_flags = (SYSC_HAS_EMUFREE |SYSC_HAS_SOFTRESET | -SYSC_HAS_AUTOIDLE |SYSS_HAS_RESET_STATUS ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class omap2420_wd_timer_hwmod_class = { - .name ="wd_timer" , - .sysc = &omap2420_wd_timer_sysc, - .pre_shutdown = &omap2_wd_timer_disable -}; -/* wd_timer2 */ static struct omap_hwmod_ocp_if *omap2420_wd_timer2_slaves[] = { &omap2420_l4_wkup__wd_timer2,
@@ -792,7 +753,7 @@ static struct omap_hwmod_ocp_if *omap2420_wd_timer2_slaves[] = {static struct omap_hwmod omap2420_wd_timer2_hwmod = { .name ="wd_timer2" , - .class = &omap2420_wd_timer_hwmod_class, + .class = &omap2xxx_wd_timer_hwmod_class, .main_clk ="mpu_wdt_fck" , .prcm = { .omap2 = {
@@ -808,24 +769,6 @@ static struct omap_hwmod omap2420_wd_timer2_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), }; -/* UART */ - -static struct omap_hwmod_class_sysconfig uart_sysc = { - .rev_offs =0x50 , - .sysc_offs =0x54 , - .syss_offs =0x58 , - .sysc_flags = (SYSC_HAS_SIDLEMODE | -SYSC_HAS_ENAWAKEUP |SYSC_HAS_SOFTRESET | -SYSC_HAS_AUTOIDLE |SYSS_HAS_RESET_STATUS ), - .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class uart_class = { - .name ="uart" , - .sysc = &uart_sysc, -}; -/* UART1 */ static struct omap_hwmod_ocp_if *omap2420_uart1_slaves[] = {
@@ -848,7 +791,7 @@ static struct omap_hwmod omap2420_uart1_hwmod = { }, .slaves = omap2420_uart1_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_uart1_slaves), - .class = &uart_class, + .class = &omap2_uart_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), };
@@ -874,7 +817,7 @@ static struct omap_hwmod omap2420_uart2_hwmod = { }, .slaves = omap2420_uart2_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_uart2_slaves), - .class = &uart_class, + .class = &omap2_uart_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), };
@@ -900,28 +843,10 @@ static struct omap_hwmod omap2420_uart3_hwmod = { }, .slaves = omap2420_uart3_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_uart3_slaves), - .class = &uart_class, + .class = &omap2_uart_class, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), }; -/* -* 'dss' class -* display sub-system -*/ - -static struct omap_hwmod_class_sysconfig omap2420_dss_sysc = { - .rev_offs =0x0000 , - .sysc_offs =0x0010 , - .syss_offs =0x0014 , - .sysc_flags = (SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class omap2420_dss_hwmod_class = { - .name ="dss" , - .sysc = &omap2420_dss_sysc, -}; -/* dss */ /* dss master ports */ static struct omap_hwmod_ocp_if *omap2420_dss_masters[] = {
@@ -955,7 +880,7 @@ static struct omap_hwmod_opt_clk dss_opt_clks[] = {static struct omap_hwmod omap2420_dss_core_hwmod = { .name ="dss_core" , - .class = &omap2420_dss_hwmod_class, + .class = &omap2_dss_hwmod_class, .main_clk ="dss1_fck" ,/* instead of dss_fck */ .sdma_reqs = omap2xxx_dss_sdma_chs, .prcm = {
@@ -977,27 +902,6 @@ static struct omap_hwmod omap2420_dss_core_hwmod = { .flags = HWMOD_NO_IDLEST, }; -/* -* 'dispc' class -* display controller -*/ - -static struct omap_hwmod_class_sysconfig omap2420_dispc_sysc = { - .rev_offs =0x0000 , - .sysc_offs =0x0010 , - .syss_offs =0x0014 , - .sysc_flags = (SYSC_HAS_SIDLEMODE |SYSC_HAS_MIDLEMODE | -SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE ), - .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | -MSTANDBY_FORCE |MSTANDBY_NO |MSTANDBY_SMART ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class omap2420_dispc_hwmod_class = { - .name ="dispc" , - .sysc = &omap2420_dispc_sysc, -}; -/* l4_core -> dss_dispc */ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_dispc = { .master = &omap2420_l4_core_hwmod,
@@ -1020,7 +924,7 @@ static struct omap_hwmod_ocp_if *omap2420_dss_dispc_slaves[] = {static struct omap_hwmod omap2420_dss_dispc_hwmod = { .name ="dss_dispc" , - .class = &omap2420_dispc_hwmod_class, + .class = &omap2_dispc_hwmod_class, .mpu_irqs = omap2_dispc_irqs, .main_clk ="dss1_fck" , .prcm = {
@@ -1038,26 +942,6 @@ static struct omap_hwmod omap2420_dss_dispc_hwmod = { .flags = HWMOD_NO_IDLEST, }; -/* -* 'rfbi' class -* remote frame buffer interface -*/ - -static struct omap_hwmod_class_sysconfig omap2420_rfbi_sysc = { - .rev_offs =0x0000 , - .sysc_offs =0x0010 , - .syss_offs =0x0014 , - .sysc_flags = (SYSC_HAS_SIDLEMODE |SYSC_HAS_SOFTRESET | -SYSC_HAS_AUTOIDLE ), - .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class omap2420_rfbi_hwmod_class = { - .name ="rfbi" , - .sysc = &omap2420_rfbi_sysc, -}; -/* l4_core -> dss_rfbi */ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_rfbi = { .master = &omap2420_l4_core_hwmod,
@@ -1080,7 +964,7 @@ static struct omap_hwmod_ocp_if *omap2420_dss_rfbi_slaves[] = {static struct omap_hwmod omap2420_dss_rfbi_hwmod = { .name ="dss_rfbi" , - .class = &omap2420_rfbi_hwmod_class, + .class = &omap2_rfbi_hwmod_class, .main_clk ="dss1_fck" , .prcm = { .omap2 = {
@@ -1095,15 +979,6 @@ static struct omap_hwmod omap2420_dss_rfbi_hwmod = { .flags = HWMOD_NO_IDLEST, }; -/* -* 'venc' class -* video encoder -*/ - -static struct omap_hwmod_class omap2420_venc_hwmod_class = { - .name ="venc" , -}; -/* l4_core -> dss_venc */ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_venc = { .master = &omap2420_l4_core_hwmod,
@@ -1127,7 +1002,7 @@ static struct omap_hwmod_ocp_if *omap2420_dss_venc_slaves[] = {static struct omap_hwmod omap2420_dss_venc_hwmod = { .name ="dss_venc" , - .class = &omap2420_venc_hwmod_class, + .class = &omap2_venc_hwmod_class, .main_clk ="dss1_fck" , .prcm = { .omap2 = {
@@ -1292,27 +1167,6 @@ static struct omap_gpio_dev_attr gpio_dev_attr = { .dbck_flag = false, }; -static struct omap_hwmod_class_sysconfig omap242x_gpio_sysc = { - .rev_offs =0x0000 , - .sysc_offs =0x0010 , - .syss_offs =0x0014 , - .sysc_flags = (SYSC_HAS_ENAWAKEUP |SYSC_HAS_SIDLEMODE | -SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE | -SYSS_HAS_RESET_STATUS ), - .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -/* -* 'gpio' class -* general purpose io module -*/ -static struct omap_hwmod_class omap242x_gpio_hwmod_class = { - .name ="gpio" , - .sysc = &omap242x_gpio_sysc, - .rev =0 , -}; -/* gpio1 */ static struct omap_hwmod_ocp_if *omap2420_gpio1_slaves[] = { &omap2420_l4_wkup__gpio1,
@@ -1334,7 +1188,7 @@ static struct omap_hwmod omap2420_gpio1_hwmod = { }, .slaves = omap2420_gpio1_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_gpio1_slaves), - .class = &omap242x_gpio_hwmod_class, + .class = &omap2xxx_gpio_hwmod_class, .dev_attr = &gpio_dev_attr, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), };
@@ -1360,7 +1214,7 @@ static struct omap_hwmod omap2420_gpio2_hwmod = { }, .slaves = omap2420_gpio2_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_gpio2_slaves), - .class = &omap242x_gpio_hwmod_class, + .class = &omap2xxx_gpio_hwmod_class, .dev_attr = &gpio_dev_attr, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), };
@@ -1386,7 +1240,7 @@ static struct omap_hwmod omap2420_gpio3_hwmod = { }, .slaves = omap2420_gpio3_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_gpio3_slaves), - .class = &omap242x_gpio_hwmod_class, + .class = &omap2xxx_gpio_hwmod_class, .dev_attr = &gpio_dev_attr, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), };
@@ -1412,28 +1266,11 @@ static struct omap_hwmod omap2420_gpio4_hwmod = { }, .slaves = omap2420_gpio4_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_gpio4_slaves), - .class = &omap242x_gpio_hwmod_class, + .class = &omap2xxx_gpio_hwmod_class, .dev_attr = &gpio_dev_attr, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), }; -/* system dma */ -static struct omap_hwmod_class_sysconfig omap2420_dma_sysc = { - .rev_offs =0x0000 , - .sysc_offs =0x002c , - .syss_offs =0x0028 , - .sysc_flags = (SYSC_HAS_SOFTRESET |SYSC_HAS_MIDLEMODE | -SYSC_HAS_CLOCKACTIVITY |SYSC_HAS_EMUFREE | -SYSC_HAS_AUTOIDLE |SYSS_HAS_RESET_STATUS ), - .idlemodes = (MSTANDBY_FORCE |MSTANDBY_NO |MSTANDBY_SMART ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class omap2420_dma_hwmod_class = { - .name ="dma" , - .sysc = &omap2420_dma_sysc, -}; -/* dma attributes */ static struct omap_dma_dev_attr dma_dev_attr = { .dev_caps = RESERVE_CHANNEL | DMA_LINKED_LCH | GLOBAL_PRIORITY |
@@ -1470,7 +1307,7 @@ static struct omap_hwmod_ocp_if *omap2420_dma_system_slaves[] = {static struct omap_hwmod omap2420_dma_system_hwmod = { .name ="dma" , - .class = &omap2420_dma_hwmod_class, + .class = &omap2xxx_dma_hwmod_class, .mpu_irqs = omap2_dma_system_irqs, .main_clk ="core_l3_ck" , .slaves = omap2420_dma_system_slaves,
@@ -1482,27 +1319,6 @@ static struct omap_hwmod omap2420_dma_system_hwmod = { .flags = HWMOD_NO_IDLEST, }; -/* -* 'mailbox' class -* mailbox module allowing communication between the on-chip processors -* using a queued mailbox-interrupt mechanism. -*/ - -static struct omap_hwmod_class_sysconfig omap2420_mailbox_sysc = { - .rev_offs =0x000 , - .sysc_offs =0x010 , - .syss_offs =0x014 , - .sysc_flags = (SYSC_HAS_CLOCKACTIVITY |SYSC_HAS_SIDLEMODE | -SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE ), - .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class omap2420_mailbox_hwmod_class = { - .name ="mailbox" , - .sysc = &omap2420_mailbox_sysc, -}; -/* mailbox */ static struct omap_hwmod omap2420_mailbox_hwmod;static struct omap_hwmod_irq_info omap2420_mailbox_irqs[] = {
@@ -1526,7 +1342,7 @@ static struct omap_hwmod_ocp_if *omap2420_mailbox_slaves[] = {static struct omap_hwmod omap2420_mailbox_hwmod = { .name ="mailbox" , - .class = &omap2420_mailbox_hwmod_class, + .class = &omap2xxx_mailbox_hwmod_class, .mpu_irqs = omap2420_mailbox_irqs, .main_clk ="mailboxes_ick" , .prcm = {
@@ -1543,29 +1359,6 @@ static struct omap_hwmod omap2420_mailbox_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), }; -/* -* 'mcspi' class -* multichannel serial port interface (mcspi) / master/slave synchronous serial -* bus -*/ - -static struct omap_hwmod_class_sysconfig omap2420_mcspi_sysc = { - .rev_offs =0x0000 , - .sysc_offs =0x0010 , - .syss_offs =0x0014 , - .sysc_flags = (SYSC_HAS_CLOCKACTIVITY |SYSC_HAS_SIDLEMODE | -SYSC_HAS_ENAWAKEUP |SYSC_HAS_SOFTRESET | -SYSC_HAS_AUTOIDLE |SYSS_HAS_RESET_STATUS ), - .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class omap2420_mcspi_class = { - .name ="mcspi" , - .sysc = &omap2420_mcspi_sysc, - .rev =OMAP2_MCSPI_REV , -}; -/* mcspi1 */ static struct omap_hwmod_ocp_if *omap2420_mcspi1_slaves[] = { &omap2420_l4_core__mcspi1,
@@ -1591,8 +1384,8 @@ static struct omap_hwmod omap2420_mcspi1_hwmod = { }, .slaves = omap2420_mcspi1_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_mcspi1_slaves), - .class = &omap2420_mcspi_class, - .dev_attr = &omap_mcspi1_dev_attr, + .class = &omap2xxx_mcspi_class, + .dev_attr = &omap_mcspi1_dev_attr, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), };
@@ -1621,8 +1414,8 @@ static struct omap_hwmod omap2420_mcspi2_hwmod = { }, .slaves = omap2420_mcspi2_slaves, .slaves_cnt = ARRAY_SIZE(omap2420_mcspi2_slaves), - .class = &omap2420_mcspi_class, - .dev_attr = &omap_mcspi2_dev_attr, + .class = &omap2xxx_mcspi_class, + .dev_attr = &omap_mcspi2_dev_attr, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), };
arch/arm/mach-omap2/omap_hwmod_2430_data.c +33 -240
514 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c +158 -70
237 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +123 -0
136 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +9 -96
189 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_common_data.h +11 -0
@@ -98,6 +98,17 @@ extern struct omap_hwmod_class l3_hwmod_class;extern struct omap_hwmod_class l4_hwmod_class;extern struct omap_hwmod_class mpu_hwmod_class;extern struct omap_hwmod_class iva_hwmod_class; +extern struct omap_hwmod_class omap2_uart_class; +extern struct omap_hwmod_class omap2_dss_hwmod_class; +extern struct omap_hwmod_class omap2_dispc_hwmod_class; +extern struct omap_hwmod_class omap2_rfbi_hwmod_class; +extern struct omap_hwmod_class omap2_venc_hwmod_class; +extern struct omap_hwmod_class omap2xxx_timer_hwmod_class; +extern struct omap_hwmod_class omap2xxx_wd_timer_hwmod_class; +extern struct omap_hwmod_class omap2xxx_gpio_hwmod_class; +extern struct omap_hwmod_class omap2xxx_dma_hwmod_class; +extern struct omap_hwmod_class omap2xxx_mailbox_hwmod_class; +extern struct omap_hwmod_class omap2xxx_mcspi_class;#endif