From 7fa60654752bd4fbbe1e35e310a4bc96b6a3dec3 Mon Sep 17 00:00:00 2001 From: Vaibhav Hiremath Date: Wed, 16 Dec 2015 16:29:18 +0530 Subject: [PATCH] greybus: arche-platform: Rename db3-platform to arche-platform With multiple platforms getting rolled into ara, db3 name is confusing. And this driver is applicable to all arche platforms, so make sense to rename it to arche-platform.c. Also rename all internal functions accordingly. Signed-off-by: Vaibhav Hiremath Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/Makefile | 4 +- .../greybus/{db3-platform.c => arche-platform.c} | 113 +++++++++++---------- 2 files changed, 61 insertions(+), 56 deletions(-) rename drivers/staging/greybus/{db3-platform.c => arche-platform.c} (52%) diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile index 29c4c8b..bc4de85 100644 --- a/drivers/staging/greybus/Makefile +++ b/drivers/staging/greybus/Makefile @@ -28,7 +28,7 @@ gb-light-y := light.o gb-raw-y := raw.o gb-hid-y := hid.o gb-es2-y := es2.o -gb-db3-y := db3-platform.o +gb-arche-y := arche-platform.o gb-audio-codec-y := audio-codec.o gb-camera-y := camera.o @@ -41,7 +41,7 @@ obj-m += gb-light.o obj-m += gb-hid.o obj-m += gb-raw.o obj-m += gb-es2.o -obj-m += gb-db3.o +obj-m += gb-arche.o obj-m += gb-audio-codec.o obj-m += gb-camera.o diff --git a/drivers/staging/greybus/db3-platform.c b/drivers/staging/greybus/arche-platform.c similarity index 52% rename from drivers/staging/greybus/db3-platform.c rename to drivers/staging/greybus/arche-platform.c index eede56b..7d90f5d 100644 --- a/drivers/staging/greybus/db3-platform.c +++ b/drivers/staging/greybus/arche-platform.c @@ -1,5 +1,5 @@ /* - * DB3 Platform driver to enable Unipro link. + * Arche Platform driver to enable Unipro link. * * Copyright 2014-2015 Google Inc. * Copyright 2014-2015 Linaro Ltd. @@ -24,7 +24,7 @@ #include #include -struct db3_platform_drvdata { +struct arche_platform_drvdata { /* Control GPIO signals to and from AP <=> SVC */ int svc_reset_gpio; bool is_reset_act_hi; @@ -44,98 +44,101 @@ static inline void svc_reset_onoff(unsigned int gpio, bool onoff) gpio_set_value(gpio, onoff); } -static void db3_platform_cleanup(struct db3_platform_drvdata *db3_pdata) +static void arche_platform_cleanup(struct arche_platform_drvdata *arche_pdata) { /* As part of exit, put APB back in reset state */ - if (gpio_is_valid(db3_pdata->svc_reset_gpio)) - svc_reset_onoff(db3_pdata->svc_reset_gpio, - db3_pdata->is_reset_act_hi); + if (gpio_is_valid(arche_pdata->svc_reset_gpio)) + svc_reset_onoff(arche_pdata->svc_reset_gpio, + arche_pdata->is_reset_act_hi); } -static int db3_platform_probe(struct platform_device *pdev) +static int arche_platform_probe(struct platform_device *pdev) { - struct db3_platform_drvdata *db3_pdata; + struct arche_platform_drvdata *arche_pdata; struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; int ret; - db3_pdata = devm_kzalloc(&pdev->dev, sizeof(*db3_pdata), GFP_KERNEL); - if (!db3_pdata) + arche_pdata = devm_kzalloc(&pdev->dev, sizeof(*arche_pdata), GFP_KERNEL); + if (!arche_pdata) return -ENOMEM; /* setup svc reset gpio */ - db3_pdata->is_reset_act_hi = of_property_read_bool(np, "svc,reset-active-high"); - db3_pdata->svc_reset_gpio = of_get_named_gpio(np, "svc,reset-gpio", 0); - if (db3_pdata->svc_reset_gpio < 0) { + arche_pdata->is_reset_act_hi = of_property_read_bool(np, + "svc,reset-active-high"); + arche_pdata->svc_reset_gpio = of_get_named_gpio(np, "svc,reset-gpio", 0); + if (arche_pdata->svc_reset_gpio < 0) { dev_err(dev, "failed to get reset-gpio\n"); - ret = -ENODEV; - return ret; + return -ENODEV; } - ret = devm_gpio_request(dev, db3_pdata->svc_reset_gpio, "svc-reset"); + ret = devm_gpio_request(dev, arche_pdata->svc_reset_gpio, "svc-reset"); if (ret) { dev_err(dev, "failed to request svc-reset gpio:%d\n", ret); return ret; } - ret = gpio_direction_output(db3_pdata->svc_reset_gpio, db3_pdata->is_reset_act_hi); + ret = gpio_direction_output(arche_pdata->svc_reset_gpio, + arche_pdata->is_reset_act_hi); if (ret) { dev_err(dev, "failed to set svc-reset gpio dir:%d\n", ret); return ret; } - db3_pdata->svc_sysboot_gpio = of_get_named_gpio(np, "svc,sysboot-gpio", 0); - if (db3_pdata->svc_sysboot_gpio < 0) { + arche_pdata->svc_sysboot_gpio = of_get_named_gpio(np, + "svc,sysboot-gpio", 0); + if (arche_pdata->svc_sysboot_gpio < 0) { dev_err(dev, "failed to get sysboot gpio\n"); - ret = -ENODEV; - return ret; + return -ENODEV; } - ret = devm_gpio_request(dev, db3_pdata->svc_sysboot_gpio, "sysboot0"); + ret = devm_gpio_request(dev, arche_pdata->svc_sysboot_gpio, "sysboot0"); if (ret) { dev_err(dev, "failed to request sysboot0 gpio:%d\n", ret); return ret; } - ret = gpio_direction_output(db3_pdata->svc_sysboot_gpio, 0); + ret = gpio_direction_output(arche_pdata->svc_sysboot_gpio, 0); if (ret) { dev_err(dev, "failed to set svc-reset gpio dir:%d\n", ret); return ret; } /* setup the clock request gpio first */ - db3_pdata->svc_refclk_req = of_get_named_gpio(np, "svc,refclk-req-gpio", 0); - if (db3_pdata->svc_refclk_req < 0) { + arche_pdata->svc_refclk_req = of_get_named_gpio(np, + "svc,refclk-req-gpio", 0); + if (arche_pdata->svc_refclk_req < 0) { dev_err(dev, "failed to get svc clock-req gpio\n"); return -ENODEV; } - ret = devm_gpio_request(dev, db3_pdata->svc_refclk_req, "svc-clk-req"); + ret = devm_gpio_request(dev, arche_pdata->svc_refclk_req, "svc-clk-req"); if (ret) { dev_err(dev, "failed to request svc-clk-req gpio: %d\n", ret); return ret; } - ret = gpio_direction_input(db3_pdata->svc_refclk_req); + ret = gpio_direction_input(arche_pdata->svc_refclk_req); if (ret) { dev_err(dev, "failed to set svc-clk-req gpio dir :%d\n", ret); return ret; } /* setup refclk2 to follow the pin */ - db3_pdata->svc_ref_clk = devm_clk_get(dev, "svc_ref_clk"); - if (IS_ERR(db3_pdata->svc_ref_clk)) { - ret = PTR_ERR(db3_pdata->svc_ref_clk); + arche_pdata->svc_ref_clk = devm_clk_get(dev, "svc_ref_clk"); + if (IS_ERR(arche_pdata->svc_ref_clk)) { + ret = PTR_ERR(arche_pdata->svc_ref_clk); dev_err(dev, "failed to get svc_ref_clk: %d\n", ret); return ret; } - ret = clk_prepare_enable(db3_pdata->svc_ref_clk); + ret = clk_prepare_enable(arche_pdata->svc_ref_clk); if (ret) { dev_err(dev, "failed to enable svc_ref_clk: %d\n", ret); return ret; } - platform_set_drvdata(pdev, db3_pdata); - - db3_pdata->num_apbs = of_get_child_count(np); - dev_dbg(dev, "Number of APB's available - %d\n", db3_pdata->num_apbs); + platform_set_drvdata(pdev, arche_pdata); /* bring SVC out of reset */ - svc_reset_onoff(db3_pdata->svc_reset_gpio, !db3_pdata->is_reset_act_hi); + svc_reset_onoff(arche_pdata->svc_reset_gpio, + !arche_pdata->is_reset_act_hi); + + arche_pdata->num_apbs = of_get_child_count(np); + dev_dbg(dev, "Number of APB's available - %d\n", arche_pdata->num_apbs); /* probe all childs here */ ret = of_platform_populate(np, NULL, NULL, dev); @@ -146,19 +149,19 @@ static int db3_platform_probe(struct platform_device *pdev) return ret; } -static int db3_platform_remove(struct platform_device *pdev) +static int arche_platform_remove(struct platform_device *pdev) { - struct db3_platform_drvdata *db3_pdata = platform_get_drvdata(pdev); + struct arche_platform_drvdata *arche_pdata = platform_get_drvdata(pdev); - if (db3_pdata) - db3_platform_cleanup(db3_pdata); + if (arche_pdata) + arche_platform_cleanup(arche_pdata); platform_set_drvdata(pdev, NULL); return 0; } -static int db3_platform_suspend(struct device *dev) +static int arche_platform_suspend(struct device *dev) { /* * If timing profile premits, we may shutdown bridge @@ -172,7 +175,7 @@ static int db3_platform_suspend(struct device *dev) return 0; } -static int db3_platform_resume(struct device *dev) +static int arche_platform_resume(struct device *dev) { /* * Atleast for ES2 we have to meet the delay requirement between @@ -186,26 +189,28 @@ static int db3_platform_resume(struct device *dev) return 0; } -static SIMPLE_DEV_PM_OPS(db3_platform_pm_ops, db3_platform_suspend, db3_platform_resume); +static SIMPLE_DEV_PM_OPS(arche_platform_pm_ops, + arche_platform_suspend, + arche_platform_resume); -static struct of_device_id db3_platform_of_match[] = { - { .compatible = "google,db3-platform", }, /* Use PID/VID of SVC device */ +static struct of_device_id arche_platform_of_match[] = { + { .compatible = "google,arche-platform", }, /* Use PID/VID of SVC device */ { }, }; -MODULE_DEVICE_TABLE(of, db3_platform_of_match); +MODULE_DEVICE_TABLE(of, arche_platform_of_match); -static struct platform_driver db3_platform_device_driver = { - .probe = db3_platform_probe, - .remove = db3_platform_remove, +static struct platform_driver arche_platform_device_driver = { + .probe = arche_platform_probe, + .remove = arche_platform_remove, .driver = { - .name = "db3-platform-ctrl", - .pm = &db3_platform_pm_ops, - .of_match_table = of_match_ptr(db3_platform_of_match), + .name = "arche-platform-ctrl", + .pm = &arche_platform_pm_ops, + .of_match_table = of_match_ptr(arche_platform_of_match), } }; -module_platform_driver(db3_platform_device_driver); +module_platform_driver(arche_platform_device_driver); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Vaibhav Hiremath "); -MODULE_DESCRIPTION("DB3 Platform Driver"); +MODULE_DESCRIPTION("Arche Platform Driver"); -- 2.7.4