Merge pull request #1716 from notro/i2c-bcm2835-catch-up-1

Use i2c-bcm2835 as default

Author: popcornmix

arch/arm/boot/dts/bcm270x.dtsi

@@ -49,10 +49,6 @@
 			dma-names = "tx", "rx";
 		};
 
-		i2c@7e205000 {  /* i2c0 */
-			compatible = "brcm,bcm2708-i2c";
-		};
-
 		pixelvalve0: pixelvalve@7e206000 {
 			/* Add alias */
 			status = "disabled";
@@ -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";

arch/arm/boot/dts/overlays/Makefile

@@ -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

arch/arm/boot/dts/overlays/README

@@ -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>

arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts

@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+
+/{
+	compatible = "brcm,bcm2708";
+
+	fragment@0 {
+		target = <&i2c_arm>;
+		__overlay__ {
+			compatible = "brcm,bcm2708-i2c";
+		};
+	};
+};

arch/arm/configs/bcm2709_defconfig

@@ -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

arch/arm/configs/bcmrpi_defconfig

@@ -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