Skip to content

Add BMC HWMON driver to kernel. Format patch based on Joel's comments. #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
adamliyi wants to merge 3 commits into from
Closed

Add BMC HWMON driver to kernel. Format patch based on Joel's comments. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa744b2
Add BMC HWMON driver to kernel. Format patch based on Joel's comments.
adamliyi Nov 27, 2015
7940494
gpio/aspeed: Use handler_data in aspeed_gpio_irq_handler.
jk-ozlabs Dec 1, 2015
d24fe31
[PATCH v3] hwmon: Add occ_i2c HWMON driver
adamliyi Dec 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Documentation/devicetree/bindings/hwmon/occ.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
* BMC OCC Sensor HWMON driver.

Required node properties:
- compatible: manufacturer and chip name
"ibm,occ-i2c"

- reg: I2C bus address of the device

Example occ node:

occ@50 {
compatible = "ibm,occ-i2c";
reg = <0x50>;
}
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-aspeed.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@ static int aspeed_gpio_set_type(struct irq_data *d, unsigned int type)

static void aspeed_gpio_irq_handler(struct irq_desc *desc)
{
struct aspeed_gpio *gpio = irq_desc_get_handler_data(desc);
struct irq_chip *chip = irq_desc_get_chip(desc);
struct aspeed_gpio *gpio = irq_desc_get_chip_data(desc);
unsigned int i, p, girq;
unsigned long reg;

Expand Down
10 changes: 10 additions & 0 deletions drivers/hwmon/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,6 +1167,16 @@ config SENSORS_NCT7904
This driver can also be built as a module. If so, the module
will be called nct7904.

config SENSORS_OCC
tristate "OCC sensor BMC driver"
depends on I2C
help
If you say yes here you get support for BMC to monitor IBM
Power CPU sensors via the On-Chip-Controller (OCC).

This driver can aslo be built as a module. If so, the module
will be called occ_i2c.

config SENSORS_PCF8591
tristate "Philips PCF8591 ADC/DAC"
depends on I2C
Expand Down
1 change: 1 addition & 0 deletions drivers/hwmon/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ obj-$(CONFIG_SENSORS_NCT6775) += nct6775.o
obj-$(CONFIG_SENSORS_NCT7802) += nct7802.o
obj-$(CONFIG_SENSORS_NCT7904) += nct7904.o
obj-$(CONFIG_SENSORS_NTC_THERMISTOR) += ntc_thermistor.o
obj-$(CONFIG_SENSORS_OCC) += occ_i2c.o
obj-$(CONFIG_SENSORS_PC87360) += pc87360.o
obj-$(CONFIG_SENSORS_PC87427) += pc87427.o
obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
Expand Down
Loading