ARM: dts: NSP: Use hardware I2C for BCM958625HR

Now that the i2c-bcm-iproc driver has been fixed to permit reading more
than 63 bytes in a single transaction with commit fd01eecdf959 ("i2c:
iproc: Fix i2c master read more than 63 bytes") we no longer need to
bitbang i2c over GPIOs which was necessary before to allow the
PHYLINK/SFP subsystems to read SFP modules.

Reviewed-by: Ray Jui <ray.jui@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts
index a2c9de35ddfbd3e40b07e50ba4d003ffcbdc3cbb..536fb24f38bb742c49602e4bf16af7e7cb6427b3 100644 (file)
--- a/arch/arm/boot/dts/bcm958625hr.dts
+++ b/arch/arm/boot/dts/bcm958625hr.dts
@@ -55,18 +55,9 @@
                priority = <200>;
        };
 
-       /* Hardware I2C block cannot do more than 63 bytes per transfer,
-        * which would prevent reading from a SFP's EEPROM (256 byte).
-        */
-       i2c1: i2c {
-               compatible = "i2c-gpio";
-               sda-gpios = <&gpioa 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-               scl-gpios = <&gpioa 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-       };
-
        sfp: sfp {
                compatible = "sff,sfp";
-               i2c-bus = <&i2c1>;
+               i2c-bus = <&i2c0>;
                mod-def0-gpios = <&gpioa 28 GPIO_ACTIVE_LOW>;
                los-gpios = <&gpioa 24 GPIO_ACTIVE_HIGH>;
                tx-fault-gpios = <&gpioa 30 GPIO_ACTIVE_HIGH>;
@@ -74,6 +65,10 @@
        };
 };
 
+&i2c0 {
+       status = "okay";
+};
+
 &amac0 {
        status = "okay";
 };