-
Notifications
You must be signed in to change notification settings - Fork 174
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.
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
add Cavium as7512-32x related kernel driver patches #3
Open
rspolyak
wants to merge
1
commit into
sonic-net:master
Choose a base branch
from
rspolyak:cavm_platfrom
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
|
||
accton driver config, i2c_mux_pca954x and pmbus. | ||
From: roy_lee <roy_lee@accton.com> | ||
|
||
--- | ||
debian/build/build_amd64_none_amd64/.config | 23 ++++++++++++++++++++--- | ||
1 file changed, 20 insertions(+), 3 deletions(-) | ||
|
||
diff --git a/debian/build/build_amd64_none_amd64/.config b/debian/build/build_amd64_none_amd64/.config | ||
index c0b11a1..df010e7 100644 | ||
--- a/debian/build/build_amd64_none_amd64/.config | ||
+++ b/debian/build/build_amd64_none_amd64/.config | ||
@@ -1788,6 +1788,8 @@ CONFIG_EEPROM_LEGACY=m | ||
CONFIG_EEPROM_MAX6875=m | ||
CONFIG_EEPROM_93CX6=m | ||
# CONFIG_EEPROM_93XX46 is not set | ||
+CONFIG_EEPROM_ACCTON_AS7512_32x_SFP=m | ||
+CONFIG_EEPROM_SFF_8436=m | ||
CONFIG_CB710_CORE=m | ||
# CONFIG_CB710_DEBUG is not set | ||
CONFIG_CB710_DEBUG_ASSUMPTIONS=y | ||
@@ -3146,7 +3148,7 @@ CONFIG_I2C_MUX=m | ||
# | ||
# CONFIG_I2C_MUX_GPIO is not set | ||
# CONFIG_I2C_MUX_PCA9541 is not set | ||
-# CONFIG_I2C_MUX_PCA954x is not set | ||
+CONFIG_I2C_MUX_PCA954x=m | ||
# CONFIG_I2C_MUX_PINCTRL is not set | ||
CONFIG_I2C_HELPER_AUTO=y | ||
CONFIG_I2C_SMBUS=m | ||
@@ -3397,6 +3399,10 @@ CONFIG_HWMON_VID=m | ||
# | ||
CONFIG_SENSORS_ABITUGURU=m | ||
CONFIG_SENSORS_ABITUGURU3=m | ||
+CONFIG_SENSORS_ACCTON_I2C_CPLD=m | ||
+CONFIG_SENSORS_ACCTON_AS7512_32x_FAN=m | ||
+CONFIG_SENSORS_ACCTON_AS7512_32x_PSU=m | ||
+CONFIG_SENSORS_YM2651Y=m | ||
# CONFIG_SENSORS_AD7314 is not set | ||
CONFIG_SENSORS_AD7414=m | ||
CONFIG_SENSORS_AD7418=m | ||
@@ -3480,7 +3486,18 @@ CONFIG_SENSORS_NTC_THERMISTOR=m | ||
CONFIG_SENSORS_NCT6683=m | ||
CONFIG_SENSORS_NCT6775=m | ||
CONFIG_SENSORS_PCF8591=m | ||
-# CONFIG_PMBUS is not set | ||
+CONFIG_PMBUS=m | ||
+CONFIG_SENSORS_PMBUS=m | ||
+# CONFIG_SENSORS_ADM1275 is not set | ||
+# CONFIG_SENSORS_LM25066 is not set | ||
+# CONFIG_SENSORS_LTC2978 is not set | ||
+# CONFIG_SENSORS_MAX16064 is not set | ||
+# CONFIG_SENSORS_MAX34440 is not set | ||
+CONFIG_SENSORS_DNI_DPS460=m | ||
+# CONFIG_SENSORS_MAX8688 is not set | ||
+# CONFIG_SENSORS_UCD9000 is not set | ||
+# CONFIG_SENSORS_UCD9200 is not set | ||
+# CONFIG_SENSORS_ZL6100 is not set | ||
# CONFIG_SENSORS_SHT15 is not set | ||
CONFIG_SENSORS_SHT21=m | ||
# CONFIG_SENSORS_SHTC1 is not set | ||
@@ -5131,7 +5148,7 @@ CONFIG_LEDS_LT3593=m | ||
CONFIG_LEDS_DELL_NETBOOKS=m | ||
# CONFIG_LEDS_TCA6507 is not set | ||
# CONFIG_LEDS_LM355x is not set | ||
- | ||
+CONFIG_LEDS_ACCTON_AS7512_32x=m | ||
# | ||
# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) | ||
# | ||
|
23 changes: 23 additions & 0 deletions
23
patch/cavm-as7512/driver-i2c-muxes-pca954x-always-deselect.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
Always deselect channel after transaction for PCA954x. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you explain the nature of this patch, is it a driver bug we are fixing (upstreamed) or is it a workaround for the hardware platform. |
||
|
||
Roy <roy_lee@CicadaBuildServer.accton.com.tw> | ||
|
||
--- | ||
drivers/i2c/muxes/i2c-mux-pca954x.c | 3 +-- | ||
1 file changed, 1 insertion(+), 2 deletions(-) | ||
|
||
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c | ||
index 9bd4212..01c205b 100644 | ||
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c | ||
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c | ||
@@ -233,8 +233,7 @@ static int pca954x_probe(struct i2c_client *client, | ||
data->virt_adaps[num] = | ||
i2c_add_mux_adapter(adap, &client->dev, client, | ||
force, num, class, pca954x_select_chan, | ||
- (pdata && pdata->modes[num].deselect_on_exit) | ||
- ? pca954x_deselect_mux : NULL); | ||
+ pca954x_deselect_mux); | ||
|
||
if (data->virt_adaps[num] == NULL) { | ||
ret = -ENODEV; | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is already in https://github.com/Azure/sonic-linux-kernel/blob/master/patch/config-dell-s6000.patch, please check