POWERPC: Bring the fs_no calculation to the relevant SoC enumeration

The fs_no mean used to be fs_enet driver driven, hence it was an
enumeration across all the possible fs_enet "users" in the SoC. Now, with
QE on the pipeline, and to make DTS descriptions more clear, fs_no features
relevant SoC part number, with additional field to describe the SoC type.

Another reason for that is now not only fs_enet is going to utilize those
stuff. There might be UART, HLDC, and even USB, so to prevent confusion and
be ready for upcoming OF_device transfer, fs_enet and cpm_uart drivers were
updated in that concern, as well as the relevant DTS.

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index ba5c943a6fe9..2b168486aeba 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -244,7 +244,7 @@
                                 device_type = "serial";
                                 compatible = "cpm_uart";
                                 model = "SCC";
-                                device-id = <2>;
+                                device-id = <1>;
                                 reg = <91a00 20 88000 100>;
                                 clock-setup = <00ffffff 0>;
                                 rx-clock = <1>;
@@ -258,7 +258,7 @@
                                 device_type = "serial";
                                 compatible = "cpm_uart";
                                 model = "SCC";
-                                device-id = <3>;
+                                device-id = <2>;
                                 reg = <91a20 20 88100 100>;
                                 clock-setup = <ff00ffff 90000>;
                                 rx-clock = <2>;
@@ -272,7 +272,7 @@
                                 device_type = "network";
                                 compatible = "fs_enet";
                                 model = "FCC";
-                                device-id = <3>;
+                                device-id = <2>;
                                 reg = <91320 20 88500 100 913a0 30>;
                                 mac-address = [ 00 00 0C 00 02 FD ];
                                 clock-setup = <ff00ffff 250000>;
@@ -287,7 +287,7 @@
                                 device_type = "network";
                                 compatible = "fs_enet";
                                 model = "FCC";
-                                device-id = <4>;
+                                device-id = <3>;
                                 reg = <91340 20 88600 100 913d0 30>;
                                 mac-address = [ 00 00 0C 00 03 FD ];
                                 clock-setup = <ffff00ff 3700>;