Add EcoNet EN751221 MIPS platform support - diff patch v2 -> v3

patch-add-econet-support-diff-v2-v3.patch

diff --git a/Documentation/devicetree/bindings/timer/econet,en751221-timer.yaml b/Documentation/devicetree/bindings/timer/econet,en751221-timer.yaml
index 883b904250b2..c1e7c2b6afde 100644
--- a/Documentation/devicetree/bindings/timer/econet,en751221-timer.yaml
+++ b/Documentation/devicetree/bindings/timer/econet,en751221-timer.yaml
@@ -18,13 +18,14 @@ description:
 properties:
   compatible:
     oneOf:
-      - items:
-          - const: econet,en751221-timer
+      - const: econet,en751221-timer
       - items:
           - const: econet,en751627-timer
           - const: econet,en751221-timer
 
-  reg: true
+  reg:
+    minItems: 1
+    maxItems: 2
 
   interrupts:
     maxItems: 1
@@ -33,29 +34,30 @@ properties:
   clocks:
     maxItems: 1
 
-if:
-  properties:
-    compatible:
-      contains:
-        const: econet,en751627-timer
-then:
-  properties:
-    reg:
-      items:
-        - description: Base address for VPE timers 0 and 1
-        - description: Base address for VPE timers 2 and 3
-else:
-  properties:
-    reg:
-      items:
-        - description: Base address for VPE timers 0 and 1
-
 required:
   - compatible
   - reg
   - interrupts
   - clocks
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: econet,en751627-timer
+    then:
+      properties:
+        reg:
+          items:
+            - description: VPE timers 0 and 1
+            - description: VPE timers 2 and 3
+    else:
+      properties:
+        reg:
+          items:
+            - description: VPE timers 0 and 1
+
 additionalProperties: false
 
 examples:
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
index d4e69424dcd1..dc064e6acf4b 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -416,8 +416,6 @@ patternProperties:
     description: dServe Technology B.V.
   "^dynaimage,.*":
     description: Dyna-Image
-  "^econet,.*":
-    description: EcoNet (HK) Limited
   "^ea,.*":
     description: Embedded Artists AB
   "^ebang,.*":
@@ -430,6 +428,8 @@ patternProperties:
     description: EBV Elektronik
   "^eckelmann,.*":
     description: Eckelmann AG
+  "^econet,.*":
+    description: EcoNet (HK) Limited
   "^edgeble,.*":
     description: Edgeble AI Technologies Pvt. Ltd.
   "^edimax,.*":
diff --git a/arch/mips/boot/dts/econet/en751221.dtsi b/arch/mips/boot/dts/econet/en751221.dtsi
index 9813b57b54a9..66197e73d4f0 100644
--- a/arch/mips/boot/dts/econet/en751221.dtsi
+++ b/arch/mips/boot/dts/econet/en751221.dtsi
@@ -24,10 +24,10 @@ cpu@0 {
 	};
 
 	cpuintc: interrupt-controller {
+		compatible = "mti,cpu-interrupt-controller";
+		interrupt-controller;
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
-		interrupt-controller;
-		compatible = "mti,cpu-interrupt-controller";
 	};
 
 	intc: interrupt-controller@1fb40000 {
@@ -48,6 +48,11 @@ uart: serial@1fbf0000 {
 		reg-shift = <2>;
 		interrupt-parent = <&intc>;
 		interrupts = <0>;
+		/*
+		 * Conversion of baud rate to clock frequency requires a
+		 * computation that is not in the ns16550 driver, so this
+		 * uart is fixed at 115200 baud.
+		 */
 		clock-frequency = <1843200>;
 	};