Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v4 1/9] ARM: mmp: select pinctrl driver
From: Tony Lindgren @ 2012-11-08  1:38 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1352301582-12244-2-git-send-email-haojian.zhuang@gmail.com>

* Haojian Zhuang <haojian.zhuang@gmail.com> [121107 07:21]:
> Pinctrl driver is necessary for MMP DT & MMP2 DT platforms.
> 
> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> ---
>  arch/arm/mach-mmp/Kconfig |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig
> index 178d4da..ebdda83 100644
> --- a/arch/arm/mach-mmp/Kconfig
> +++ b/arch/arm/mach-mmp/Kconfig
> @@ -89,6 +89,8 @@ config MACH_MMP_DT
>  	select CPU_PXA168
>  	select CPU_PXA910
>  	select USE_OF
> +	select PINCTRL
> +	select PINCTRL_SINGLE
>  	help
>  	  Include support for Marvell MMP2 based platforms using
>  	  the device tree. Needn't select any other machine while
> @@ -99,6 +101,8 @@ config MACH_MMP2_DT
>  	depends on !CPU_MOHAWK
>  	select CPU_MMP2
>  	select USE_OF
> +	select PINCTRL
> +	select PINCTRL_SINGLE
>  	help
>  	  Include support for Marvell MMP2 based platforms using
>  	  the device tree.

I don't think you want to select PINCTRL_SINGLE here, you may want
to have it built as a module too in some cases.

Regards,

Tony

^ permalink raw reply
* [PATCH v2 00/26] Move OMAP2+ over to common clk framework
From: Tony Lindgren @ 2012-11-08  1:42 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20121108013140.17381.66421@nucleus>

Hi,

* Mike Turquette <mturquette@linaro.org> [121107 17:33]:
> Doh, I got the LAKML address wrong...
> 
> Thankfully it's already up on some archives:
> http://article.gmane.org/gmane.linux.ports.arm.omap/88824
> 
> For anyone interested in testing:
> git://git.linaro.org/people/mturquette/linux.git clk-omap-3.8
> 
> Regards,
> Mike
> 
> Quoting Mike Turquette (2012-11-07 17:12:35)
> > From: Mike Turquette <mturquette@linaro.org>
> > 
> > Hi all,
> > 
> > This series is based on top of Paul's PRM/CM clean-up work.  It is a
> > refresh of the patches Rajendra sent out a while back[1], with the
> > addition of several fixes for PM regressions[2] across several
> > platforms.
> > 
> > I have tested on OMAP4430 Panda including PRCM diffing against pre-CCF
> > patches (delta is zero) and also suspend/resume.
> > 
> > I also tested on OMAP4460 Panda-ES.  Boot is fine and PRCM programming
> > appears sane.  However Panda-ES never comes back from suspend/resume.
> > This problem exists on the PRM/CM branch I based on and was not
> > introduced by this series.  I am investigating that independently of
> > this series.

Cool! Do we still have some omaps that have issues booting with
these?

Regards,

Tony


> > Anyone wanting to pull the work can find it at:
> > git://git.linaro.org/people/mturquette/linux.git clk-omap-3.8
> > 
> > [1] http://article.gmane.org/gmane.linux.ports.arm.omap/78771
> > [2] http://article.gmane.org/gmane.linux.ports.arm.omap/84015

^ permalink raw reply
* [Resend PATCH v3 2/4] ARM: at91: atmel-ssc: add device tree support
From: Bo Shen @ 2012-11-08  1:50 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20121107151607.GC4576@game.jcrosoft.org>

Hi J,

On 11/7/2012 23:16, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 15:44 Wed 07 Nov     , Mark Brown wrote:
>> On Wed, Nov 07, 2012 at 03:30:46PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
>>
>>> the one via ASoC for the driver with the pinctrl for now but MUST add it later
>>
>>> the arch/arm related via AT91 tree where the pinctrl is mandatory in the dtsi
>>
>>> I'm no going to spend hours to do the pinctrl to test Bo patch that he is
>>> supposed to have deon to test this code
>>
>>> As basically today on DT none of the board will work if BO does no provide the
>>> pinctrl so for me he MUST put in the dtsi
>>
>>> is it ok with you?
>>
>> Or add the pinmux bindings for other IPs over in the pinmux branch and
>> the pinmux binding for SSC here (which will help with bisection as the
>> DT bindings for the audio will then always exist in conjunction with the
>> .dtsi changes for them).  Either way is fine with me; I'll leave things
>> as they are until I see some new patches.
> for where it's merge honestly I do not care much but the pinctrl must be
> handled correctly

I will send patches to add pinctrl support.
For atmel ssc driver, it is simple, however for dtsi, which point should 
I based on? which git and which branch? Because, I am not sure which 
branch on git://github.com/at91linux/linux-at91.git is the right point.

Thanks.

Best Regards,
Bo Shen

> Best Regards,
> J.
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

^ permalink raw reply
* [PATCH v2 00/26] Move OMAP2+ over to common clk framework
From: Mike Turquette @ 2012-11-08  1:54 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20121108014218.GY6801@atomide.com>

Quoting Tony Lindgren (2012-11-07 17:42:18)
> Hi,
> 
> * Mike Turquette <mturquette@linaro.org> [121107 17:33]:
> > Doh, I got the LAKML address wrong...
> > 
> > Thankfully it's already up on some archives:
> > http://article.gmane.org/gmane.linux.ports.arm.omap/88824
> > 
> > For anyone interested in testing:
> > git://git.linaro.org/people/mturquette/linux.git clk-omap-3.8
> > 
> > Regards,
> > Mike
> > 
> > Quoting Mike Turquette (2012-11-07 17:12:35)
> > > From: Mike Turquette <mturquette@linaro.org>
> > > 
> > > Hi all,
> > > 
> > > This series is based on top of Paul's PRM/CM clean-up work.  It is a
> > > refresh of the patches Rajendra sent out a while back[1], with the
> > > addition of several fixes for PM regressions[2] across several
> > > platforms.
> > > 
> > > I have tested on OMAP4430 Panda including PRCM diffing against pre-CCF
> > > patches (delta is zero) and also suspend/resume.
> > > 
> > > I also tested on OMAP4460 Panda-ES.  Boot is fine and PRCM programming
> > > appears sane.  However Panda-ES never comes back from suspend/resume.
> > > This problem exists on the PRM/CM branch I based on and was not
> > > introduced by this series.  I am investigating that independently of
> > > this series.
> 
> Cool! Do we still have some omaps that have issues booting with
> these?
> 

We shouldn't (fingers crossed).  I've just now stolen a Beagle and a
Bone to test, but I'm going to have to get bootloaders and a userspace
all set up for them which will take some time.

I believe Paul is planning on putting this series through his automated
test rig.

Regards,
Mike

> Regards,
> 
> Tony
> 
> 
> > > Anyone wanting to pull the work can find it at:
> > > git://git.linaro.org/people/mturquette/linux.git clk-omap-3.8
> > > 
> > > [1] http://article.gmane.org/gmane.linux.ports.arm.omap/78771
> > > [2] http://article.gmane.org/gmane.linux.ports.arm.omap/84015

^ permalink raw reply
* [PATCH v2 00/26] Move OMAP2+ over to common clk framework
From: Paul Walmsley @ 2012-11-08  2:50 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20121108015422.17381.81921@nucleus>

On Wed, 7 Nov 2012, Mike Turquette wrote:

> I believe Paul is planning on putting this series through his automated
> test rig.

Indeed and this is underway now.


- Paul

^ permalink raw reply
* [PATCH 2/4] ARM: EXYNOS: PL330 MDMA1 fix for revision 0 of Exynos4210 SOC
From: Kukjin Kim @ 2012-11-08  4:49 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <201210300956.23102.b.zolnierkie@samsung.com>

Bartlomiej Zolnierkiewicz wrote:
> 
> > Hmm...above change and adding definition of EXYNOS_PA_S_MDMA1 address
> > can fix the problem you commented on EXYNOS4210 Rev0 without others?...
> 
> The problem is affecting only EXYNOS4210 Rev0 and the fix is applied only
> for case when soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_0,
> or did you mean something else?
> 
Yeah, I know. I mean just adding secure mdma1 address is enough for
exynos4210 rev0.

8<-----
@@ -275,6 +275,9 @@ static int __init exynos_dma_init(void)
 		exynos_pdma1_pdata.nr_valid_peri =
 			ARRAY_SIZE(exynos4210_pdma1_peri);
 		exynos_pdma1_pdata.peri_id = exynos4210_pdma1_peri;
+
+		if (samsung_rev() == EXYNOS4210_REV_0)
+			exynos_mdma1_device.res.start = EXYNOS4_PA_S_MDMA1;
 	} else if (soc_is_exynos4212() || soc_is_exynos4412()) {
 		exynos_pdma0_pdata.nr_valid_peri =
 			ARRAY_SIZE(exynos4212_pdma0_peri);
diff --git a/arch/arm/mach-exynos/include/mach/map.h
b/arch/arm/mach-exynos/include/mach/map.h
index 8480849..0abfe78 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -90,6 +90,7 @@
 
 #define EXYNOS4_PA_MDMA0		0x10810000
 #define EXYNOS4_PA_MDMA1		0x12850000
+#define EXYNOS4_PA_S_MDMA1		0x12840000
 #define EXYNOS4_PA_PDMA0		0x12680000
 #define EXYNOS4_PA_PDMA1		0x12690000
 #define EXYNOS5_PA_MDMA0		0x10800000
8<----

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

^ permalink raw reply related
* [PATCH] ARM: EXYNOS5: Remove wrongly placed usb2.0 PHY_CFG definition from PMU_REG
From: Kukjin Kim @ 2012-11-08  4:52 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <003b01cda5f8$f84e35c0$e8eaa140$%han@samsung.com>

Jingoo Han wrote:
> 
> On Friday, October 05, 2012 10:27 PM Vivek Gautam wrote
> >
> > EXYNOS5_USB_CFG macro should actually point to USB20PHY_CFG
> > system register (base addr + 0x230). It's wrongly placed in regs-pmu.
> > Actual register at offset 0x230 in PMU is SEQ_TRANSITION4.
> >
> > Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
> 
> As you mentioned, this definition is wrong.
> So, it should be removed.
> 
> Reviewed-by: Jingoo Han <jg1.han@samsung.com>
> 
Applied, thanks.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

^ permalink raw reply
* [PATCH] ARM: EXYNOS: Make s3c_device_i2c0 always use id 0
From: Kukjin Kim @ 2012-11-08  4:52 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <509AA23C.6000704@gmail.com>

Sylwester Nawrocki wrote:
> 
> On 11/07/2012 02:00 PM, Tomasz Figa wrote:
> > This patch removes compatibility definitions added long time ago when
> > clock ids were used instead of devnames that were needed for platforms
> > with only one i2c controller with id -1 (some s3c24xx's).
> >
> > Because currently devname field is used for matching device instances to
> > clocks and if no devname is provided (as in clock-s3c2412.c and
> > common-s3c2443.c for i2c clock, both in arch/arm/mach-s3c24xx) the clock
> > is being matched only by name, so s3c_device_i2c0 can always have id 0.
> >
> > This patch solves the issue with i2c0 broken on boards where its the
> > only i2c controller used, tested on Origen.
> >
> > Signed-off-by: Tomasz Figa<t.figa@samsung.com>
> > Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com>
> 
> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> 
Applied, thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

^ permalink raw reply
* [PATCH] ARM: dts: exynos4: Add support for Exynos4x12 SoCs
From: Kukjin Kim @ 2012-11-08  4:52 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <3301517.VQVR99BHPc@amdc1227>

Tomasz Figa wrote:
> >
> > [...]
> >
> > > +/include/ "exynos4x12-pinctrl.dtsi"
> >
> > BTW, I think, above line should be added when exynos4x12-pinctrl patches
> > applied.
> 
> Yes, you are right. Seems like a rebase error on my side. Can you fix it
> or should I send a fixed version?
> 
I did, thanks ;-)

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

^ permalink raw reply
* [PATCH] [TRIVIAL] ARM: cns3xxx: drop unnessesary symbol selection
From: Imre Kaloz @ 2012-11-08  5:37 UTC (permalink / raw)
  To: linux-arm-kernel

ARCH_CNS3XXX already selects MIGHT_HAVE_PCI, so boards don't have to

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
---
 arch/arm/mach-cns3xxx/Kconfig |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig
index 29b13f2..9ebfcc4 100644
--- a/arch/arm/mach-cns3xxx/Kconfig
+++ b/arch/arm/mach-cns3xxx/Kconfig
@@ -3,7 +3,6 @@ menu "CNS3XXX platform type"
 
 config MACH_CNS3420VB
 	bool "Support for CNS3420 Validation Board"
-	select MIGHT_HAVE_PCI
 	help
 	  Include support for the Cavium Networks CNS3420 MPCore Platform
 	  Baseboard.
-- 
1.7.1

^ permalink raw reply related
* [PATCH] [TRIVIAL] ARM: cns3xxx: drop unnessesary symbol selection
From: Imre Kaloz @ 2012-11-08  5:57 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1352353029-2725-1-git-send-email-kaloz@openwrt.org>

s/unnessesary/unnecessary/ -- I should sleep more ;)

On Thu, 08 Nov 2012 06:37:09 +0100, Imre Kaloz <kaloz@openwrt.org> wrote:

> ARCH_CNS3XXX already selects MIGHT_HAVE_PCI, so boards don't have to
>
> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
> ---
>  arch/arm/mach-cns3xxx/Kconfig |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig
> index 29b13f2..9ebfcc4 100644
> --- a/arch/arm/mach-cns3xxx/Kconfig
> +++ b/arch/arm/mach-cns3xxx/Kconfig
> @@ -3,7 +3,6 @@ menu "CNS3XXX platform type"
> config MACH_CNS3420VB
>  	bool "Support for CNS3420 Validation Board"
> -	select MIGHT_HAVE_PCI
>  	help
>  	  Include support for the Cavium Networks CNS3420 MPCore Platform
>  	  Baseboard.

^ permalink raw reply
* [GIT PULL v2] Renesas ARM-based SoC boards for v3.8 #2
From: Simon Horman @ 2012-11-08  6:29 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1352338056-21107-1-git-send-email-horms@verge.net.au>

On Thu, Nov 08, 2012 at 10:27:29AM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> please consider the following board enhancements for 3.8.
> 
> * This pull-request is based on an earlier request which I
>   posted on the 1st and was merged yesterday: [GIT PULL v3] Renesas
>   ARM-based SoC boards for v3.8
> 
> * This pull request replaces the one that I sent yesterday:
>   [GIT PULL] Renesas ARM-based SoC boards for v3.8 #2
> 
> * Patch #2 of this series has a build-time dependency on
>   the soc pull request that I sent a few minutes ago:
>   [GIT PULL] Renesas ARM-based SoC for v3.8 #2
> 
>   In particular, "ARM: shmobile: marzen: add USB EHCI driver support"
>   depends on "[PATCH 1/7] ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx"
> 
> * Patch 4 of this pull-request is a driver patch which is a dependency
>   of patches 6 and 7 of this pull-request. I have spoken to the driver
>   maintainer, Paul Mundt, and he has indicated that he thinks it
>   is best to merge all in one go.
> 
>   In more detail:
> 
>   "sh: clkfwk: add sh_clk_fsidiv_register()" is a dependency of
>   - "ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks"
>   - "ARM: shmobile: r8a7740: add FSI-DVI clocks"

I have found some problems with this pull-request,
I will send an revised one.

^ permalink raw reply
* [GIT PULL] Renesas ARM-based SoC for v3.8 #2
From: Simon Horman @ 2012-11-08  6:30 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1352277298-23312-1-git-send-email-horms@verge.net.au>

On Wed, Nov 07, 2012 at 05:34:54PM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> please consider the following SoC enhancements for 3.8.
> 
> This series is based on the previous SoC series that I sent on Tuesday
> and was merged later that day: [GIT PULL v4] Renesas ARM-based SoC for v3.8


I have found some problems with this pull-request,
I will send an revised one.

> ----------------------------------------------------------------
> The following changes since commit 86bc52ef4373be64867b56f3a9e30cbabf64e0dd:
> 
>   ARM: shmobile: r8a7740: Enable PMU (2012-11-06 13:47:24 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc
> 
> for you to fetch changes up to 9d69f5b87e7f6df51ad2a70557474093de934a8c:
> 
>   ARM: shmobile: r8a7779: add USB OHCI clock support (2012-11-07 17:11:48 +0900)
> 
> ----------------------------------------------------------------
> Kuninori Morimoto (4):
>       ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx
>       ARM: shmobile: r8a7740: add USB24 clock explain
>       ARM: shmobile: r8a7779: add USB EHCI clock support
>       ARM: shmobile: r8a7779: add USB OHCI clock support
> 
>  arch/arm/mach-shmobile/clock-r8a7740.c        |   16 ++++++++++++++++
>  arch/arm/mach-shmobile/clock-r8a7779.c        |    7 +++++++
>  arch/arm/mach-shmobile/include/mach/r8a7779.h |    2 +-
>  arch/arm/mach-shmobile/pfc-r8a7779.c          |   16 ++++++++--------
>  4 files changed, 32 insertions(+), 9 deletions(-)
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

^ permalink raw reply
* [PATCH] mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls
From: Marek Szyprowski @ 2012-11-08  6:38 UTC (permalink / raw)
  To: linux-arm-kernel

dmapool always calls dma_alloc_coherent() with GFP_ATOMIC flag, regardless
the flags provided by the caller. This causes excessive pruning of
emergency memory pools without any good reason. This patch changes the code
to correctly use gfp flags provided by the dmapool caller. This should
solve the dmapool usage on ARM architecture, where GFP_ATOMIC DMA
allocations can be served only from the special, very limited memory pool.

Reported-by: Soren Moch <smoch@web.de>
Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 mm/dmapool.c |   27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/mm/dmapool.c b/mm/dmapool.c
index c5ab33b..86de9b2 100644
--- a/mm/dmapool.c
+++ b/mm/dmapool.c
@@ -62,8 +62,6 @@ struct dma_page {		/* cacheable header for 'allocation' bytes */
 	unsigned int offset;
 };
 
-#define	POOL_TIMEOUT_JIFFIES	((100 /* msec */ * HZ) / 1000)
-
 static DEFINE_MUTEX(pools_lock);
 
 static ssize_t
@@ -227,7 +225,6 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags)
 		memset(page->vaddr, POOL_POISON_FREED, pool->allocation);
 #endif
 		pool_initialise_page(pool, page);
-		list_add(&page->page_list, &pool->page_list);
 		page->in_use = 0;
 		page->offset = 0;
 	} else {
@@ -315,30 +312,21 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,
 	might_sleep_if(mem_flags & __GFP_WAIT);
 
 	spin_lock_irqsave(&pool->lock, flags);
- restart:
 	list_for_each_entry(page, &pool->page_list, page_list) {
 		if (page->offset < pool->allocation)
 			goto ready;
 	}
-	page = pool_alloc_page(pool, GFP_ATOMIC);
-	if (!page) {
-		if (mem_flags & __GFP_WAIT) {
-			DECLARE_WAITQUEUE(wait, current);
 
-			__set_current_state(TASK_UNINTERRUPTIBLE);
-			__add_wait_queue(&pool->waitq, &wait);
-			spin_unlock_irqrestore(&pool->lock, flags);
+	/* pool_alloc_page() might sleep, so temporarily drop &pool->lock */
+	spin_unlock_irqrestore(&pool->lock, flags);
 
-			schedule_timeout(POOL_TIMEOUT_JIFFIES);
+	page = pool_alloc_page(pool, mem_flags);
+	if (!page)
+		return NULL;
 
-			spin_lock_irqsave(&pool->lock, flags);
-			__remove_wait_queue(&pool->waitq, &wait);
-			goto restart;
-		}
-		retval = NULL;
-		goto done;
-	}
+	spin_lock_irqsave(&pool->lock, flags);
 
+	list_add(&page->page_list, &pool->page_list);
  ready:
 	page->in_use++;
 	offset = page->offset;
@@ -348,7 +336,6 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,
 #ifdef	DMAPOOL_DEBUG
 	memset(retval, POOL_POISON_ALLOCATED, pool->size);
 #endif
- done:
 	spin_unlock_irqrestore(&pool->lock, flags);
 	return retval;
 }
-- 
1.7.9.5

^ permalink raw reply related
* [PATCH v2 0/2] Enable ehci and ohci devices for exynos5250
From: Vivek Gautam @ 2012-11-08  6:54 UTC (permalink / raw)
  To: linux-arm-kernel

Changes from v1:
 - Changed the device node names from 'ehci' and 'ohci' to
   'usb at 12110000' and 'usb at 12120000' as per discussion for the
   change 'http://www.spinics.net/lists/linux-usb/msg73993.html'
 - Rebased on for-next branch of linux-samsung.

Vivek Gautam (2):
  ARM: Exynos5250: Enabling ehci-s5p driver
  ARM: Exynos5250: Enabling ohci-exynos driver

 .../devicetree/bindings/usb/exynos-usb.txt         |   40 ++++++++++++++++++++
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |    4 ++
 arch/arm/boot/dts/exynos5250.dtsi                  |   12 ++++++
 arch/arm/mach-exynos/include/mach/map.h            |    2 +
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    4 ++
 5 files changed, 62 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/usb/exynos-usb.txt

-- 
1.7.6.5

^ permalink raw reply
* [PATCH v2 1/2] ARM: Exynos5250: Enabling ehci-s5p driver
From: Vivek Gautam @ 2012-11-08  6:54 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1352357665-7435-1-git-send-email-gautam.vivek@samsung.com>

Adding EHCI device tree node for Exynos5250 along with
the device base adress and gpio line for vbus.

Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
---
 .../devicetree/bindings/usb/exynos-usb.txt         |   25 ++++++++++++++++++++
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |    4 +++
 arch/arm/boot/dts/exynos5250.dtsi                  |    6 ++++
 arch/arm/mach-exynos/include/mach/map.h            |    1 +
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 +
 5 files changed, 38 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/usb/exynos-usb.txt

diff --git a/Documentation/devicetree/bindings/usb/exynos-usb.txt b/Documentation/devicetree/bindings/usb/exynos-usb.txt
new file mode 100644
index 0000000..833f5cf
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/exynos-usb.txt
@@ -0,0 +1,25 @@
+Samsung Exynos SoC USB controller
+
+The USB devices interface with USB controllers on Exynos SOCs.
+The device node has following properties.
+
+EHCI
+Required properties:
+ - compatible: should be "samsung,exynos-ehci" for USB 2.0
+   EHCI controller in host mode.
+ - reg: physical base address of the controller and length of memory mapped
+   region.
+ - interrupts: interrupt number to the cpu.
+
+Optional properties:
+ - samsung,vbus-gpio:  if present, specifies the GPIO that
+   needs to be pulled up for the bus to be powered.
+
+Example:
+
+	usb at 12110000 {
+		compatible = "samsung,exynos-ehci";
+		reg = <0x12110000 0x100>;
+		interrupts = <0 71 0>;
+		samsung,vbus-gpio = <&gpx2 6 1 3 3>;
+	};
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 405009c..7c8064f 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -193,4 +193,8 @@
 	hdmi {
 		hpd-gpio = <&gpx3 7 0xf 1 3>;
 	};
+
+	usb at 12110000 {
+		samsung,vbus-gpio = <&gpx2 6 1 3 3>;
+	};
 };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index cf6a02d..2995445 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -238,6 +238,12 @@
 		#size-cells = <0>;
 	};
 
+	usb at 12110000 {
+		compatible = "samsung,exynos-ehci";
+		reg = <0x12110000 0x100>;
+		interrupts = <0 71 0>;
+	};
+
 	amba {
 		#address-cells = <1>;
 		#size-cells = <1>;
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index ef4958b..9a86b99 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -197,6 +197,7 @@
 #define EXYNOS4_PA_EHCI			0x12580000
 #define EXYNOS4_PA_OHCI			0x12590000
 #define EXYNOS4_PA_HSPHY		0x125B0000
+#define EXYNOS5_PA_EHCI			0x12110000
 #define EXYNOS4_PA_MFC			0x13400000
 
 #define EXYNOS4_PA_UART			0x13800000
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index ed37273..f60994e 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -86,6 +86,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
 				"exynos5-hdmi", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000,
 				"exynos5-mixer", NULL),
+	OF_DEV_AUXDATA("samsung,exynos-ehci", EXYNOS5_PA_EHCI,
+					"s5p-ehci", NULL),
 	{},
 };
 
-- 
1.7.6.5

^ permalink raw reply related
* [PATCH v2 2/2] ARM: Exynos5250: Enabling ohci-exynos driver
From: Vivek Gautam @ 2012-11-08  6:54 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1352357665-7435-1-git-send-email-gautam.vivek@samsung.com>

Adding OHCI device tree node for Exynos5250 along with
the device base address.

Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
---
 .../devicetree/bindings/usb/exynos-usb.txt         |   15 +++++++++++++++
 arch/arm/boot/dts/exynos5250.dtsi                  |    6 ++++++
 arch/arm/mach-exynos/include/mach/map.h            |    1 +
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 ++
 4 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/Documentation/devicetree/bindings/usb/exynos-usb.txt b/Documentation/devicetree/bindings/usb/exynos-usb.txt
index 833f5cf..5ff3def1 100644
--- a/Documentation/devicetree/bindings/usb/exynos-usb.txt
+++ b/Documentation/devicetree/bindings/usb/exynos-usb.txt
@@ -23,3 +23,18 @@ Example:
 		interrupts = <0 71 0>;
 		samsung,vbus-gpio = <&gpx2 6 1 3 3>;
 	};
+
+OHCI
+Required properties:
+ - compatible: should be "samsung,exynos-ohci" for USB 2.0
+   OHCI companion controller in host mode.
+ - reg: physical base address of the controller and length of memory mapped
+   region.
+ - interrupts: interrupt number to the cpu.
+
+Example:
+	usb at 12120000 {
+		compatible = "samsung,exynos-ohci";
+		reg = <0x12120000 0x100>;
+		interrupts = <0 71 0>;
+	};
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 2995445..f18abe0 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -244,6 +244,12 @@
 		interrupts = <0 71 0>;
 	};
 
+	usb at 12120000 {
+		compatible = "samsung,exynos-ohci";
+		reg = <0x12120000 0x100>;
+		interrupts = <0 71 0>;
+	};
+
 	amba {
 		#address-cells = <1>;
 		#size-cells = <1>;
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index 9a86b99..471ffaf 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -198,6 +198,7 @@
 #define EXYNOS4_PA_OHCI			0x12590000
 #define EXYNOS4_PA_HSPHY		0x125B0000
 #define EXYNOS5_PA_EHCI			0x12110000
+#define EXYNOS5_PA_OHCI			0x12120000
 #define EXYNOS4_PA_MFC			0x13400000
 
 #define EXYNOS4_PA_UART			0x13800000
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index f60994e..6348acb 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -88,6 +88,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
 				"exynos5-mixer", NULL),
 	OF_DEV_AUXDATA("samsung,exynos-ehci", EXYNOS5_PA_EHCI,
 					"s5p-ehci", NULL),
+	OF_DEV_AUXDATA("samsung,exynos-ohci", EXYNOS5_PA_OHCI,
+					"exynos-ohci", NULL),
 	{},
 };
 
-- 
1.7.6.5

^ permalink raw reply related
* [PATCH] ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
From: Igor Grinberg @ 2012-11-08  7:13 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <20121107173343.GF6801@atomide.com>

On 11/07/12 19:33, Tony Lindgren wrote:
> * Igor Grinberg <grinberg@compulab.co.il> [121107 06:44]:
>> CONFIG_OMAP_32K_TIMER is kind of standing on the single zImage way.
>> Make OMAP2+ timer code independant from the CONFIG_OMAP_32K_TIMER
>> setting.
>> To remove the dependancy, several conversions/additions had to be done:
>> 1) Timer structures and initialization functions are named by the platform
>>    name and the clock source in use. The decision which timer is
>>    used is done statically from the machine_desc structure. In the
>>    future it should come from DT.
>> 2) Settings under the CONFIG_OMAP_32K_TIMER option are expanded into
>>    separate timer structures along with the timer init functions.
>>    This removes the CONFIG_OMAP_32K_TIMER on OMAP2+ timer code.
> 
> I think this should be the default for the timers as that counter
> does not stop during deeper idle states.

Well, it is the default as you can see from the patch.
The problem is that for boards that for some reason do not have
the 32k wired and rely on MPU/GP timer source, the default will not work
and currently there is no way for board to specify which timer source
it can use.
We have discussed this in San Diego (remember?) and you actually proposed
this way as a solution. Well, may be I took it a bit further than you
thought, but this is because the board code cannot know which timer source
should be used at runtime and the fall back described below, does not work.

> 
>> 3) Since we have all the timers defined inside machine_desc structure
>>    and we no longer need the fallback to gp_timer clock source in case
>>    32k_timer clock source is unavailable (namely on AM33xx), we no
>>    longer need the #ifdef around __omap2_sync32k_clocksource_init()
>>    function. Remove the #ifdef CONFIG_OMAP_32K_TIMER around the
>>    __omap2_sync32k_clocksource_init() function.
>>
>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
>> Cc: Jon Hunter <jon-hunter@ti.com>
>> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
>> Cc: Vaibhav Hiremath <hvaibhav@ti.com>
>> ---
>> Finally I'm sending this out...
>> I've lost following Tony's branches and deciding which one to base on,
>> so I used linux-omap/master as a base for the patch.
>> Tony, tell me if you want it based on some other branch.
>> This has been compile tested on omap1|2plus_defconfig only.
> 
> Yes sorry it's been a bit crazy with branches to get this
> header clean up done.. If it applies to master it should
> be easy to apply on others.

No problem ;-)

> 
>> --- a/arch/arm/mach-omap2/board-2430sdp.c
>> +++ b/arch/arm/mach-omap2/board-2430sdp.c
>> @@ -284,6 +284,6 @@ MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board")
>>  	.handle_irq	= omap2_intc_handle_irq,
>>  	.init_machine	= omap_2430sdp_init,
>>  	.init_late	= omap2430_init_late,
>> -	.timer		= &omap2_timer,
>> +	.timer		= &omap2_sync32k_timer,
>>  	.restart	= omap_prcm_restart,
>>  MACHINE_END
>> --- a/arch/arm/mach-omap2/board-3430sdp.c
>> +++ b/arch/arm/mach-omap2/board-3430sdp.c
>> @@ -596,6 +596,6 @@ MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board")
>>  	.handle_irq	= omap3_intc_handle_irq,
>>  	.init_machine	= omap_3430sdp_init,
>>  	.init_late	= omap3430_init_late,
>> -	.timer		= &omap3_timer,
>> +	.timer		= &omap3_sync32k_timer,
>>  	.restart	= omap_prcm_restart,
>>  MACHINE_END
> ...
> 
> Can't we assume that the default timer is omap[234]_sync32k_timer to
> avoid renaming the timer entries in all the board files?

Hmmm...
How will this work with the macros defining the sys_timer structure?
I would also not want to hide the exact timer used under the default name.

> 
> Then we just need a new timer entries for the hardware that does
> not have the sycn32k_timer available?

Well, I tried to make it small patch just for the hardware that needs it,
but I always found some corner case where, IMHO, this does not work/look good.


-- 
Regards,
Igor.

^ permalink raw reply
* [PATCH 0/7] ARM: remove init_consistent_dma_size() stub
From: Marek Szyprowski @ 2012-11-08  7:46 UTC (permalink / raw)
  To: linux-arm-kernel

Hello,

Commit e9da6e9905e639b0 ("ARM: dma-mapping: remove custom consistent dma
region") replaced custom consistent memory handling, so setting
consistent dma memory size is not longer required. This patch series
cleans sub-architecture platform code to remove all calls to the
obsolated init_consistent_dma_size() function and finally removes the
init_consistent_dma_size() stub itself.

Arnd, Olof: could You apply it to arm-soc cleanup branch?

Best regards
Marek Szyprowski
Samsung Poland R&D Center

CC: Tony Lindgren <tony@atomide.com>
CC: Kukjin Kim <kgene.kim@samsung.com>
CC: Sekhar Nori <nsekhar@ti.com>
CC: Kevin Hilman <khilman@ti.com>
CC: Paul Mundt <lethal@linux-sh.org>
CC: Magnus Damm <magnus.damm@gmail.com>
CC: Nicolas Ferre <nicolas.ferre@atmel.com>
CC: Andrew Victor <linux@maxim.org.za>
CC: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
CC: Linus Walleij <linus.walleij@linaro.org>

Patch summary:

Marek Szyprowski (7):
  ARM: omap: remove obsoleted init_consistent_dma_size()
  ARM: samsung: remove obsoleted init_consistent_dma_size()
  ARM: davinci: remove obsoleted init_consistent_dma_size()
  ARM: shmobile: remove obsoleted init_consistent_dma_size()
  ARM: at91: remove obsoleted init_consistent_dma_size()
  ARM: u300: remove obsoleted init_consistent_dma_size()
  ARM: dma-mapping: remove init_consistent_dma_size() stub

 arch/arm/include/asm/dma-mapping.h     |    7 -------
 arch/arm/mach-at91/at91sam9g45.c       |    1 -
 arch/arm/mach-davinci/common.c         |    2 --
 arch/arm/mach-omap1/io.c               |    1 -
 arch/arm/mach-omap2/io.c               |   12 ------------
 arch/arm/mach-s3c64xx/common.c         |    1 -
 arch/arm/mach-s5p64x0/common.c         |    2 --
 arch/arm/mach-s5pv210/common.c         |    2 --
 arch/arm/mach-shmobile/setup-r8a7740.c |    6 ------
 arch/arm/mach-shmobile/setup-sh7372.c  |    6 ------
 arch/arm/mach-u300/core.c              |    2 --
 arch/arm/plat-omap/common.c            |    7 -------
 arch/arm/plat-omap/include/plat/dma.h  |    1 -
 13 files changed, 50 deletions(-)

-- 
1.7.9.5

^ permalink raw reply
* [PATCH 1/7] ARM: omap: remove obsoleted init_consistent_dma_size()
From: Marek Szyprowski @ 2012-11-08  7:46 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1352360783-17523-1-git-send-email-m.szyprowski@samsung.com>

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap1/io.c              |    1 -
 arch/arm/mach-omap2/io.c              |   12 ------------
 arch/arm/plat-omap/common.c           |    7 -------
 arch/arm/plat-omap/include/plat/dma.h |    1 -
 4 files changed, 21 deletions(-)

diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
index 6a5baab..b3d0fb3 100644
--- a/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@ -134,7 +134,6 @@ void __init omap1_init_early(void)
 	 */
 	omap1_clk_init();
 	omap1_mux_init();
-	omap_init_consistent_dma_size();
 }
 
 void __init omap1_init_late(void)
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 4234d28..2597846 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -354,11 +354,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data)
 	return omap_hwmod_set_postsetup_state(oh, *(u8 *)data);
 }
 
-static void __init omap_common_init_early(void)
-{
-	omap_init_consistent_dma_size();
-}
-
 static void __init omap_hwmod_init_postsetup(void)
 {
 	u8 postsetup_state;
@@ -379,7 +374,6 @@ void __init omap2420_init_early(void)
 {
 	omap2_set_globals_242x();
 	omap2xxx_check_revision();
-	omap_common_init_early();
 	omap2xxx_voltagedomains_init();
 	omap242x_powerdomains_init();
 	omap242x_clockdomains_init();
@@ -401,7 +395,6 @@ void __init omap2430_init_early(void)
 {
 	omap2_set_globals_243x();
 	omap2xxx_check_revision();
-	omap_common_init_early();
 	omap2xxx_voltagedomains_init();
 	omap243x_powerdomains_init();
 	omap243x_clockdomains_init();
@@ -428,7 +421,6 @@ void __init omap3_init_early(void)
 	omap2_set_globals_3xxx();
 	omap3xxx_check_revision();
 	omap3xxx_check_features();
-	omap_common_init_early();
 	omap3xxx_voltagedomains_init();
 	omap3xxx_powerdomains_init();
 	omap3xxx_clockdomains_init();
@@ -462,7 +454,6 @@ void __init ti81xx_init_early(void)
 	omap2_set_globals_ti81xx();
 	omap3xxx_check_revision();
 	ti81xx_check_features();
-	omap_common_init_early();
 	omap3xxx_voltagedomains_init();
 	omap3xxx_powerdomains_init();
 	omap3xxx_clockdomains_init();
@@ -520,7 +511,6 @@ void __init am33xx_init_early(void)
 	omap2_set_globals_am33xx();
 	omap3xxx_check_revision();
 	ti81xx_check_features();
-	omap_common_init_early();
 	am33xx_voltagedomains_init();
 	am33xx_powerdomains_init();
 	am33xx_clockdomains_init();
@@ -536,7 +526,6 @@ void __init omap4430_init_early(void)
 	omap2_set_globals_443x();
 	omap4xxx_check_revision();
 	omap4xxx_check_features();
-	omap_common_init_early();
 	omap44xx_voltagedomains_init();
 	omap44xx_powerdomains_init();
 	omap44xx_clockdomains_init();
@@ -558,7 +547,6 @@ void __init omap5_init_early(void)
 {
 	omap2_set_globals_5xxx();
 	omap5xxx_check_revision();
-	omap_common_init_early();
 }
 #endif
 
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 111315a..ab44d34 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -31,13 +31,6 @@ void __init omap_reserve(void)
 	omap_barrier_reserve_memblock();
 }
 
-void __init omap_init_consistent_dma_size(void)
-{
-#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE
-	init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20);
-#endif
-}
-
 /*
  * Stub function for OMAP2 so that common files
  * continue to build when custom builds are used
diff --git a/arch/arm/plat-omap/include/plat/dma.h b/arch/arm/plat-omap/include/plat/dma.h
index 0a87b05..f1b2ad3 100644
--- a/arch/arm/plat-omap/include/plat/dma.h
+++ b/arch/arm/plat-omap/include/plat/dma.h
@@ -449,7 +449,6 @@ struct omap_system_dma_plat_info {
 	u32 (*dma_read)(int reg, int lch);
 };
 
-extern void __init omap_init_consistent_dma_size(void);
 extern void omap_set_dma_priority(int lch, int dst_port, int priority);
 extern int omap_request_dma(int dev_id, const char *dev_name,
 			void (*callback)(int lch, u16 ch_status, void *data),
-- 
1.7.9.5

^ permalink raw reply related
* [PATCH 2/7] ARM: samsung: remove obsoleted init_consistent_dma_size()
From: Marek Szyprowski @ 2012-11-08  7:46 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1352360783-17523-1-git-send-email-m.szyprowski@samsung.com>

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: Kukjin Kim <kgene.kim@samsung.com>
---
 arch/arm/mach-s3c64xx/common.c |    1 -
 arch/arm/mach-s5p64x0/common.c |    2 --
 arch/arm/mach-s5pv210/common.c |    2 --
 3 files changed, 5 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c
index be746e3..aef303b 100644
--- a/arch/arm/mach-s3c64xx/common.c
+++ b/arch/arm/mach-s3c64xx/common.c
@@ -155,7 +155,6 @@ void __init s3c64xx_init_io(struct map_desc *mach_desc, int size)
 	/* initialise the io descriptors we need for initialisation */
 	iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));
 	iotable_init(mach_desc, size);
-	init_consistent_dma_size(SZ_8M);
 
 	/* detect cpu id */
 	s3c64xx_init_cpu();
diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c
index 111e404..8ae5800 100644
--- a/arch/arm/mach-s5p64x0/common.c
+++ b/arch/arm/mach-s5p64x0/common.c
@@ -187,7 +187,6 @@ void __init s5p6440_map_io(void)
 	s5p6440_default_sdhci2();
 
 	iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc));
-	init_consistent_dma_size(SZ_8M);
 }
 
 void __init s5p6450_map_io(void)
@@ -202,7 +201,6 @@ void __init s5p6450_map_io(void)
 	s5p6450_default_sdhci2();
 
 	iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6450_iodesc));
-	init_consistent_dma_size(SZ_8M);
 }
 
 /*
diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
index a0c50ef..9dfe93e 100644
--- a/arch/arm/mach-s5pv210/common.c
+++ b/arch/arm/mach-s5pv210/common.c
@@ -169,8 +169,6 @@ void __init s5pv210_init_io(struct map_desc *mach_desc, int size)
 
 void __init s5pv210_map_io(void)
 {
-	init_consistent_dma_size(14 << 20);
-
 	/* initialise device information early */
 	s5pv210_default_sdhci0();
 	s5pv210_default_sdhci1();
-- 
1.7.9.5

^ permalink raw reply related
* [PATCH 3/7] ARM: davinci: remove obsoleted init_consistent_dma_size()
From: Marek Szyprowski @ 2012-11-08  7:46 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1352360783-17523-1-git-send-email-m.szyprowski@samsung.com>

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: Sekhar Nori <nsekhar@ti.com>
CC: Kevin Hilman <khilman@ti.com>
---
 arch/arm/mach-davinci/common.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c
index 64b0f65..a794f6d 100644
--- a/arch/arm/mach-davinci/common.c
+++ b/arch/arm/mach-davinci/common.c
@@ -87,8 +87,6 @@ void __init davinci_common_init(struct davinci_soc_info *soc_info)
 		iotable_init(davinci_soc_info.io_desc,
 				davinci_soc_info.io_desc_num);
 
-	init_consistent_dma_size(14 << 20);
-
 	/*
 	 * Normally devicemaps_init() would flush caches and tlb after
 	 * mdesc->map_io(), but we must also do it here because of the CPU
-- 
1.7.9.5

^ permalink raw reply related
* [PATCH 4/7] ARM: shmobile: remove obsoleted init_consistent_dma_size()
From: Marek Szyprowski @ 2012-11-08  7:46 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1352360783-17523-1-git-send-email-m.szyprowski@samsung.com>

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: Paul Mundt <lethal@linux-sh.org>
CC: Magnus Damm <magnus.damm@gmail.com>
---
 arch/arm/mach-shmobile/setup-r8a7740.c |    6 ------
 arch/arm/mach-shmobile/setup-sh7372.c  |    6 ------
 2 files changed, 12 deletions(-)

diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 11bb1d9..96f1139 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -66,12 +66,6 @@ static struct map_desc r8a7740_io_desc[] __initdata = {
 void __init r8a7740_map_io(void)
 {
 	iotable_init(r8a7740_io_desc, ARRAY_SIZE(r8a7740_io_desc));
-
-	/*
-	 * DMA memory at 0xff200000 - 0xffdfffff. The default 2MB size isn't
-	 * enough to allocate the frame buffer memory.
-	 */
-	init_consistent_dma_size(12 << 20);
 }
 
 /* SCIFA0 */
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index a07954f..be6f746 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -58,12 +58,6 @@ static struct map_desc sh7372_io_desc[] __initdata = {
 void __init sh7372_map_io(void)
 {
 	iotable_init(sh7372_io_desc, ARRAY_SIZE(sh7372_io_desc));
-
-	/*
-	 * DMA memory@0xff200000 - 0xffdfffff. The default 2MB size isn't
-	 * enough to allocate the frame buffer memory.
-	 */
-	init_consistent_dma_size(12 << 20);
 }
 
 /* SCIFA0 */
-- 
1.7.9.5

^ permalink raw reply related
* [PATCH 5/7] ARM: at91: remove obsoleted init_consistent_dma_size()
From: Marek Szyprowski @ 2012-11-08  7:46 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1352360783-17523-1-git-send-email-m.szyprowski@samsung.com>

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: Nicolas Ferre <nicolas.ferre@atmel.com>
CC: Andrew Victor <linux@maxim.org.za>
CC: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
---
 arch/arm/mach-at91/at91sam9g45.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 84af1b5..b7ae124 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -343,7 +343,6 @@ static struct at91_gpio_bank at91sam9g45_gpio[] __initdata = {
 static void __init at91sam9g45_map_io(void)
 {
 	at91_init_sram(0, AT91SAM9G45_SRAM_BASE, AT91SAM9G45_SRAM_SIZE);
-	init_consistent_dma_size(SZ_4M);
 }
 
 static void __init at91sam9g45_ioremap_registers(void)
-- 
1.7.9.5

^ permalink raw reply related
* [PATCH 6/7] ARM: u300: remove obsoleted init_consistent_dma_size()
From: Marek Szyprowski @ 2012-11-08  7:46 UTC (permalink / raw)
  To: linux-arm-kernel
In-Reply-To: <1352360783-17523-1-git-send-email-m.szyprowski@samsung.com>

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-u300/core.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index b8efac4..d8632eb 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -82,8 +82,6 @@ static struct map_desc u300_io_desc[] __initdata = {
 static void __init u300_map_io(void)
 {
 	iotable_init(u300_io_desc, ARRAY_SIZE(u300_io_desc));
-	/* We enable a real big DMA buffer if need be. */
-	init_consistent_dma_size(SZ_4M);
 }
 
 /*
-- 
1.7.9.5

^ permalink raw reply related
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox