microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

OMAP: hwmod: Rename dma_ch to dma_req 

The dma request line attribute was named dma channel, which leads
to confusion with the real dma channel definition.

Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Kevin Hilman <khilman@deeprootsystems.com>
This commit is contained in:
Benoit Cousson 2010-09-21 10:34:08 -06:00 коммит произвёл Paul Walmsley
Родитель b30a3f6257
Коммит 9ee9fff92e
2 изменённых файлов: 11 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
arch/arm/mach-omap2/omap_hwmod.c
Просмотреть файл

@ -1468,7 +1468,7 @@ int omap_hwmod_count_resources(struct omap_hwmod *oh)
{ {
int ret, i; int ret, i;
ret = oh->mpu_irqs_cnt + oh->sdma_chs_cnt; ret = oh->mpu_irqs_cnt + oh->sdma_reqs_cnt;
for (i = 0; i < oh->slaves_cnt; i++) for (i = 0; i < oh->slaves_cnt; i++)
ret += oh->slaves[i]->addr_cnt; ret += oh->slaves[i]->addr_cnt;
@ -1501,10 +1501,10 @@ int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res)
r++; r++;
} }
for (i = 0; i < oh->sdma_chs_cnt; i++) { for (i = 0; i < oh->sdma_reqs_cnt; i++) {
(res + r)->name = (oh->sdma_chs + i)->name; (res + r)->name = (oh->sdma_reqs + i)->name;
(res + r)->start = (oh->sdma_chs + i)->dma_ch; (res + r)->start = (oh->sdma_reqs + i)->dma_req;
(res + r)->end = (oh->sdma_chs + i)->dma_ch; (res + r)->end = (oh->sdma_reqs + i)->dma_req;
(res + r)->flags = IORESOURCE_DMA; (res + r)->flags = IORESOURCE_DMA;
r++; r++;
} }

12
arch/arm/plat-omap/include/plat/omap_hwmod.h
Просмотреть файл

@ -96,7 +96,7 @@ struct omap_hwmod_irq_info {
/** /**
* struct omap_hwmod_dma_info - DMA channels used by the hwmod * struct omap_hwmod_dma_info - DMA channels used by the hwmod
* @name: name of the DMA channel (module local name) * @name: name of the DMA channel (module local name)
* @dma_ch: DMA channel ID * @dma_req: DMA request ID
* *
* @name should be something short, e.g., "tx" or "rx". It is for use * @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 * by platform_get_resource_byname(). It is defined locally to the
@ -104,7 +104,7 @@ struct omap_hwmod_irq_info {
*/ */
struct omap_hwmod_dma_info { struct omap_hwmod_dma_info {
const char *name; const char *name;
u16 dma_ch; u16 dma_req;
}; };
/** /**
@ -410,7 +410,7 @@ struct omap_hwmod_class {
* @class: struct omap_hwmod_class * to the class of this hwmod * @class: struct omap_hwmod_class * to the class of this hwmod
* @od: struct omap_device currently associated with this hwmod (internal use) * @od: struct omap_device currently associated with this hwmod (internal use)
* @mpu_irqs: ptr to an array of MPU IRQs (see also mpu_irqs_cnt) * @mpu_irqs: ptr to an array of MPU IRQs (see also mpu_irqs_cnt)
* @sdma_chs: ptr to an array of SDMA channel IDs (see also sdma_chs_cnt) * @sdma_reqs: ptr to an array of System DMA request IDs (see sdma_reqs_cnt)
* @prcm: PRCM data pertaining to this hwmod * @prcm: PRCM data pertaining to this hwmod
* @main_clk: main clock: OMAP clock name * @main_clk: main clock: OMAP clock name
* @_clk: pointer to the main struct clk (filled in at runtime) * @_clk: pointer to the main struct clk (filled in at runtime)
@ -424,7 +424,7 @@ struct omap_hwmod_class {
* @msuspendmux_reg_id: CONTROL_MSUSPENDMUX register ID (1-6) * @msuspendmux_reg_id: CONTROL_MSUSPENDMUX register ID (1-6)
* @msuspendmux_shift: CONTROL_MSUSPENDMUX register bit shift * @msuspendmux_shift: CONTROL_MSUSPENDMUX register bit shift
* @mpu_irqs_cnt: number of @mpu_irqs * @mpu_irqs_cnt: number of @mpu_irqs
* @sdma_chs_cnt: number of @sdma_chs * @sdma_reqs_cnt: number of @sdma_reqs
* @opt_clks_cnt: number of @opt_clks * @opt_clks_cnt: number of @opt_clks
* @master_cnt: number of @master entries * @master_cnt: number of @master entries
* @slaves_cnt: number of @slave entries * @slaves_cnt: number of @slave entries
@ -448,7 +448,7 @@ struct omap_hwmod {
struct omap_hwmod_class *class; struct omap_hwmod_class *class;
struct omap_device *od; struct omap_device *od;
struct omap_hwmod_irq_info *mpu_irqs; struct omap_hwmod_irq_info *mpu_irqs;
struct omap_hwmod_dma_info *sdma_chs; struct omap_hwmod_dma_info *sdma_reqs;
union { union {
struct omap_hwmod_omap2_prcm omap2; struct omap_hwmod_omap2_prcm omap2;
struct omap_hwmod_omap4_prcm omap4; struct omap_hwmod_omap4_prcm omap4;
@ -468,7 +468,7 @@ struct omap_hwmod {
u8 msuspendmux_shift; u8 msuspendmux_shift;
u8 response_lat; u8 response_lat;
u8 mpu_irqs_cnt; u8 mpu_irqs_cnt;
u8 sdma_chs_cnt; u8 sdma_reqs_cnt;
u8 opt_clks_cnt; u8 opt_clks_cnt;
u8 masters_cnt; u8 masters_cnt;
u8 slaves_cnt; u8 slaves_cnt;