Skip to contentSkip to conversation

x86/platform updates for v3.20

GIT PULL Ingo Molnar 1 participant 1 message Feb 9, 2015 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: 0e1540208ef34a2246822fa56f751efe23748e7a x86: pmc_atom: Expose contents of PSS

Various Intel Atom SoC updates (mostly to enhance
debuggability), plus an apb_timer cleanup.

Thanks,

Ingo

------------------>
Andy Shevchenko (5):
x86: pmc-atom: Assign debugfs node as soon as possible
x86: pmc_atom: don%27t check for NULL twice
x86: pmc-atom: Remove unused macro
x86: pmc_atom: Clean up init function
x86: pmc_atom: Expose contents of PSS

Rickard Strandqvist (1):
x86/platform: Remove unused function from apb_timer.c

 arch/x86/include/asm/pmc_atom.h | 22 +++++++++++
 arch/x86/kernel/apb_timer.c     |  8 ----
 arch/x86/kernel/pmc_atom.c      | 81 ++++++++++++++++++++++++++++++++---------
 3 files changed, 86 insertions(+), 25 deletions(-)
arch/x86/include/asm/pmc_atom.h +22 -0
index fc7a17c05d35..bc0fc0866553 100644
@@ -53,6 +53,28 @@
 /* Sleep state counter is in units of of 32us */
 #define	PMC_TMR_SHIFT		5
 
+/* Power status of power islands */
+#define	PMC_PSS			0x98
+
+#define PMC_PSS_BIT_GBE			BIT(0)
+#define PMC_PSS_BIT_SATA		BIT(1)
+#define PMC_PSS_BIT_HDA			BIT(2)
+#define PMC_PSS_BIT_SEC			BIT(3)
+#define PMC_PSS_BIT_PCIE		BIT(4)
+#define PMC_PSS_BIT_LPSS		BIT(5)
+#define PMC_PSS_BIT_LPE			BIT(6)
+#define PMC_PSS_BIT_DFX			BIT(7)
+#define PMC_PSS_BIT_USH_CTRL		BIT(8)
+#define PMC_PSS_BIT_USH_SUS		BIT(9)
+#define PMC_PSS_BIT_USH_VCCS		BIT(10)
+#define PMC_PSS_BIT_USH_VCCA		BIT(11)
+#define PMC_PSS_BIT_OTG_CTRL		BIT(12)
+#define PMC_PSS_BIT_OTG_VCCS		BIT(13)
+#define PMC_PSS_BIT_OTG_VCCA_CLK	BIT(14)
+#define PMC_PSS_BIT_OTG_VCCA		BIT(15)
+#define PMC_PSS_BIT_USB			BIT(16)
+#define PMC_PSS_BIT_USB_SUS		BIT(17)
+
 /* These registers reflect D3 status of functions */
 #define	PMC_D3_STS_0		0xA0
 
arch/x86/kernel/apb_timer.c +0 -8
index b708738d016e..6a7c23ff21d3 100644
@@ -135,14 +135,6 @@ static inline void apbt_clear_mapping(void)
 	apbt_virt_address = NULL;
 }
 
-/*
- * APBT timer interrupt enable / disable
- */
-static inline int is_apbt_capable(void)
-{
-	return apbt_virt_address ? 1 : 0;
-}
-
 static int __init apbt_clockevent_register(void)
 {
 	struct sfi_timer_table_entry *mtmr;
arch/x86/kernel/pmc_atom.c +64 -17

147 lines not on this page · raw message