dts: r4pro: some cleanup and binding-fixes

Author: frank-w

arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-8x.dts

@@ -47,6 +47,7 @@
 
 &mdio_bus {
 	/* external Airoha AN8831X connected to MXL switch */
+
 	phy24: ethernet-phy@24 {
 		reg = <24>;
 		compatible = "ethernet-phy-ieee802.3-c45";
@@ -59,14 +60,14 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			phy24_led0: an8831x_phy24_led0@0 {
+			phy24_led0: led0@0 {
 				reg = <0>;
 				linux,default-trigger = "netdev";
 				active-high;
 				status = "okay";
 			};
 
-			phy24_led1: an8831x_phy24_led1@1 {
+			phy24_led1: led1@1 {
 				reg = <1>;
 				linux,default-trigger = "netdev";
 				active-high;
@@ -88,14 +89,14 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			phy28_led0: an8831x_phy28_led0@0 {
+			phy28_led0: led0@0 {
 				reg = <0>;
 				linux,default-trigger = "netdev";
 				active-high;
 				status = "okay";
 			};
 
-			phy28_led1: an8831x_phy28_led1@1 {
+			phy28_led1: led1@1 {
 				reg = <1>;
 				linux,default-trigger = "netdev";
 				active-high;
@@ -107,12 +108,17 @@
 
 &switch16 {
 	ds_mux: ds-mux-bus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
 		ds_mux0: ds-mux@0 {
 			compatible = "mxl862xx,ds-mux";
 			reg = <12>;
 			chan-sel-gpios = <&pio 54 GPIO_ACTIVE_HIGH>;
 			mod-def0-gpios = <&pio 4 GPIO_ACTIVE_LOW>;
 			sfp-present-channel = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
 
 			ds_channel_0: channel@0 {
 				reg = <0>;

arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi

@@ -3,12 +3,15 @@
  * Copyright (C) 2022 MediaTek Inc.
  * Author: Sam.Shih <sam.shih@mediatek.com>
  */
+
 /dts-v1/;
+
 #include "mt7988a.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/regulator/richtek,rt5190a-regulator.h>
+
 /*
  * ----------------------------------- Bananapi Bpi R4 Pro PINs ---------------------------------
  * |    | Function                               | Function                                |    |
@@ -28,6 +31,7 @@
  * | 25 | GND                                    | GPIO52/PCM_DRX_I2S_DIN                  | 26 |
  * |----|----------------------------------------|-----------------------------------------|----|
  */
+
 / {
 	aliases {
 		ethernet0 = &gmac0;
@@ -41,13 +45,13 @@
 		i2c5 = &imux2_sfp2;
 		i2c6 = &imux3_wifi;
 	};
+
 	chosen {
 		stdout-path = &serial0;
 		bootargs = "console=ttyS0,115200n1 loglevel=8  \
 			    earlycon=uart8250,mmio32,0x11000000 \
 			    pci=pcie_bus_perf ubi.block=0,firmware root=/dev/fit0 \
 			    rootwait";
-		rootdisk-spim-nand = <&ubi_rootfs>;
 	};
 
 	fan: pwm-fan {
@@ -89,6 +93,7 @@
 			default-state = "on";
 		};
 	};
+
 	/*memory {
 		reg = <0x00 0x40000000 0x00 0x10000000>;
 	};*/
@@ -289,12 +294,14 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c0_pins>;
 	status = "okay";
+
 	rt5190a_64: rt5190a@64 {
 		compatible = "richtek,rt5190a";
 		reg = <0x64>;
 		vin2-supply = <&rt5190_buck1>;
 		vin3-supply = <&rt5190_buck1>;
 		vin4-supply = <&rt5190_buck1>;
+
 		regulators {
 			rt5190_buck1: buck1 {
 				regulator-name = "rt5190a-buck1";
@@ -305,20 +312,23 @@
 				regulator-boot-on;
 				regulator-always-on;
 			};
+
 			buck2 {
 				regulator-name = "vcore";
 				regulator-min-microvolt = <600000>; //0.85 in shematic
 				regulator-max-microvolt = <1400000>;
 				regulator-boot-on;
 				regulator-always-on;
 			};
+
 			rt5190_buck3: buck3 {
 				regulator-name = "vproc";
 				regulator-min-microvolt = <600000>; //0.85-1.0
 				regulator-max-microvolt = <1400000>;
 				regulator-boot-on;
 				regulator-always-on;
 			};
+
 			buck4 {
 				regulator-name = "rt5190a-buck4"; //1.8
 				regulator-min-microvolt = <850000>;
@@ -328,6 +338,7 @@
 				regulator-boot-on;
 				regulator-always-on;
 			};
+
 			ldo {
 				regulator-name = "rt5190a-ldo";
 				regulator-min-microvolt = <1200000>; //1.8
@@ -519,19 +530,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pcie0_pins>;
 	status = "okay";
-
-	/*slot0: pcie@0,0 {
-		#address-cells = <3>;
-		#size-cells = <2>;
-
-		reg = <0x0000 0 0 0 0>;
-		mt7996@0,0 {
-			compatible = "mediatek,mt76";
-			reg = <0x0000 0 0 0 0>;
-			device_type = "pci";
-			//mediatek,mtd-eeprom = <&factory 0x0>;
-		};
-	};*/
 };
 
 /* mPCIe (11310000 near leds) SIM3 */
@@ -672,6 +670,7 @@
 	status = "okay";
 };
 
+/* back USB */
 &ssusb0 {
 	/* Use U2P only instead of both U3P/U2P due to U3P serdes shared with pcie2 */
 	phys = <&xphyu2port0 PHY_TYPE_USB2>;