Skip to content

Use i2c-bcm2835 as default #1716

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

Merged
merged 13 commits into from
Nov 13, 2016
Merged

Use i2c-bcm2835 as default #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
62d7140
i2c: bcm2835: Fix hang for writing messages larger than 16 bytes
notro Sep 17, 2016
5a2531d
i2c: bcm2835: Protect against unexpected TXW/RXR interrupts
notro Sep 23, 2016
1f73fa1
i2c: bcm2835: Use dev_dbg logging on transfer errors
notro Sep 19, 2016
4f3c77b
i2c: bcm2835: Can't support I2C_M_IGNORE_NAK
notro Sep 22, 2016
fe92705
i2c: bcm2835: Add support for Repeated Start Condition
notro Sep 23, 2016
82604b5
i2c: bcm2835: Support i2c-dev ioctl I2C_TIMEOUT
notro Sep 23, 2016
5a59c70
i2c: bcm2835: Add support for dynamic clock
notro Sep 26, 2016
687754b
i2c: bcm2835: Add debug support
notro Nov 1, 2016
316f633
config: Enable i2c-bcm2835
notro Nov 1, 2016
49510b2
BCM270X_DT: Use i2c-bcm2835 as default
notro Nov 1, 2016
69b0760
BCM270X_DT: Add fallback overlay for i2c-bcm2708
notro Nov 11, 2016
bbfad65
SQUASH: No, like this
pelwell Nov 12, 2016
51fefbd
SQUASH: No, like this
pelwell Nov 12, 2016
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
12 changes: 0 additions & 12 deletions arch/arm/boot/dts/bcm270x.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@
dma-names = "tx", "rx";
};

i2c@7e205000 { /* i2c0 */
compatible = "brcm,bcm2708-i2c";
};

pixelvalve0: pixelvalve@7e206000 {
/* Add alias */
status = "disabled";
Expand Down Expand Up @@ -104,14 +100,6 @@
status = "disabled";
};

i2c@7e804000 { /* i2c1 */
compatible = "brcm,bcm2708-i2c";
};

i2c@7e805000 { /* i2c2 */
compatible = "brcm,bcm2708-i2c";
};

pixelvalve2: pixelvalve@7e807000 {
/* Add alias */
status = "disabled";
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/overlays/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ dtbo-$(RPI_DT_OVERLAYS) += hifiberry-digi.dtbo
dtbo-$(RPI_DT_OVERLAYS) += hifiberry-digi-pro.dtbo
dtbo-$(RPI_DT_OVERLAYS) += hy28a.dtbo
dtbo-$(RPI_DT_OVERLAYS) += hy28b.dtbo
dtbo-$(RPI_DT_OVERLAYS) += i2c-bcm2708.dtbo
dtbo-$(RPI_DT_OVERLAYS) += i2c-gpio.dtbo
dtbo-$(RPI_DT_OVERLAYS) += i2c-mux.dtbo
dtbo-$(RPI_DT_OVERLAYS) += i2c-pwm-pca9685a.dtbo
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/overlays/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,12 @@ Params: speed Display SPI bus speed
ledgpio GPIO used to control backlight


Name: i2c-bcm2708
Info: Fall back to the i2c_bcm2708 driver for the i2c_arm bus.
Load: dtoverlay=i2c-bcm2708
Params: <None>


Name: i2c-gpio
Info: Adds support for software i2c controller on gpio pins
Load: dtoverlay=i2c-gpio,<param>=<val>
Expand Down
13 changes: 13 additions & 0 deletions arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/dts-v1/;
/plugin/;

/{
compatible = "brcm,bcm2708";

fragment@0 {
target = <&i2c_arm>;
__overlay__ {
compatible = "brcm,bcm2708-i2c";
};
};
};
1 change: 1 addition & 0 deletions arch/arm/configs/bcm2709_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,7 @@ CONFIG_I2C=y
CONFIG_I2C_CHARDEV=m
CONFIG_I2C_MUX_PCA954x=m
CONFIG_I2C_BCM2708=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_GPIO=m
CONFIG_SPI=y
CONFIG_SPI_BCM2835=m
Expand Down
1 change: 1 addition & 0 deletions arch/arm/configs/bcmrpi_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,7 @@ CONFIG_I2C=y
CONFIG_I2C_CHARDEV=m
CONFIG_I2C_MUX_PCA954x=m
CONFIG_I2C_BCM2708=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_GPIO=m
CONFIG_SPI=y
CONFIG_SPI_BCM2835=m
Expand Down
Loading