Skip to contentSkip to conversation

drivers/hwmon: Move OCC driver to occ directory

RFC In review [email protected] 1 participant 1 message Oct 11, 2016 Hardware monitoring

lore
Share & tools
lore
#0 lore raw

RFC v2 1/2 drivers/hwmon: Move OCC driver to occ directory

From: "Edward A. James" <[email protected]>

- Move the existing OCC hwmon driver to it's own directory.
- Edit makefiles and Kconfig accordingly to preserve the build.

---
 drivers/hwmon/Kconfig          |   13 +-
 drivers/hwmon/Makefile         |    2 +-
 drivers/hwmon/occ/Kconfig      |   15 +
 drivers/hwmon/occ/Makefile     |    1 +
 drivers/hwmon/occ/power8_occ.c | 1254 ++++++++++++++++++++++++++++++++++++++++
 drivers/hwmon/power8_occ_i2c.c | 1254 ----------------------------------------
 6 files changed, 1272 insertions(+), 1267 deletions(-)
 create mode 100644 drivers/hwmon/occ/Kconfig
 create mode 100644 drivers/hwmon/occ/Makefile
 create mode 100644 drivers/hwmon/occ/power8_occ.c
 delete mode 100644 drivers/hwmon/power8_occ_i2c.c
drivers/hwmon/Kconfig +1 -12
index 3b34ba9..0ef3690 100644
@@ -1216,18 +1216,7 @@ config SENSORS_NSA320
 	  This driver can also be built as a module. If so, the module
 	  will be called nsa320-hwmon.
 
-config SENSORS_POWER8_OCC_I2C
-	tristate "Power8 On Chip Controller i2c driver"
-	depends on I2C
-	help
-	  If you say yes here you get support to monitor Power8 CPU
-	  sensors via the On Chip Controller (OCC) over the i2c bus.
-
-	  Generally this is used by management controllers such as a BMC
-	  on an OpenPower system.
-
-	  This driver can also be built as a module. If so, the module
-	  will be called power8_occ_i2c.
+source drivers/hwmon/occ/Kconfig
 
 config SENSORS_PCF8591
 	tristate "Philips PCF8591 ADC/DAC"
drivers/hwmon/Makefile +1 -1
index c0f3201..7f61e31 100644
@@ -127,7 +127,6 @@ obj-$(CONFIG_SENSORS_NCT7802)	+= nct7802.o
 obj-$(CONFIG_SENSORS_NCT7904)	+= nct7904.o
 obj-$(CONFIG_SENSORS_NSA320)	+= nsa320-hwmon.o
 obj-$(CONFIG_SENSORS_NTC_THERMISTOR)	+= ntc_thermistor.o
-obj-$(CONFIG_SENSORS_POWER8_OCC_I2C)	+= power8_occ_i2c.o
 obj-$(CONFIG_SENSORS_PC87360)	+= pc87360.o
 obj-$(CONFIG_SENSORS_PC87427)	+= pc87427.o
 obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
@@ -165,6 +164,7 @@ obj-$(CONFIG_SENSORS_WM831X)	+= wm831x-hwmon.o
 obj-$(CONFIG_SENSORS_WM8350)	+= wm8350-hwmon.o
 
 obj-$(CONFIG_PMBUS)		+= pmbus/
+obj-$(CONFI_OCC)		+= occ/
 
 ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG
 
drivers/hwmon/occ/Kconfig new file +15 -0
new file mode 100644
index 0000000..628fd6e
@@ -0,0 +1,15 @@
+#
+# On Chip Controller configuration
+#
+
+config OCC
+	tristate "On Chip Controller driver"
+	help
+	  If you say yes here you get support to monitor Power CPU
+	  sensors via the On Chip Controller (OCC).
+
+	  Generally this is used by management controllers such as a BMC
+	  on an OpenPower system.
+
+	  This driver can also be built as a module. If so, the module
+	  will be called occ.
drivers/hwmon/occ/Makefile new file +1 -0
new file mode 100644
index 0000000..1322961
@@ -0,0 +1 @@
+obj-$(CONFIG_OCC) += power8_occ.o
drivers/hwmon/occ/power8_occ.c new file +1254 -0

1,254 lines not on this page · raw message

drivers/hwmon/power8_occ_i2c.c deleted +0 -1254

1,254 lines not on this page · raw message

Signature · 1 line
1.9.1