aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-05-23 09:26:29 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-06-17 07:54:36 -0400
commit2165f836c8f7036491fae41e9bc327a3cdf2fea3 (patch)
treeda1d84274c510987289ce7fe4471a8a468ed307d /drivers/i2c
parent14c2607144c11653b27a423ead0703ffaa65d0b1 (diff)
i2c: stu300: do not request a specific clock name
We have used the default clock associated with the block for a long time, only heuristics in the clock system has made this work anyway. This needs to be done away with as we start probing this driver and its clocks exclusively from the device tree. Acked-by: Wolfram Sang <wsa@the-dreams.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-stu300.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
index 1beaa05a3d2c..d1a6b204af00 100644
--- a/drivers/i2c/busses/i2c-stu300.c
+++ b/drivers/i2c/busses/i2c-stu300.c
@@ -868,7 +868,6 @@ stu300_probe(struct platform_device *pdev)
868 struct resource *res; 868 struct resource *res;
869 int bus_nr; 869 int bus_nr;
870 int ret = 0; 870 int ret = 0;
871 char clk_name[] = "I2C0";
872 871
873 dev = devm_kzalloc(&pdev->dev, sizeof(struct stu300_dev), GFP_KERNEL); 872 dev = devm_kzalloc(&pdev->dev, sizeof(struct stu300_dev), GFP_KERNEL);
874 if (!dev) { 873 if (!dev) {
@@ -877,8 +876,7 @@ stu300_probe(struct platform_device *pdev)
877 } 876 }
878 877
879 bus_nr = pdev->id; 878 bus_nr = pdev->id;
880 clk_name[3] += (char)bus_nr; 879 dev->clk = devm_clk_get(&pdev->dev, NULL);
881 dev->clk = devm_clk_get(&pdev->dev, clk_name);
882 if (IS_ERR(dev->clk)) { 880 if (IS_ERR(dev->clk)) {
883 dev_err(&pdev->dev, "could not retrieve i2c bus clock\n"); 881 dev_err(&pdev->dev, "could not retrieve i2c bus clock\n");
884 return PTR_ERR(dev->clk); 882 return PTR_ERR(dev->clk);