case DSA_PORT_TYPE_UNUSED:
                break;
        case DSA_PORT_TYPE_CPU:
+               /* dp->index is used now as port_number. However
+                * CPU ports should have separate numbering
+                * independent from front panel port numbers.
+                */
+               devlink_port_attrs_set(&dp->devlink_port,
+                                      DEVLINK_PORT_FLAVOUR_CPU,
+                                      dp->index, false, 0);
+               err = dsa_port_link_register_of(dp);
+               if (err) {
+                       dev_err(ds->dev, "failed to setup link for port %d.%d\n",
+                               ds->index, dp->index);
+                       return err;
+               }
+               break;
        case DSA_PORT_TYPE_DSA:
+               /* dp->index is used now as port_number. However
+                * DSA ports should have separate numbering
+                * independent from front panel port numbers.
+                */
+               devlink_port_attrs_set(&dp->devlink_port,
+                                      DEVLINK_PORT_FLAVOUR_DSA,
+                                      dp->index, false, 0);
                err = dsa_port_link_register_of(dp);
                if (err) {
                        dev_err(ds->dev, "failed to setup link for port %d.%d\n",
                }
                break;
        case DSA_PORT_TYPE_USER:
+               devlink_port_attrs_set(&dp->devlink_port,
+                                      DEVLINK_PORT_FLAVOUR_PHYSICAL,
+                                      dp->index, false, 0);
                err = dsa_slave_create(dp);
                if (err)
                        dev_err(ds->dev, "failed to create slave for port %d.%d\n",