]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
spi/mpc512x-psc: don't use obsolet cell-index property
authorAnatolij Gustschin <agust@denx.de>
Fri, 11 Jan 2013 00:05:48 +0000 (01:05 +0100)
committerGrant Likely <grant.likely@secretlab.ca>
Tue, 5 Feb 2013 14:44:12 +0000 (14:44 +0000)
Remove deprecated cell-index property and use spi alias to
obtain the SPI PSC number used for SPI bus id.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
drivers/spi/spi-mpc512x-psc.c

index cb3a3106bd4ffaa7f65040df88d48448abdd631d..88e544151f6f3c85db542544a221723a9ad3d566 100644 (file)
@@ -522,17 +522,11 @@ static int mpc512x_psc_spi_of_probe(struct platform_device *op)
        regaddr64 = of_translate_address(op->dev.of_node, regaddr_p);
 
        /* get PSC id (0..11, used by port_config) */
-       if (op->dev.platform_data == NULL) {
-               const u32 *psc_nump;
-
-               psc_nump = of_get_property(op->dev.of_node, "cell-index", NULL);
-               if (!psc_nump || *psc_nump > 11) {
-                       dev_err(&op->dev, "mpc512x_psc_spi: Device node %s "
-                               "has invalid cell-index property\n",
-                               op->dev.of_node->full_name);
-                       return -EINVAL;
-               }
-               id = *psc_nump;
+       id = of_alias_get_id(op->dev.of_node, "spi");
+       if (id < 0) {
+               dev_err(&op->dev, "no alias id for %s\n",
+                       op->dev.of_node->full_name);
+               return id;
        }
 
        return mpc512x_psc_spi_do_probe(&op->dev, (u32) regaddr64, (u32) size64,