Skip to content

Commit

Permalink
Merge pull request sonic-net#173 from pphuchar/201911_q2bd-remove-SPD…
Browse files Browse the repository at this point in the history
…-temp-access

[platform/questone2bd] Remove SPD temperature sensors from platform
  • Loading branch information
bbinxie authored May 21, 2020
2 parents e125eb3 + b38354a commit 9e03c2a
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 137 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
NUM_FAN_TRAY = 4
NUM_FAN = 2
NUM_PSU = 2
NUM_THERMAL = 12
NUM_THERMAL = 11
NUM_SFP = 56
NUM_COMPONENT = 7
REBOOT_CAUSE_REG = "0xA106"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ def __init__(self, thermal_index):
('TEMP_dps1100_i2c_76_59_1', 'dps1100', 76, 0, '59', False, 1),
('TEMP_dps1100_i2c_76_59_2', 'dps1100', 76, 0, '59', False, 2),
('TEMP_syscpld_i2c_70_0d', 'syscpld', 70, 0, '0d', False, 1),
('TEMP_jc42_i2c_1_18', 'jc42', 1, 0, '18', False, 1),
('TEMP_core_tmp_1', 'coretemp', 0, 0, '00', False, 1),
('TEMP_core_tmp_2', 'coretemp', 0, 0, '00', False, 2),
('TEMP_core_tmp_3', 'coretemp', 0, 0, '00', False, 3),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ start)

# Loads kernel modules
modprobe i2c-dev
modprobe dimm-bus
modprobe pmbus_core
modprobe i2c-imc allow_unsafe_access=1
modprobe baseboard_cpld
Expand All @@ -38,7 +37,7 @@ start)

## Populate FAN CPLD device
echo fancpld 0x0d > /sys/bus/i2c/devices/i2c-66/new_device

## Populate SYSTEM cpld device
echo syscpld 0x0d > /sys/bus/i2c/devices/i2c-70/new_device

Expand All @@ -47,7 +46,7 @@ start)
echo dps1100 0x58 > /sys/bus/i2c/devices/i2c-75/new_device
sleep 1
echo dps1100 0x59 > /sys/bus/i2c/devices/i2c-76/new_device

# Populate temperature sensors
echo lm75b 0x48 > /sys/bus/i2c/devices/i2c-9/new_device
echo lm75b 0x4d > /sys/bus/i2c/devices/i2c-67/new_device
Expand All @@ -59,11 +58,11 @@ start)
echo 24lc64t 0x50 > /sys/bus/i2c/devices/i2c-6/new_device
echo 24lc64t 0x50 > /sys/bus/i2c/devices/i2c-8/new_device
echo 24lc64t 0x56 > /sys/bus/i2c/devices/i2c-9/new_device
## PSU

## PSU
echo 24lc64t 0x50 > /sys/bus/i2c/devices/i2c-75/new_device
echo 24lc64t 0x51 > /sys/bus/i2c/devices/i2c-76/new_device

## SYSTEM
echo 24lc64t 0x57 > /sys/bus/i2c/devices/i2c-69/new_device

Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
obj-m := mc24lc64t.o baseboard_cpld.o switchboard_fpga.o i2c-imc.o dimm-bus.o
obj-m := mc24lc64t.o baseboard_cpld.o switchboard_fpga.o i2c-imc.o
obj-m += i2c_dev_sysfs.o syscpld.o fancpld.o dps1100.o

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <linux/pci.h>
#include <linux/ratelimit.h>
#include <linux/i2c.h>
#include "dimm-bus.h"

/*
* The datasheet can be found here, for example:
Expand Down Expand Up @@ -422,8 +421,6 @@ static int imc_init_channel(struct imc_priv *priv, int i, int socket)
return err;
}

i2c_scan_dimm_bus(&ch->adapter);

return 0;
}

Expand Down

0 comments on commit 9e03c2a

Please sign in to comment.