x86/olpc changes for v3.1

Linus,

Please pull the latest x86-olpc-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-olpc-for-linus

out-of-topic modifications in x86-olpc-for-linus:
-------------------------------------------------
include/linux/cs5535.h # cfee959: x86, olpc: Add XO-1 RTC driver

                                   # 2cf2bae: x86, olpc-xo1-sci: Add lid switch
                                   # 7bc74b3: x86, olpc-xo1-sci: Add GPE handle
                                   # 7feda8e: x86, olpc: Add XO-1 SCI driver an
                                   # 97c4cb7: x86, olpc: Add XO-1 suspend/resum
                                   # 7a0d4fc: x86, olpc: Move CS5536-related co

Thanks,

Ingo

------------------>
Daniel Drake (13):
x86, olpc: Add missing elements to device tree
x86, olpc: Move CS5536-related constants to cs5535.h x86, olpc: Rename olpc-xo1 to olpc-xo1-pm
x86, olpc: Add XO-1 suspend/resume support
x86, olpc: Add XO-1 SCI driver and power button control x86, olpc: EC SCI wakeup mask functionality
x86, olpc-xo1-sci: Add GPE handler and ebook switch functionality x86, olpc-xo1-sci: Add lid switch functionality
x86, olpc-xo1-sci: Propagate power supply/battery events x86, olpc: Add XO-1 RTC driver
x86, olpc: Add XO-1.5 SCI driver
x86, olpc: Fix dependency on POWER_SUPPLY
x86, olpc-xo15-sci: Enable EC wakeup capability

 .../devicetree/bindings/rtc/olpc-xo1-rtc.txt       |    5 +
 arch/x86/Kconfig                                   |   43 ++-
 arch/x86/include/asm/olpc.h                        |   51 ++-
 arch/x86/platform/olpc/Makefile                    |    5 +-
 arch/x86/platform/olpc/olpc-xo1-pm.c               |  215 +++++++
 arch/x86/platform/olpc/olpc-xo1-rtc.c              |   81 +++
 arch/x86/platform/olpc/olpc-xo1-sci.c              |  614 ++++++++++++++++++++
 arch/x86/platform/olpc/olpc-xo1.c                  |  146 -----
 arch/x86/platform/olpc/olpc-xo15-sci.c             |  168 ++++++
 arch/x86/platform/olpc/olpc.c                      |   95 +++
 arch/x86/platform/olpc/olpc_dt.c                   |  103 ++++
 arch/x86/platform/olpc/xo1-wakeup.S                |  124 ++++
 include/linux/cs5535.h                             |   60 ++
 13 files changed, 1547 insertions(+), 163 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/rtc/olpc-xo1-rtc.txt
 create mode 100644 arch/x86/platform/olpc/olpc-xo1-pm.c
 create mode 100644 arch/x86/platform/olpc/olpc-xo1-rtc.c
 create mode 100644 arch/x86/platform/olpc/olpc-xo1-sci.c
 delete mode 100644 arch/x86/platform/olpc/olpc-xo1.c
 create mode 100644 arch/x86/platform/olpc/olpc-xo15-sci.c
 create mode 100644 arch/x86/platform/olpc/xo1-wakeup.S

new file mode 100644
index 0000000..a2891ce
@@ -0,0 +1,5 @@
+OLPC XO-1 RTC
+~~~~~~~~~~~~~
+
+Required properties:
+ - compatible : "olpc,xo1-rtc"

index 81c5e21..fd332c5 100644
@@ -1,2 +1,5 @@
 obj-$(CONFIG_OLPC)		+= olpc.o olpc_ofw.o olpc_dt.o
-obj-$(CONFIG_OLPC_XO1)		+= olpc-xo1.o
+obj-$(CONFIG_OLPC_XO1_PM)		+= olpc-xo1-pm.o xo1-wakeup.o
+obj-$(CONFIG_OLPC_XO1_RTC)	+= olpc-xo1-rtc.o
+obj-$(CONFIG_OLPC_XO1_SCI)	+= olpc-xo1-sci.o
+obj-$(CONFIG_OLPC_XO15_SCI)	+= olpc-xo15-sci.o