From 50aba596a919fae7b0deb058d3ee093c9bfcade6 Mon Sep 17 00:00:00 2001 From: wadelnn Date: Thu, 8 Jun 2017 01:29:19 +0800 Subject: [PATCH] [platform]: Update submodule platform/broadcom/sonic-platform-modules-ingrasys (#670) * Update submodule platform/broadcom/sonic-platform-modules-ingrasys * Fixed FAN Status Setup Error. * Add Drivers deinitialization feature. * Allow for updating drivers on a running system. * Let fans returned to full speed when driver uninstalled. * Change S8900-64XC fancontrol config * Delete S9100 syncd.conf Signed-off-by: Wade He * Update submodule * Fixed build error in fsroot on different kernel versions between host and rootfs. * Fixed Read HW Revision in CPLD. * rmmod check to avoid error. Signed-off-by: Wade He --- .../x86_64-ingrasys_s8900_64xc-r0/fancontrol | 16 ++++++++-------- .../ingrasys/x86_64-ingrasys_s9100-r0/syncd.conf | 1 - .../broadcom/sonic-platform-modules-ingrasys | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 device/ingrasys/x86_64-ingrasys_s9100-r0/syncd.conf diff --git a/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/fancontrol b/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/fancontrol index 938440304540..d5d5fa82b2d2 100644 --- a/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/fancontrol +++ b/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/fancontrol @@ -1,11 +1,11 @@ # Configuration file generated by pwmconfig, changes will be lost INTERVAL=10 -DEVPATH=hwmon1=devices/pci0000:00/0000:00:1f.3/i2c-0/0-002f -DEVNAME=hwmon1=w83795adg -FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp2_input hwmon1/device/pwm2=hwmon1/device/temp2_input -FCFANS=hwmon1/device/pwm2=hwmon1/device/fan10_input hwmon1/device/pwm2=hwmon1/device/fan9_input hwmon1/device/pwm2=hwmon1/device/fan8_input hwmon1/device/pwm2=hwmon1/device/fan7_input hwmon1/device/pwm2=hwmon1/device/fan6_input hwmon1/device/pwm2=hwmon1/device/fan5_input hwmon1/device/pwm1=hwmon1/device/fan4_input hwmon1/device/pwm1=hwmon1/device/fan3_input hwmon1/device/pwm1=hwmon1/device/fan2_input hwmon1/device/pwm1=hwmon1/device/fan1_input -MINTEMP=hwmon1/device/pwm1=20 hwmon1/device/pwm2=20 -MAXTEMP=hwmon1/device/pwm1=60 hwmon1/device/pwm2=60 -MINSTART=hwmon1/device/pwm1=150 hwmon1/device/pwm2=150 -MINSTOP=hwmon1/device/pwm1=0 hwmon1/device/pwm2=0 +DEVPATH=hwmon2=devices/pci0000:00/0000:00:1f.3/i2c-0/0-002f +DEVNAME=hwmon2=w83795adg +FCTEMPS=hwmon2/device/pwm1=hwmon2/device/temp2_input hwmon2/device/pwm2=hwmon2/device/temp2_input +FCFANS=hwmon2/device/pwm2=hwmon2/device/fan10_input hwmon2/device/pwm2=hwmon2/device/fan9_input hwmon2/device/pwm2=hwmon2/device/fan8_input hwmon2/device/pwm2=hwmon2/device/fan7_input hwmon2/device/pwm2=hwmon2/device/fan6_input hwmon2/device/pwm2=hwmon2/device/fan5_input hwmon2/device/pwm1=hwmon2/device/fan4_input hwmon2/device/pwm1=hwmon2/device/fan3_input hwmon2/device/pwm1=hwmon2/device/fan2_input hwmon2/device/pwm1=hwmon2/device/fan1_input +MINTEMP=hwmon2/device/pwm1=20 hwmon2/device/pwm2=20 +MAXTEMP=hwmon2/device/pwm1=60 hwmon2/device/pwm2=60 +MINSTART=hwmon2/device/pwm1=150 hwmon2/device/pwm2=150 +MINSTOP=hwmon2/device/pwm1=0 hwmon2/device/pwm2=0 diff --git a/device/ingrasys/x86_64-ingrasys_s9100-r0/syncd.conf b/device/ingrasys/x86_64-ingrasys_s9100-r0/syncd.conf deleted file mode 100644 index bd5ba3938842..000000000000 --- a/device/ingrasys/x86_64-ingrasys_s9100-r0/syncd.conf +++ /dev/null @@ -1 +0,0 @@ -export OPENNSL_CONFIG_POST_INIT_FILE=/etc/bcm/th-ingrasys-s9100-32x100G.soc diff --git a/platform/broadcom/sonic-platform-modules-ingrasys b/platform/broadcom/sonic-platform-modules-ingrasys index 46f1b3303fec..8d0229c94865 160000 --- a/platform/broadcom/sonic-platform-modules-ingrasys +++ b/platform/broadcom/sonic-platform-modules-ingrasys @@ -1 +1 @@ -Subproject commit 46f1b3303fecf728b66b88941fa162e91520cc32 +Subproject commit 8d0229c94865228eff63c0d79396d0b924d7c6b1