From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Mon, 24 Feb 2014 09:06:56 +0000 (+0100)
Subject: Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=51bcb6aae8471ae60f59a64a8b6891f3ea591c74;p=linux.git

Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux

This cleanup series gets rid of <mach/timex.h> for platforms not using
ARCH_MULTIPLATFORM. (For multi-platform code it's already unused since
387798b (ARM: initial multiplatform support).)

To make this work some code out of arch/arm needed to be adapted. The
respective changes got acks by their maintainers to be taken via armsoc
(with Andrew Morton substituting for Alessandro Zummo as rtc maintainer).

Compared to the previous pull request there was another patch added that
fixes a (non-critical) regression on ixp4xx. Olof Johansson asked to not
squash this fix into the original commit to save him from the need to
reverify the series.

Conflicts:
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-mmp/time.c
	arch/arm/mach-sa1100/time.c
---

51bcb6aae8471ae60f59a64a8b6891f3ea591c74
diff --cc Documentation/devicetree/bindings/serial/atmel-usart.txt
index 9c5d19ac935c3,3adc61c2e4caf..17c1042b2df89
--- a/Documentation/devicetree/bindings/serial/atmel-usart.txt
+++ b/Documentation/devicetree/bindings/serial/atmel-usart.txt
@@@ -29,10 -28,9 +31,11 @@@ Example
  		compatible = "atmel,at91sam9260-usart";
  		reg = <0xfff8c000 0x4000>;
  		interrupts = <7>;
 +		clocks = <&usart0_clk>;
 +		clock-names = "usart";
  		atmel,use-dma-rx;
  		atmel,use-dma-tx;
+ 		rts-gpios = <&pioD 15 0>;
  	};
  
  - use DMA:
diff --cc arch/arm/mach-at91/at91rm9200.c
index e47f5fd232f5f,a43cf9567a8d5..787bb50a4dff4
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@@ -19,8 -18,10 +19,9 @@@
  #include <asm/mach/map.h>
  #include <asm/system_misc.h>
  #include <mach/at91rm9200.h>
 -#include <mach/at91_pmc.h>
  #include <mach/at91_st.h>
  #include <mach/cpu.h>
+ #include <mach/hardware.h>
  
  #include "at91_aic.h"
  #include "soc.h"
diff --cc arch/arm/mach-at91/at91sam9260.c
index 6c821e5621590,5f8336460808d..c3d22be73b7cc
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@@ -21,6 -20,8 +21,7 @@@
  #include <mach/cpu.h>
  #include <mach/at91_dbgu.h>
  #include <mach/at91sam9260.h>
 -#include <mach/at91_pmc.h>
+ #include <mach/hardware.h>
  
  #include "at91_aic.h"
  #include "at91_rstc.h"
diff --cc arch/arm/mach-at91/at91sam9261.c
index 6276b4c1acfed,f17d8dbd0b901..48b51f796d6ad
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@@ -20,6 -19,8 +20,7 @@@
  #include <asm/system_misc.h>
  #include <mach/cpu.h>
  #include <mach/at91sam9261.h>
 -#include <mach/at91_pmc.h>
+ #include <mach/hardware.h>
  
  #include "at91_aic.h"
  #include "at91_rstc.h"
diff --cc arch/arm/mach-at91/at91sam9263.c
index 37b90f4b990c3,fde9ea5fe3f9d..486530c3973b0
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@@ -19,6 -18,8 +19,7 @@@
  #include <asm/mach/map.h>
  #include <asm/system_misc.h>
  #include <mach/at91sam9263.h>
 -#include <mach/at91_pmc.h>
+ #include <mach/hardware.h>
  
  #include "at91_aic.h"
  #include "at91_rstc.h"
diff --cc arch/arm/mach-at91/at91sam9g45.c
index 2f455ce352685,045981f67c131..8c11696f606e7
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@@ -19,7 -18,9 +19,8 @@@
  #include <asm/mach/map.h>
  #include <asm/system_misc.h>
  #include <mach/at91sam9g45.h>
 -#include <mach/at91_pmc.h>
  #include <mach/cpu.h>
+ #include <mach/hardware.h>
  
  #include "at91_aic.h"
  #include "soc.h"
diff --cc arch/arm/mach-at91/at91sam9rl.c
index 3651517abedfb,6a7d76dfdc87d..c0d5474706f87
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@@ -20,6 -19,8 +20,7 @@@
  #include <mach/cpu.h>
  #include <mach/at91_dbgu.h>
  #include <mach/at91sam9rl.h>
 -#include <mach/at91_pmc.h>
+ #include <mach/hardware.h>
  
  #include "at91_aic.h"
  #include "at91_rstc.h"
diff --cc arch/arm/mach-at91/pm.c
index 590b52dea9f7a,7afecb8a35b18..8bda1cefdf96a
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@@ -26,7 -25,9 +26,8 @@@
  #include <asm/mach/time.h>
  #include <asm/mach/irq.h>
  
 -#include <mach/at91_pmc.h>
  #include <mach/cpu.h>
+ #include <mach/hardware.h>
  
  #include "at91_aic.h"
  #include "generic.h"
diff --cc arch/arm/mach-mmp/time.c
index 024022d91fe3e,fb57d1113f5c7..048997e75dd07
--- a/arch/arm/mach-mmp/time.c
+++ b/arch/arm/mach-mmp/time.c
@@@ -195,7 -201,7 +201,7 @@@ void __init timer_init(int irq
  {
  	timer_config();
  
- 	sched_clock_register(mmp_read_sched_clock, 32, CLOCK_TICK_RATE);
 -	setup_sched_clock(mmp_read_sched_clock, 32, MMP_CLOCK_FREQ);
++	sched_clock_register(mmp_read_sched_clock, 32, MMP_CLOCK_FREQ);
  
  	ckevt.cpumask = cpumask_of(0);
  
diff --cc arch/arm/mach-sa1100/time.c
index 6fd4acb8f1871,b4e7f2d133d96..7aaac005e036a
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@@ -20,7 -21,10 +21,10 @@@
  #include <mach/hardware.h>
  #include <mach/irqs.h>
  
+ #define SA1100_CLOCK_FREQ 3686400
+ #define SA1100_LATCH DIV_ROUND_CLOSEST(SA1100_CLOCK_FREQ, HZ)
+ 
 -static u32 notrace sa1100_read_sched_clock(void)
 +static u64 notrace sa1100_read_sched_clock(void)
  {
  	return readl_relaxed(OSCR);
  }