From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 21 Jan 2014 21:26:33 +0000 (+0000)
Subject: Merge branches 'amba', 'fixes', 'kees', 'misc' and 'unstable/sa11x0' into for-next
X-Git-Tag: v3.14-rc1~116^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6f14d778c15fe08b6d98e759cf7e3893ed67b238;p=karo-tx-linux.git

Merge branches 'amba', 'fixes', 'kees', 'misc' and 'unstable/sa11x0' into for-next
---

6f14d778c15fe08b6d98e759cf7e3893ed67b238
diff --cc arch/arm/mach-footbridge/dc21285-timer.c
index 9ee78f7b4990,9ee78f7b4990,782f6c71fa0a,9ee78f7b4990,2babdbcaa691,9ee78f7b4990..3971104d32d4
--- a/arch/arm/mach-footbridge/dc21285-timer.c
+++ b/arch/arm/mach-footbridge/dc21285-timer.c
@@@@@@@ -102,5 -102,5 -103,5 -102,5 -121,21 -102,5 +122,21 @@@@@@@ void __init footbridge_timer_init(void
      	setup_irq(ce->irq, &footbridge_timer_irq);
      
      	ce->cpumask = cpumask_of(smp_processor_id());
-- ---	clockevents_config_and_register(ce, mem_fclk_21285, 0x4, 0xffffff);
++ +++	clockevents_config_and_register(ce, rate, 0x4, 0xffffff);
++ + +}
++++ +
++++ +static u32 notrace footbridge_read_sched_clock(void)
++++ +{
++++ +	return ~*CSR_TIMER3_VALUE;
++++ +}
++++ +
++++ +void __init footbridge_sched_clock(void)
++++ +{
++++ +	unsigned rate = DIV_ROUND_CLOSEST(mem_fclk_21285, 16);
++++ +
++++ +	*CSR_TIMER3_LOAD = 0;
++++ +	*CSR_TIMER3_CLR = 0;
++++ +	*CSR_TIMER3_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_DIV16;
++++ +
++++ +	setup_sched_clock(footbridge_read_sched_clock, 24, rate);
  +   }
diff --cc arch/arm/mm/dma-mapping.c
index f61a5707823a,79f8b39801a8,f61a5707823a,f0ea0134e5a3,f61a5707823a,f6b6bfa88ecf..1a77450e728a
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@@@@@@ -212,8 -173,32 -212,8 -173,32 -212,8 -176,34 +212,8 @@@@@@@ static u64 get_coherent_dma_mask(struc
      			return 0;
      		}
      
     -		max_dma_pfn = min(max_pfn, arm_dma_pfn_limit);
     -
 - - -		/*
 - - -		 * If the mask allows for more memory than we can address,
 - - -		 * and we actually have that much memory, then fail the
 - - -		 * allocation.
 - - -		 */
 - - -		if (sizeof(mask) != sizeof(dma_addr_t) &&
 - - -		    mask > (dma_addr_t)~0 &&
 - -  		    dma_to_pfn(dev, ~0) > arm_dma_pfn_limit) {
     -		    dma_to_pfn(dev, ~0) > max_dma_pfn) {
 - - -			dev_warn(dev, "Coherent DMA mask %#llx is larger than dma_addr_t allows\n",
 - - -				 mask);
 - - -			dev_warn(dev, "Driver did not use or check the return value from dma_set_coherent_mask()?\n");
 - - -			return 0;
 - - -		}
 - - -
 - - -		/*
 - - -		 * Now check that the mask, when translated to a PFN,
 - - -		 * fits within the allowable addresses which we can
 - - -		 * allocate.
 - - -		 */
 - -  		if (dma_to_pfn(dev, mask) < arm_dma_pfn_limit) {
     -		if (dma_to_pfn(dev, mask) < max_dma_pfn) {
 - - -			dev_warn(dev, "Coherent DMA mask %#llx (pfn %#lx-%#lx) covers a smaller range of system memory than the DMA zone pfn 0x0-%#lx\n",
 - - -				 mask,
 - - -				 dma_to_pfn(dev, 0), dma_to_pfn(dev, mask) + 1,
 - - -				 arm_dma_pfn_limit + 1);
 + + +		if (!__dma_supported(dev, mask, true))
      			return 0;
 - - -		}
      	}
      
      	return mask;