Revert "Merge branch 'mctp-i2c-driver'"

This reverts commit 71812af7234f30362b43ccff33f93890ae4c0655, reversing
changes made to cc0be1ad686fb29a4d127948486f40b17fb34b50.

Wolfram Sang says:

Please revert. Besides the driver in net, it modifies the I2C core
code. This has not been acked by the I2C maintainer (in this case me).
So, please don't pull this in via the net tree. The question raised here
(extending SMBus calls to 255 byte) is complicated because we need ABI
backwards compatibility.

Link: https://lore.kernel.org/all/YZJ9H4eM%2FM7OXVN0@shikoro/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2 files changed, 0 insertions, 96 deletions

diff --git a/Documentation/devicetree/bindings/i2c/i2c.txt b/Documentation/devicetree/bindings/i2c/i2c.txt
index fc3dd7ec0445..b864916e087f 100644
--- a/Documentation/devicetree/bindings/i2c/i2c.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c.txt
@@ -95,10 +95,6 @@ wants to support one of the below features, it should adapt these bindings.
 - smbus-alert
 	states that the optional SMBus-Alert feature apply to this bus.
 
-- mctp-controller
-	indicates that the system is accessible via this bus as an endpoint for
-	MCTP over I2C transport.
-
 Required properties (per child device)
 --------------------------------------
 
diff --git a/Documentation/devicetree/bindings/net/mctp-i2c-controller.yaml b/Documentation/devicetree/bindings/net/mctp-i2c-controller.yaml
deleted file mode 100644
index afd11c9422fa..000000000000
--- a/Documentation/devicetree/bindings/net/mctp-i2c-controller.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-%YAML 1.2
----
-$id: http://devicetree.org/schemas/net/mctp-i2c-controller.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: MCTP I2C transport binding
-
-maintainers:
-  - Matt Johnston <matt@codeconstruct.com.au>
-
-description: |
-  An mctp-i2c-controller defines a local MCTP endpoint on an I2C controller.
-  MCTP I2C is specified by DMTF DSP0237.
-
-  An mctp-i2c-controller must be attached to an I2C adapter which supports
-  slave functionality. I2C busses (either directly or as subordinate mux
-  busses) are attached to the mctp-i2c-controller with a 'mctp-controller'
-  property on each used bus. Each mctp-controller I2C bus will be presented
-  to the host system as a separate MCTP I2C instance.
-
-properties:
-  compatible:
-    const: mctp-i2c-controller
-
-  reg:
-    minimum: 0x40000000
-    maximum: 0x4000007f
-    description: |
-      7 bit I2C address of the local endpoint.
-      I2C_OWN_SLAVE_ADDRESS (1<<30) flag must be set.
-
-additionalProperties: false
-
-required:
-  - compatible
-  - reg
-
-examples:
-  - |
-    // Basic case of a single I2C bus
-    #include <dt-bindings/i2c/i2c.h>
-
-    i2c {
-      #address-cells = <1>;
-      #size-cells = <0>;
-      mctp-controller;
-
-      mctp@30 {
-        compatible = "mctp-i2c-controller";
-        reg = <(0x30 | I2C_OWN_SLAVE_ADDRESS)>;
-      };
-    };
-
-  - |
-    // Mux topology with multiple MCTP-handling busses under
-    // a single mctp-i2c-controller.
-    // i2c1 and i2c6 can have MCTP devices, i2c5 does not.
-    #include <dt-bindings/i2c/i2c.h>
-
-    i2c1: i2c {
-      #address-cells = <1>;
-      #size-cells = <0>;
-      mctp-controller;
-
-      mctp@50 {
-        compatible = "mctp-i2c-controller";
-        reg = <(0x50 | I2C_OWN_SLAVE_ADDRESS)>;
-      };
-    };
-
-    i2c-mux {
-      #address-cells = <1>;
-      #size-cells = <0>;
-      i2c-parent = <&i2c1>;
-
-      i2c5: i2c@0 {
-        #address-cells = <1>;
-        #size-cells = <0>;
-        reg = <0>;
-        eeprom@33 {
-          reg = <0x33>;
-        };
-      };
-
-      i2c6: i2c@1 {
-        #address-cells = <1>;
-        #size-cells = <0>;
-        reg = <1>;
-        mctp-controller;
-      };
-    };