Skip to contentSkip to conversation

x86/platform changes for v3.17

GIT PULL Ingo Molnar 1 participant 1 message Aug 4, 2014 x86

lore
Share & tools
lore
#0 lore raw

Linus,

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

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

# HEAD: 4c51cb005b29e6329d7e598bf835689b230817c9 x86/pmc_atom: Silence shift wrapping warnings in pmc_sleep_tmr_show()

The main changes in this cycle are:

* Intel SOC driver updates, by Aubrey Li.

* TS5500 platform updates, by Vivien Didelot.

Thanks,

Ingo

------------------>
Dan Carpenter (1):
x86/pmc_atom: Silence shift wrapping warnings in pmc_sleep_tmr_show()

Li, Aubrey (3):
x86/platform: New Intel Atom SOC power management controller driver x86/pmc_atom: Eisable a few S0ix wake up events for S0ix residency x86/pmc_atom: Expose PMC device state and platform sleep state

Vivien Didelot (3):

      x86/platform/ts5500: Use the DEVICE_ATTR_RO() macro
      x86/platform/ts5500: Add a 'name' sysfs attribute
      x86/platform/ts5500: Add support for TS-5400 boards
 Documentation/ABI/testing/sysfs-platform-ts5500 |   7 +
 arch/x86/Kconfig                                |   4 +
 arch/x86/include/asm/pmc_atom.h                 | 107 ++++++++
 arch/x86/kernel/Makefile                        |   1 +
 arch/x86/kernel/pmc_atom.c                      | 321 ++++++++++++++++++++++++
 arch/x86/platform/ts5500/ts5500.c               |  94 ++++---
 6 files changed, 493 insertions(+), 41 deletions(-)
 create mode 100644 arch/x86/include/asm/pmc_atom.h
 create mode 100644 arch/x86/kernel/pmc_atom.c
Documentation/ABI/testing/sysfs-platform-ts5500 +7 -0
index c88375a..e685957 100644
@@ -30,6 +30,13 @@ Description:
 		the corresponding bit is set. For instance, 0x0e means jumpers
 		2, 3 and 4 are set.
 
+What:		/sys/devices/platform/ts5500/name
+Date:		July 2014
+KernelVersion:	3.16
+Contact:	"Savoir-faire Linux Inc." <[email protected]>
+Description:
+		Model name of the TS board, e.g. "TS-5500".
+
 What:		/sys/devices/platform/ts5500/rs485
 Date:		January 2013
 KernelVersion:	3.7
arch/x86/Kconfig +4 -0
index a8f749e..6295a21 100644
@@ -2403,6 +2403,10 @@ config IOSF_MBI
 	default m
 	depends on PCI
 
+config PMC_ATOM
+	def_bool y
+        depends on PCI
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"
arch/x86/include/asm/pmc_atom.h new file +107 -0

107 lines not on this page · raw message

arch/x86/kernel/Makefile +1 -0
index 047f9ff..bde3993 100644
@@ -106,6 +106,7 @@ obj-$(CONFIG_EFI)			+= sysfb_efi.o
 obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o
 obj-$(CONFIG_TRACING)			+= tracepoint.o
 obj-$(CONFIG_IOSF_MBI)			+= iosf_mbi.o
+obj-$(CONFIG_PMC_ATOM)			+= pmc_atom.o
 
 ###
 # 64 bit specific files
arch/x86/kernel/pmc_atom.c new file +321 -0

321 lines not on this page · raw message

arch/x86/platform/ts5500/ts5500.c +53 -41

159 lines not on this page · raw message