summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-01-03 02:14:02 +0000
committerPeter Robinson <pbrobinson@gmail.com>2019-01-03 02:14:02 +0000
commit7d2d67010686d6e4bd5bf2146ad2ef7781b6d8af (patch)
treedea9f55c634de1c2b7352860ef216ea6cb093dd0
parenta2d19a148d4b17b5e093dd74beed12b9321070ec (diff)
downloadkernel-7d2d67010686d6e4bd5bf2146ad2ef7781b6d8af.tar.gz
kernel-7d2d67010686d6e4bd5bf2146ad2ef7781b6d8af.tar.xz
kernel-7d2d67010686d6e4bd5bf2146ad2ef7781b6d8af.zip
powerpc: enable P8/P9 On-Chip Controller (OCC) hwmon drivers
-rw-r--r--configs/fedora/generic/CONFIG_SENSORS_OCC_P8_I2C2
-rw-r--r--configs/fedora/generic/powerpc/powerpc64le/CONFIG_FSI_OCC1
-rw-r--r--configs/fedora/generic/powerpc/powerpc64le/CONFIG_FSI_SBEFIFO1
-rw-r--r--configs/fedora/generic/powerpc/powerpc64le/CONFIG_SENSORS_OCC_P8_I2C1
-rw-r--r--configs/fedora/generic/powerpc/powerpc64le/CONFIG_SENSORS_OCC_P9_SBE1
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-ppc64le-debug.config4
-rw-r--r--kernel-ppc64le.config4
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
19 files changed, 23 insertions, 15 deletions
diff --git a/configs/fedora/generic/CONFIG_SENSORS_OCC_P8_I2C b/configs/fedora/generic/CONFIG_SENSORS_OCC_P8_I2C
index e885832f9..2b2e55686 100644
--- a/configs/fedora/generic/CONFIG_SENSORS_OCC_P8_I2C
+++ b/configs/fedora/generic/CONFIG_SENSORS_OCC_P8_I2C
@@ -1 +1 @@
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_FSI_OCC b/configs/fedora/generic/powerpc/powerpc64le/CONFIG_FSI_OCC
new file mode 100644
index 000000000..8cedd51a0
--- /dev/null
+++ b/configs/fedora/generic/powerpc/powerpc64le/CONFIG_FSI_OCC
@@ -0,0 +1 @@
+CONFIG_FSI_OCC=m
diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_FSI_SBEFIFO b/configs/fedora/generic/powerpc/powerpc64le/CONFIG_FSI_SBEFIFO
new file mode 100644
index 000000000..d5ec4e06a
--- /dev/null
+++ b/configs/fedora/generic/powerpc/powerpc64le/CONFIG_FSI_SBEFIFO
@@ -0,0 +1 @@
+CONFIG_FSI_SBEFIFO=m
diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_SENSORS_OCC_P8_I2C b/configs/fedora/generic/powerpc/powerpc64le/CONFIG_SENSORS_OCC_P8_I2C
new file mode 100644
index 000000000..e885832f9
--- /dev/null
+++ b/configs/fedora/generic/powerpc/powerpc64le/CONFIG_SENSORS_OCC_P8_I2C
@@ -0,0 +1 @@
+CONFIG_SENSORS_OCC_P8_I2C=m
diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_SENSORS_OCC_P9_SBE b/configs/fedora/generic/powerpc/powerpc64le/CONFIG_SENSORS_OCC_P9_SBE
new file mode 100644
index 000000000..fb426072f
--- /dev/null
+++ b/configs/fedora/generic/powerpc/powerpc64le/CONFIG_SENSORS_OCC_P9_SBE
@@ -0,0 +1 @@
+CONFIG_SENSORS_OCC_P9_SBE=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 3e8baf50d..a71c4d3e3 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5344,7 +5344,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index ae338ed7a..fe95093d7 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5322,7 +5322,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 9ca41e0d9..086fbdf13 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -5629,7 +5629,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 8efe984fc..144205d69 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -5323,7 +5323,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 4453b0bcd..e6b7b2acf 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -5302,7 +5302,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index df7cf511b..650152897 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -5608,7 +5608,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index dcb50f2a9..51da615b0 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -5011,7 +5011,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-i686.config b/kernel-i686.config
index c6339fa62..e0ee1951b 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4990,7 +4990,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index a4931168e..1ae57fb0f 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1539,7 +1539,8 @@ CONFIG_FSI=m
CONFIG_FSI_MASTER_GPIO=m
CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_NEW_DEV_NODE is not set
-# CONFIG_FSI_SBEFIFO is not set
+CONFIG_FSI_OCC=m
+CONFIG_FSI_SBEFIFO=m
CONFIG_FSI_SCOM=m
# CONFIG_FSL_DMA is not set
# CONFIG_FSL_EDMA is not set
@@ -4735,6 +4736,7 @@ CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
CONFIG_SENSORS_OCC_P8_I2C=m
+CONFIG_SENSORS_OCC_P9_SBE=m
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 5e4f34eb5..5a733c804 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1521,7 +1521,8 @@ CONFIG_FSI=m
CONFIG_FSI_MASTER_GPIO=m
CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_NEW_DEV_NODE is not set
-# CONFIG_FSI_SBEFIFO is not set
+CONFIG_FSI_OCC=m
+CONFIG_FSI_SBEFIFO=m
CONFIG_FSI_SCOM=m
# CONFIG_FSL_DMA is not set
# CONFIG_FSL_EDMA is not set
@@ -4712,6 +4713,7 @@ CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
CONFIG_SENSORS_OCC_P8_I2C=m
+CONFIG_SENSORS_OCC_P9_SBE=m
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 85ad7ec0f..340bcd957 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4636,7 +4636,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 98b9dab79..e261a71f9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4613,7 +4613,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 19e9c90fe..b63a5878b 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -5049,7 +5049,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index db75299a2..bd097f4fb 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -5028,7 +5028,7 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m