Merge pull request #159 in SW_PON/linux from...

Merge pull request #159 in SW_PON/linux from feature/DRVLIB_SW-484-port-mps2-driver-to-falcon_mountain to xrx500

* commit '54ec145fa49cc73664bb88ddf5f488bd94e5cd96':
  DRVLIB_SW-484 - changes request
  DRVLIB_SW-484 - add dts compat id for falcon mountain "lantiq,mps2-falconmx"

drivers/char/ltq_mps2/drv_mps_linux.c

@@ -874,7 +874,7 @@ static void mps_proc_entrycreate ( struct proc_dir_entry *parent_node,
    Example entry of needed device tree nodes.
    \verbatim
    mps@107000 {
-      compatible = "lantiq,mps2-xrx500";
+      compatible = "lantiq,mps2-falconmx","lantiq,mps2-xrx500";
       reg = <0x107000 0x400>;
       interrupt-parent = <&icu0>;
       interrupts = <154 155>;
@@ -969,6 +969,7 @@ int ltq_mps_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id ltq_mps_match[] = {
+  { .compatible = "lantiq,falconmx-mps2" },
   { .compatible = "lantiq,mps2-xrx500" },
   {},
 };
@@ -976,7 +977,7 @@ MODULE_DEVICE_TABLE(of, ltq_asc_match);
 
 static struct platform_driver ltqmps_driver = {
   .driver   = {
-    .name = "lantiq,mps-xrx500",
+    .name = "lantiq,mps2",
     .owner  = THIS_MODULE,
     .of_match_table = ltq_mps_match,
   },