]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
i2c-pca-platform: Use defaults if no platform_data given
authorWolfram Sang <w.sang@pengutronix.de>
Sat, 28 Mar 2009 20:34:45 +0000 (21:34 +0100)
committerJean Delvare <khali@linux-fr.org>
Sat, 28 Mar 2009 20:34:45 +0000 (21:34 +0100)
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
drivers/i2c/busses/i2c-pca-platform.c

index df5e593a1d769c0f62b2c7547cdacf5293be2de4..7b23891b7d59606d41acef1918cffede3cba724b 100644 (file)
@@ -177,10 +177,20 @@ static int __devinit i2c_pca_pf_probe(struct platform_device *pdev)
                 (unsigned long) res->start);
        i2c->adap.algo_data = &i2c->algo_data;
        i2c->adap.dev.parent = &pdev->dev;
-       i2c->adap.timeout = platform_data->timeout;
 
-       i2c->algo_data.i2c_clock = platform_data->i2c_clock_speed;
+       if (platform_data) {
+               i2c->adap.timeout = platform_data->timeout;
+               i2c->algo_data.i2c_clock = platform_data->i2c_clock_speed;
+               i2c->gpio = platform_data->gpio;
+       } else {
+               i2c->adap.timeout = HZ;
+               i2c->algo_data.i2c_clock = 59000;
+               i2c->gpio = -1;
+       }
+
        i2c->algo_data.data = i2c;
+       i2c->algo_data.wait_for_completion = i2c_pca_pf_waitforcompletion;
+       i2c->algo_data.reset_chip = i2c_pca_pf_dummyreset;
 
        switch (res->flags & IORESOURCE_MEM_TYPE_MASK) {
        case IORESOURCE_MEM_32BIT:
@@ -198,11 +208,6 @@ static int __devinit i2c_pca_pf_probe(struct platform_device *pdev)
                break;
        }
 
-       i2c->algo_data.wait_for_completion = i2c_pca_pf_waitforcompletion;
-
-       i2c->gpio = platform_data->gpio;
-       i2c->algo_data.reset_chip = i2c_pca_pf_dummyreset;
-
        /* Use gpio_is_valid() when in mainline */
        if (i2c->gpio > -1) {
                ret = gpio_request(i2c->gpio, i2c->adap.name);