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

diff --cc Documentation/devicetree/bindings/serial/atmel-usart.txt
index 9c5d19ac935c335d88400b6724aaff75b5c99712,3adc61c2e4cafacd14ffb5610c0fae2b0c633e97..17c1042b2df895da595191fa8d8acd132fd546e8
--- 1/Documentation/devicetree/bindings/serial/atmel-usart.txt
--- 2/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 e47f5fd232f5f91e9a42b83beb8a21faddc6ac65,a43cf9567a8d528ed2c98e4cbfbde0097303dbac..787bb50a4dff442361b587a190283a659a059de6
--- 1/arch/arm/mach-at91/at91rm9200.c
--- 2/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/at91rm9200_time.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260.c
index 6c821e5621590b5e920d330a2d895b196b7530b9,5f8336460808df22df35abb42b51fe97a3e81a3f..c3d22be73b7cc99bc638192dce47f25ed0919821
--- 1/arch/arm/mach-at91/at91sam9260.c
--- 2/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 6276b4c1acfed2943354809b8b5f6ddd37bba9f9,f17d8dbd0b90187c91c77f3f7eb2df66e263456a..48b51f796d6ade7a7e029a6c4b1259b2d8494e60
--- 1/arch/arm/mach-at91/at91sam9261.c
--- 2/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 37b90f4b990c3ce4e5360c526ca979810277121c,fde9ea5fe3f9daca603bc4734697d3241edf3523..486530c3973b0abbbb9aed2302cb548742f30bac
--- 1/arch/arm/mach-at91/at91sam9263.c
--- 2/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/at91sam926x_time.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45.c
index 2f455ce35268513d5abaafc954a54be76ef48a26,045981f67c1315871abf30568e40a66c94d57f99..8c11696f606e7a74b18584042bf3dc77cc9ca352
--- 1/arch/arm/mach-at91/at91sam9g45.c
--- 2/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 3651517abedfb1214386cabd93d7ab82844d16aa,6a7d76dfdc87d12ec7917c35baca8a3f0a9dd9df..c0d5474706f872fc797d87d2826b41d589c110c7
--- 1/arch/arm/mach-at91/at91sam9rl.c
--- 2/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 590b52dea9f7a2c1da84440dd3c556ea06efcd8f,7afecb8a35b186c09df278180b523bffae9ac994..8bda1cefdf96ad500f84641cbcb8fa300c3b13df
--- 1/arch/arm/mach-at91/pm.c
--- 2/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-ep93xx/core.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/common.c
Simple merge

diff --cc arch/arm/mach-mmp/time.c
index 024022d91fe3e453dc4462fae847d12cb87dcdfa,fb57d1113f5c71e7ef9f10baf45698aaa8c7b96e..048997e75dd07d27b5a9216457d8a33cb591bd72
--- 1/arch/arm/mach-mmp/time.c
--- 2/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 6fd4acb8f18713b204e45d2c8a32f8854b061ae9,b4e7f2d133d9699a3e48be73d3e453ee4b5aa178..7aaac005e036a698fa33467ac4dd7026a46ffb9f
--- 1/arch/arm/mach-sa1100/time.c
--- 2/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>
  
 -static u32 notrace sa1100_read_sched_clock(void)
+ #define SA1100_CLOCK_FREQ 3686400
+ #define SA1100_LATCH DIV_ROUND_CLOSEST(SA1100_CLOCK_FREQ, HZ)
+ 
 +static u64 notrace sa1100_read_sched_clock(void)
  {
        return readl_relaxed(OSCR);
  }

diff --cc drivers/tty/serial/atmel_serial.c
Simple merge