ARM: OMAP2+: Drop omap_hwmod_dma_info (c2b84a9b) · Commits · 戴 / test

arch/arm/mach-omap2/omap_device.c

+1 −154

Original line number	Diff line number	Diff line
		@@ -310,88 +310,6 @@ int omap_device_get_context_loss_count(struct platform_device *pdev)
		return ret;
		}

		/**
		* omap_device_count_resources - count number of struct resource entries needed
		* @od: struct omap_device *
		* @flags: Type of resources to include when counting (IRQ/DMA/MEM)
		*
		* Count the number of struct resource entries needed for this
		* omap_device @od. Used by omap_device_build_ss() to determine how
		* much memory to allocate before calling
		* omap_device_fill_resources(). Returns the count.
		*/
		static int omap_device_count_resources(struct omap_device *od,
		unsigned long flags)
		{
		int c = 0;
		int i;

		for (i = 0; i < od->hwmods_cnt; i++)
		c += omap_hwmod_count_resources(od->hwmods[i], flags);

		pr_debug("omap_device: %s: counted %d total resources across %d hwmods\n",
		od->pdev->name, c, od->hwmods_cnt);

		return c;
		}

		/**
		* omap_device_fill_resources - fill in array of struct resource
		* @od: struct omap_device *
		* @res: pointer to an array of struct resource to be filled in
		*
		* Populate one or more empty struct resource pointed to by @res with
		* the resource data for this omap_device @od. Used by
		* omap_device_build_ss() after calling omap_device_count_resources().
		* Ideally this function would not be needed at all. If omap_device
		* replaces platform_device, then we can specify our own
		* get_resource()/ get_irq()/etc functions that use the underlying
		* omap_hwmod information. Or if platform_device is extended to use
		* subarchitecture-specific function pointers, the various
		* platform_device functions can simply call omap_device internal
		* functions to get device resources. Hacking around the existing
		* platform_device code wastes memory. Returns 0.
		*/
		static int omap_device_fill_resources(struct omap_device *od,
		struct resource *res)
		{
		int i, r;

		for (i = 0; i < od->hwmods_cnt; i++) {
		r = omap_hwmod_fill_resources(od->hwmods[i], res);
		res += r;
		}

		return 0;
		}

		/**
		* _od_fill_dma_resources - fill in array of struct resource with dma resources
		* @od: struct omap_device *
		* @res: pointer to an array of struct resource to be filled in
		*
		* Populate one or more empty struct resource pointed to by @res with
		* the dma resource data for this omap_device @od. Used by
		* omap_device_alloc() after calling omap_device_count_resources().
		*
		* Ideally this function would not be needed at all. If we have
		* mechanism to get dma resources from DT.
		*
		* Returns 0.
		*/
		static int _od_fill_dma_resources(struct omap_device *od,
		struct resource *res)
		{
		int i, r;

		for (i = 0; i < od->hwmods_cnt; i++) {
		r = omap_hwmod_fill_dma_resources(od->hwmods[i], res);
		res += r;
		}

		return 0;
		}

		/**
		* omap_device_alloc - allocate an omap_device
		* @pdev: platform_device that will be included in this omap_device
		@@ -409,8 +327,7 @@ struct omap_device omap_device_alloc(struct platform_device pdev,
		{
		int ret = -ENOMEM;
		struct omap_device *od;
		struct resource *res = NULL;
		int i, res_count;
		int i;
		struct omap_hwmod **hwmods;

		od = kzalloc(sizeof(struct omap_device), GFP_KERNEL);
		@@ -426,74 +343,6 @@ struct omap_device omap_device_alloc(struct platform_device pdev,

		od->hwmods = hwmods;
		od->pdev = pdev;

		/*
		* Non-DT Boot:
		* Here, pdev->num_resources = 0, and we should get all the
		* resources from hwmod.
		*
		* DT Boot:
		* OF framework will construct the resource structure (currently
		* does for MEM & IRQ resource) and we should respect/use these
		* resources, killing hwmod dependency.
		* If pdev->num_resources > 0, we assume that MEM & IRQ resources
		* have been allocated by OF layer already (through DTB).
		* As preparation for the future we examine the OF provided resources
		* to see if we have DMA resources provided already. In this case
		* there is no need to update the resources for the device, we use the
		* OF provided ones.
		*
		* TODO: Once DMA resource is available from OF layer, we should
		* kill filling any resources from hwmod.
		*/
		if (!pdev->num_resources) {
		/* Count all resources for the device */
		res_count = omap_device_count_resources(od, IORESOURCE_IRQ \|
		IORESOURCE_DMA \|
		IORESOURCE_MEM);
		} else {
		/* Take a look if we already have DMA resource via DT */
		for (i = 0; i < pdev->num_resources; i++) {
		struct resource *r = &pdev->resource[i];

		/* We have it, no need to touch the resources */
		if (r->flags == IORESOURCE_DMA)
		goto have_everything;
		}
		/* Count only DMA resources for the device */
		res_count = omap_device_count_resources(od, IORESOURCE_DMA);
		/* The device has no DMA resource, no need for update */
		if (!res_count)
		goto have_everything;

		res_count += pdev->num_resources;
		}

		/* Allocate resources memory to account for new resources */
		res = kzalloc(sizeof(struct resource) * res_count, GFP_KERNEL);
		if (!res)
		goto oda_exit3;

		if (!pdev->num_resources) {
		dev_dbg(&pdev->dev, "%s: using %d resources from hwmod\n",
		__func__, res_count);
		omap_device_fill_resources(od, res);
		} else {
		dev_dbg(&pdev->dev,
		"%s: appending %d DMA resources from hwmod\n",
		__func__, res_count - pdev->num_resources);
		memcpy(res, pdev->resource,
		sizeof(struct resource) * pdev->num_resources);
		_od_fill_dma_resources(od, &res[pdev->num_resources]);
		}

		ret = platform_device_add_resources(pdev, res, res_count);
		kfree(res);

		if (ret)
		goto oda_exit3;

		have_everything:
		pdev->archdata.od = od;

		for (i = 0; i < oh_cnt; i++) {
		@@ -503,8 +352,6 @@ have_everything:

		return od;

		oda_exit3:
		kfree(hwmods);
		oda_exit2:
		kfree(od);
		oda_exit1:

arch/arm/mach-omap2/omap_hwmod.c

+3 −116

Original line number	Diff line number	Diff line
		@@ -1101,29 +1101,6 @@ static int _omap4_wait_target_disable(struct omap_hwmod *oh)
		oh->prcm.omap4.clkctrl_offs, 0);
		}

		/**
		* _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-1;
		}

		/**
		* _count_ocp_if_addr_spaces - count the number of address space entries for @oh
		* @oh: struct omap_hwmod *oh
		@@ -1147,49 +1124,6 @@ static int _count_ocp_if_addr_spaces(struct omap_hwmod_ocp_if *os)
		return i-1;
		}

		/**
		* _get_sdma_req_by_name - fetch SDMA request line ID by name
		* @oh: struct omap_hwmod * to operate on
		* @name: pointer to the name of the SDMA request line to fetch (optional)
		* @dma: pointer to an unsigned int to store the request line ID to
		*
		* Retrieve an SDMA request line ID named by @name on the IP block
		* pointed to by @oh. The ID will be filled into the address pointed
		* to by @dma. When @name is non-null, the request line ID associated
		* with the named entry will be returned. If @name is null, the first
		* matching entry will be returned. Data order is not meaningful in
		* hwmod data, so callers are strongly encouraged to use a non-null
		* @name whenever possible to avoid unpredictable effects if hwmod
		* data is later added that causes data ordering to change. Returns 0
		* upon success or a negative error code upon error.
		*/
		static int _get_sdma_req_by_name(struct omap_hwmod oh, const char name,
		unsigned int *dma)
		{
		int i;
		bool found = false;

		if (!oh->sdma_reqs)
		return -ENOENT;

		i = 0;
		while (oh->sdma_reqs[i].dma_req != -1) {
		if (name == oh->sdma_reqs[i].name \|\|
		!strcmp(name, oh->sdma_reqs[i].name)) {
		found = true;
		break;
		}
		i++;
		}

		if (!found)
		return -ENOENT;

		*dma = oh->sdma_reqs[i].dma_req;

		return 0;
		}

		/**
		* _get_addr_space_by_name - fetch address space start & end by name
		* @oh: struct omap_hwmod * to operate on
		@@ -3385,9 +3319,6 @@ int omap_hwmod_count_resources(struct omap_hwmod *oh, unsigned long flags)
		{
		int ret = 0;

		if (flags & IORESOURCE_DMA)
		ret += _count_sdma_reqs(oh);

		if (flags & IORESOURCE_MEM) {
		struct omap_hwmod_ocp_if *os;

		@@ -3411,19 +3342,10 @@ int omap_hwmod_count_resources(struct omap_hwmod *oh, unsigned long flags)
		int omap_hwmod_fill_resources(struct omap_hwmod oh, struct resource res)
		{
		struct omap_hwmod_ocp_if *os;
		int i, j, sdma_reqs_cnt, addr_cnt;
		int j, addr_cnt;
		int r = 0;

		/* For each DMA, memory area, fill in array.*/

		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;
		(res + r)->flags = IORESOURCE_DMA;
		r++;
		}
		/* For each memory area, fill in array.*/

		list_for_each_entry(os, &oh->slave_ports, node) {
		addr_cnt = _count_ocp_if_addr_spaces(os);
		@@ -3440,33 +3362,6 @@ int omap_hwmod_fill_resources(struct omap_hwmod oh, struct resource res)
		return r;
		}

		/**
		* omap_hwmod_fill_dma_resources - fill struct resource array with dma data
		* @oh: struct omap_hwmod *
		* @res: pointer to the array of struct resource to fill
		*
		* Fill the struct resource array @res with dma resource data from the
		* omap_hwmod @oh. Intended to be called by code that registers
		* omap_devices. See also omap_hwmod_count_resources(). Returns the
		* number of array elements filled.
		*/
		int omap_hwmod_fill_dma_resources(struct omap_hwmod oh, struct resource res)
		{
		int i, sdma_reqs_cnt;
		int r = 0;

		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;
		(res + r)->flags = IORESOURCE_DMA;
		r++;
		}

		return r;
		}

		/**
		* omap_hwmod_get_resource_byname - fetch IP block integration data by name
		* @oh: struct omap_hwmod * to operate on
		@@ -3493,20 +3388,12 @@ int omap_hwmod_get_resource_byname(struct omap_hwmod *oh, unsigned int type,
		const char name, struct resource rsrc)
		{
		int r;
		unsigned int dma;
		u32 pa_start, pa_end;

		if (!oh \|\| !rsrc)
		return -EINVAL;

		if (type == IORESOURCE_DMA) {
		r = _get_sdma_req_by_name(oh, name, &dma);
		if (r)
		return r;

		rsrc->start = dma;
		rsrc->end = dma;
		} else if (type == IORESOURCE_MEM) {
		if (type == IORESOURCE_MEM) {
		r = _get_addr_space_by_name(oh, name, &pa_start, &pa_end);
		if (r)
		return r;

arch/arm/mach-omap2/omap_hwmod.h

+0 −17

Original line number	Diff line number	Diff line
		@@ -149,20 +149,6 @@ extern struct omap_hwmod_sysc_fields omap_hwmod_sysc_type3;
		#define DEBUG_AM33XXUART1_FLAGS DEBUG_OMAPUART_FLAGS
		#endif

		/**
		* 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 (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
		* hwmod.
		*/
		struct omap_hwmod_dma_info {
		const char *name;
		s16 dma_req;
		};

		/**
		* struct omap_hwmod_rst_info - IPs reset lines use by hwmod
		* @name: name of the reset line (module local name)
		@@ -598,7 +584,6 @@ struct omap_hwmod_class {
		* @name: name of the hwmod
		* @class: struct omap_hwmod_class * to the class of this hwmod
		* @od: struct omap_device currently associated with this hwmod (internal use)
		* @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)
		@@ -641,7 +626,6 @@ struct omap_hwmod {
		const char *name;
		struct omap_hwmod_class *class;
		struct omap_device *od;
		struct omap_hwmod_dma_info *sdma_reqs;
		struct omap_hwmod_rst_info *rst_lines;
		union {
		struct omap_hwmod_omap2_prcm omap2;
		@@ -697,7 +681,6 @@ int omap_hwmod_softreset(struct omap_hwmod *oh);

		int omap_hwmod_count_resources(struct omap_hwmod *oh, unsigned long flags);
		int omap_hwmod_fill_resources(struct omap_hwmod oh, struct resource res);
		int omap_hwmod_fill_dma_resources(struct omap_hwmod oh, struct resource res);
		int omap_hwmod_get_resource_byname(struct omap_hwmod *oh, unsigned int type,
		const char name, struct resource res);

arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -20,11 +20,6 @@
		#include "prm-regbits-24xx.h"
		#include "wd_timer.h"

		static struct omap_hwmod_dma_info omap2xxx_dss_sdma_chs[] = {
		{ .name = "dispc", .dma_req = 5 },
		{ .dma_req = -1, },
		};

		/*
		* 'dispc' class
		* display controller
		@@ -550,7 +545,6 @@ struct omap_hwmod omap2xxx_dss_core_hwmod = {
		.name = "dss_core",
		.class = &omap2_dss_hwmod_class,
		.main_clk = "dss1_fck", /* instead of dss_fck */
		.sdma_reqs = omap2xxx_dss_sdma_chs,
		.prcm = {
		.omap2 = {
		.prcm_reg_id = 1,

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -565,12 +565,6 @@ static struct omap_hwmod_class i2c_class = {
		.reset = &omap_i2c_reset,
		};

		static struct omap_hwmod_dma_info omap3xxx_dss_sdma_chs[] = {
		{ .name = "dispc", .dma_req = 5 },
		{ .name = "dsi1", .dma_req = 74 },
		{ .dma_req = -1, },
		};

		/* dss */
		static struct omap_hwmod_opt_clk dss_opt_clks[] = {
		/*
		@@ -587,7 +581,6 @@ static struct omap_hwmod omap3430es1_dss_core_hwmod = {
		.name = "dss_core",
		.class = &omap2_dss_hwmod_class,
		.main_clk = "dss1_alwon_fck", /* instead of dss_fck */
		.sdma_reqs = omap3xxx_dss_sdma_chs,
		.prcm = {
		.omap2 = {
		.prcm_reg_id = 1,
		@@ -607,7 +600,6 @@ static struct omap_hwmod omap3xxx_dss_core_hwmod = {
		.flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
		.class = &omap2_dss_hwmod_class,
		.main_clk = "dss1_alwon_fck", /* instead of dss_fck */
		.sdma_reqs = omap3xxx_dss_sdma_chs,
		.prcm = {
		.omap2 = {
		.prcm_reg_id = 1,

Admin message