From mboxrd@z Thu Jan 1 00:00:00 1970 From: Damian Hobson-Garcia Date: Wed, 12 Sep 2012 05:29:45 +0000 Subject: [RFC PATCH 2/2] ARM: shmobile: sh7372: Change VPU UIO to uio_dmem_genirq Message-Id: <1347427785-9767-3-git-send-email-dhobsong@igel.co.jp> List-Id: References: <1347427785-9767-1-git-send-email-dhobsong@igel.co.jp> In-Reply-To: <1347427785-9767-1-git-send-email-dhobsong@igel.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: horms@verge.net.au, magnus.damm@gmail.com Cc: hjk@hansjkoch.de, linux-sh@vger.kernel.org, hdk@igel.co.jp, linux-kernel@vger.kernel.org, Damian Hobson-Garcia This allows the VPU memory to be allocated dynamically only when it is needed. Signed-off-by: Damian Hobson-Garcia --- arch/arm/mach-shmobile/setup-sh7372.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c index 1106b4f..fe75701 100644 --- a/arch/arm/mach-shmobile/setup-sh7372.c +++ b/arch/arm/mach-shmobile/setup-sh7372.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -761,11 +762,19 @@ static struct platform_device usb_dma1_device = { }, }; +static unsigned int region_sizes[] = { + (32 << 20), +}; + /* VPU */ -static struct uio_info vpu_platform_data = { - .name = "VPU5HG", - .version = "0", - .irq = intcs_evt2irq(0x980), +static struct uio_dmem_genirq_pdata vpu_platform_data = { + .uioinfo = { + .name = "VPU5HG", + .version = "0", + .irq = intcs_evt2irq(0x980), + }, + .dynamic_region_sizes = region_sizes, + .num_dynamic_regions = ARRAY_SIZE(region_sizes), }; static struct resource vpu_resources[] = { @@ -778,7 +787,7 @@ static struct resource vpu_resources[] = { }; static struct platform_device vpu_device = { - .name = "uio_pdrv_genirq", + .name = "uio_dmem_genirq", .id = 0, .dev = { .platform_data = &vpu_platform_data, -- 1.7.5.4