Skip to content
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

[slvst-dp] Use I2C bus driver from kernel source tree #183

Merged
merged 2 commits into from
May 29, 2020
Merged

[slvst-dp] Use I2C bus driver from kernel source tree #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd0ea3f
[i2c-ocores] Use I2C bus driver from kernel source tree.
pphuchar May 28, 2020
37be3df
[platform/broadcom] Remove stretch debs from celestica platform makefile
pphuchar May 28, 2020
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
2 changes: 0 additions & 2 deletions platform/broadcom/platform-modules-cel.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,3 @@ $(eval $(call add_extra_package,$(CEL_DX010_PLATFORM_MODULE),$(CEL_SILVERSTONE_P
CEL_SILVERSTONE-DP_PLATFORM_MODULE = platform-modules-silverstone-dp_$(CEL_SILVERSTONE-DP_PLATFORM_MODULE_VERSION)_amd64.deb
$(CEL_SILVERSTONE-DP_PLATFORM_MODULE)_PLATFORM = x86_64-cel_silverstone_dp-r0
$(eval $(call add_extra_package,$(CEL_DX010_PLATFORM_MODULE),$(CEL_SILVERSTONE-DP_PLATFORM_MODULE)))

SONIC_STRETCH_DEBS += $(CEL_DX010_PLATFORM_MODULE)
4 changes: 2 additions & 2 deletions platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-silverstone-dp.init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ start)
modprobe ipmi_devintf
modprobe mc24lc64t
modprobe baseboard-lpc
modprobe i2c-ocores
modprobe cls-switchboard
modprobe xcvr-cls
modprobe switch_cpld

# Instantiate TLV EEPROM device on I801 bus
# Instantiate TLV EEPROM device on I801 bus
devname=`cat /sys/bus/i2c/devices/i2c-0/name`
if [[ $devname == 'SMBus I801 adapter at '* ]]; then
echo 24lc64t 0x56 > /sys/bus/i2c/devices/i2c-0/new_device
fi

# Clear syseeprom cache
decode-syseeprom --init 2> /dev/null &
sleep 1

# Attach switchboard CPLD i2c device
echo switch_cpld 0x30 > /sys/bus/i2c/devices/i2c-4/new_device
Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-cel/silverstone-dp/modules/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
obj-m := baseboard-lpc.o mc24lc64t.o cls-switchboard.o xcvr-cls.o i2c-ocores.o switch_cpld.o
obj-m := baseboard-lpc.o mc24lc64t.o cls-switchboard.o xcvr-cls.o switch_cpld.o
8 changes: 4 additions & 4 deletions platform/broadcom/sonic-platform-modules-cel/silverstone-dp/modules/cls-switchboard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
#include <linux/i2c.h>
#include <linux/platform_device.h>
#include <linux/platform_data/pca954x.h>
#include "i2c-ocores.h"
#include <linux/platform_data/i2c-ocores.h>
#include "xcvr-cls.h"

#define MOD_VERSION "2.1.1"
#define MOD_VERSION "2.1.2"
#define DRV_NAME "cls-switchboard"

#define I2C_MUX_CHANNEL(_ch, _adap_id, _deselect) \
Expand Down Expand Up @@ -460,7 +460,7 @@ static int cls_fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
i2c_bus_configs[i].res[0].end);

i2cbuses_pdev[i] = platform_device_register_resndata(
&dev->dev, "cls-ocores-i2c",
&dev->dev, "ocores-i2c",
i2c_bus_configs[i].id,
i2c_bus_configs[i].res,
i2c_bus_configs[i].num_res,
Expand Down Expand Up @@ -530,6 +530,6 @@ static struct pci_driver clsswbrd_pci_driver = {
module_pci_driver(clsswbrd_pci_driver);

MODULE_AUTHOR("Pradchaya P.<pphuchar@celestica.com>");
MODULE_DESCRIPTION("Celestica Silverstone switchboard driver");
MODULE_DESCRIPTION("Celestica Silverstone DP switchboard driver");
MODULE_VERSION(MOD_VERSION);
MODULE_LICENSE("GPL");
Loading