add BME680 to i2c-sensor overlay#3400
Merged
pelwell merged 2 commits intoraspberrypi:rpi-4.19.yfrom Jan 10, 2020
dremsol:bme680
Merged
add BME680 to i2c-sensor overlay#3400pelwell merged 2 commits intoraspberrypi:rpi-4.19.yfrom dremsol:bme680
pelwell merged 2 commits intoraspberrypi:rpi-4.19.yfrom
dremsol:bme680
Conversation
Author
|
changed relevant defconfigs |
Contributor
|
There were a few issues with this PR (the bmp280 address setting was broken, a README line was too long, and there were whitespace problems in the overlay), but I've patched it up. If you're happy with the result I'll merge it. |
Author
|
Thanks for the feedback. The README is fine. Correct me if I'm wrong, but you've changed a broken address which wasn't broken. the PR adds the |
Contributor
|
If you diff my version to yours, excluding the whitespace changes, you get: diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
index 41fadb7..917ce60 100644
--- a/arch/arm/boot/dts/overlays/README
+++ b/arch/arm/boot/dts/overlays/README
@@ -1159,8 +1159,8 @@ Name: i2c-sensor
Info: Adds support for a number of I2C barometric pressure and temperature
sensors on i2c_arm
Load: dtoverlay=i2c-sensor,<param>=<val>
-Params: addr Set the address for the BME280, BME680, BMP280, DS1621,
- HDC100X, LM75, SHT3x or TMP102
+Params: addr Set the address for the BME280, BME680, BMP280,
+ DS1621, HDC100X, LM75, SHT3x or TMP102
bme280 Select the Bosch Sensortronic BME280
Valid addresses 0x76-0x77, default 0x76
diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
index 96fec93..40881d7 100644
--- a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
+++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
@@ -233,7 +233,7 @@
__overrides__ {
- addr = <&bme280>,"reg:0", <&bme680>,"reg:0", <&tmp102>,"reg:0",
+ addr = <&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
<&lm75>,"reg:0", <&hdc100x>,"reg:0", <&sht3x>,"reg:0",
<&ds1621>,"reg:0", <&bme680>,"reg:0";
bme280 = <0>,"+0";The README change just moves the line-wrap, but the overlay change restores the address setting for bmp280 that your patch had broken. Your original patch said: __overrides__ {
- addr = <&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
+ addr = <&bme280>,"reg:0", <&bme680>,"reg:0", <&tmp102>,"reg:0",
<&lm75>,"reg:0", <&hdc100x>,"reg:0", <&sht3x>,"reg:0",
- <&ds1621>,"reg:0";
+ <&ds1621>,"reg:0", <&bme680>,"reg:0";i.e. you had bme680 in the list twice, once where bmp280 used to be. |
Author
|
weird, not sure how I screwed up on my end. However, when pulling from bme680 branch in fork everything looks fine. PR could be merged. |
popcornmix
added a commit
to raspberrypi/firmware
that referenced
this pull request
Jan 10, 2020
kernel: leds: pca963x: Fix open-drain initialization See: raspberrypi/linux#3274 kernel: add BME680 to i2c-sensor overlay See: raspberrypi/linux#3400 kernel: Pisound: MIDI communication fixes for scaled down CPU See: raspberrypi/linux#3396 kernel: pinctrl: bcm2835: Change init order for gpio hogs See: https://www.raspberrypi.org/forums/viewtopic.php?f=107&t=260600 firmware: Revert mmal: Support 64 bit clients See: raspberrypi/userland#586 firmware: arm_dt/dtoverlay fixes for ARM side camera driver power control
popcornmix
added a commit
to Hexxeh/rpi-firmware
that referenced
this pull request
Jan 10, 2020
kernel: leds: pca963x: Fix open-drain initialization See: raspberrypi/linux#3274 kernel: add BME680 to i2c-sensor overlay See: raspberrypi/linux#3400 kernel: Pisound: MIDI communication fixes for scaled down CPU See: raspberrypi/linux#3396 kernel: pinctrl: bcm2835: Change init order for gpio hogs See: https://www.raspberrypi.org/forums/viewtopic.php?f=107&t=260600 firmware: Revert mmal: Support 64 bit clients See: raspberrypi/userland#586 firmware: arm_dt/dtoverlay fixes for ARM side camera driver power control
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Tested and working. Question remaining is if bme680 should be configured as a module in kernel configuration?