greybus: gpio: Switch to the gpio descriptor interface
v7 cover greybus: gpio: Switch to the gpio descriptor interface
This patch series converts uses of the old GPIO API to the GPIO descriptor API. It also converts the GPIO driver to use the GPIO irqchip library GPIOLIB_IRQCHIP instead of repimplementing the same.
Chnages in v7:
- Combine the three patches together.
Changes in v6:
- Patchset now contains two patches as the patch
1 has been accepted.
- Changes mentioned in individual patches of the set.
Changes in v5:
- Drop the patch which uses gpiochip_get_data() in place of gpio_chip_to_gb_gpio_controller() as of now.
- This is because it currently breaks the driver, since gpiochip_add() sets the data pointer to NULL.
Changes in v4:
- Changes mentioned in individual patches of the set.
Changes in v3:
- Combines the latest versions of the three greybus patches together in a patch series.
Nishad Kamdar (3):
staging: greybus: gpio: switch GPIO portions to use GPIOLIB_IRQCHIP
staging: greybus: arche-apb-ctrl.c: Switch to the gpio descriptor
interface
staging: greybus: arche-platform: Switch to the gpio descriptor
interface
drivers/staging/greybus/Kconfig | 1 + drivers/staging/greybus/TODO | 2 - drivers/staging/greybus/arche-apb-ctrl.c | 152 +++++++++------------- drivers/staging/greybus/arche-platform.c | 124 ++++++------------ drivers/staging/greybus/gpio.c | 156 ++--------------------- 5 files changed, 113 insertions(+), 322 deletions(-)
Signature · 1 line
2.17.1
PATCH v7 1/3 staging: greybus: gpio: switch GPIO portions to use GPIOLIB_IRQCHIP
Convert the GPIO driver to use the GPIO irqchip library GPIOLIB_IRQCHIP instead of reimplementing the same.
---
Changes in v7:
- No change.
Changes in v5:
- Restore "struct irq_chip irqc" in "struct gb_gpio_controller"
This is because we cannot use the gpio-chip irqchip, as that
will register the irqchip automatically and possibly in an
incompatible way.
Changes in v4:
- Remove changes related to conversion to gpiochip_get_data() to
include it as a new patch.
- Remove the 'struct irq_chip' field from 'struct gb_gpio_controller'
as struct gpio_chip will have an irqchip whenever
CONFIG_GPIOLIB_IRQCHIP is selected.
- Update the TODO file as per the changes.
Changes in v3:
- Combine patches as into a patch series.
Changes in v2:
- Retained irq.h and irqdomain.h headers.
- Dropped function gb_gpio_irqchip_add() and
called gpiochip_irqchip_add() from probe().
- Referred https://lkml.kernel.org/r/[email protected].
--- drivers/staging/greybus/Kconfig | 1 + drivers/staging/greybus/TODO | 2 - drivers/staging/greybus/gpio.c | 156 ++------------------------------ 3 files changed, 11 insertions(+), 148 deletions(-)
drivers/staging/greybus/Kconfig +1 -0
@@ -148,6 +148,7 @@ if GREYBUS_BRIDGED_PHY config GREYBUS_GPIO tristate "Greybus GPIO Bridged PHY driver" depends on GPIOLIB + select GPIOLIB_IRQCHIP ---help--- Select this option if you have a device that follows the Greybus GPIO Bridged PHY Class specification.
drivers/staging/greybus/TODO +0 -2
@@ -1,5 +1,3 @@ * Convert all uses of the old GPIO API from <linux/gpio.h> to the GPIO descriptor API in <linux/gpio/consumer.h> and look up GPIO lines from device tree or ACPI. -* Convert the GPIO driver to use the GPIO irqchip library - GPIOLIB_IRQCHIP instead of reimplementing the same.
drivers/staging/greybus/gpio.c +10 -146
210 lines not on this page · raw message
Signature · 1 line
2.17.1
Greg Kroah-Hartman
maintainerRe: [PATCH v7 1/3] staging: greybus: gpio: switch GPIO portions to use GPIOLIB_IRQCHIP
Quoted 5 lines · Nishad Kamdar
Convert the GPIO driver to use the GPIO irqchip library
GPIOLIB_IRQCHIPinstead of reimplementing the same.Reviewed-by Johan Hovold <[email protected]>Signed-off-by Nishad Kamdar <[email protected]>
Did you test build this patch?
It fails horribly for me:
drivers/staging/greybus/gpio.c: In function ‘gb_gpio_request_handler’:drivers/staging/greybus/gpio.c:389:34: error: ‘struct gpio_chip’ has no member named ‘irq’
irq = irq_find_mapping(ggc->chip.irq.domain, event->which);
^ CC [M] drivers/staging/rtl8712/usb_intf.odrivers/staging/greybus/gpio.c: In function ‘gb_gpio_probe’:drivers/staging/greybus/gpio.c:577:8: error: implicit declaration of function ‘gpiochip_irqchip_add’; did you mean ‘gpiochip_add’? [-Werror=implicit-function-declaration]
ret = gpiochip_irqchip_add(gpio, irqc, 0, handle_level_irq,
^~~~~~~~~~~~~~~~~~~~
gpiochip_addPlease be more careful...
greg k-h
Greg Kroah-Hartman
maintainerRe: [PATCH v7 1/3] staging: greybus: gpio: switch GPIO portions to use GPIOLIB_IRQCHIP
Quoted 19 lines · Greg Kroah-Hartman
Quoted 5 lines · Nishad Kamdar
Convert the GPIO driver to use the GPIO irqchip library
GPIOLIB_IRQCHIPinstead of reimplementing the same.Reviewed-by Johan Hovold <[email protected]>Signed-off-by Nishad Kamdar <[email protected]>Did you test build this patch?
It fails horribly for me:
drivers/staging/greybus/gpio.c: In function ‘gb_gpio_request_handler’:drivers/staging/greybus/gpio.c:389:34: error: ‘struct gpio_chip’ has no member named ‘irq’irq = irq_find_mapping(ggc->chip.irq.domain, event->which); ^CC [M]
drivers/staging/rtl8712/usb_intf.odrivers/staging/greybus/gpio.c: In function ‘gb_gpio_probe’:drivers/staging/greybus/gpio.c:577:8: error: implicit declaration of function ‘gpiochip_irqchip_add’; did you mean ‘gpiochip_add’? [-Werror=implicit-function-declaration]
ret = gpiochip_irqchip_add(gpio, irqc, 0,handle_level_irq,
Quoted 5 lines
^~~~~~~~~~~~~~~~~~~~ gpiochip_addPlease be more careful...
Hm, this seems to be a problem on my side. You selected the new config symbol, but my quick build system didn't catch that and it didnt regenerate the kernel configuration, which causes this problem.
So this is fine, sorry for the noise, my fault.
greg k-h
PATCH v7 2/3 staging: greybus: arche-apb-ctrl.c: Switch to the gpio descriptor interface
In reply to Nishad KamdarUse the gpiod interface instead of the deprecated old non-descriptor interface while continuing to ignore gpio flags from device tree in functions "deassert_reset()" and "assert_reset()" for now.
---
Changes in v7:
- No change.
Changes in v6:
- Remove some unnecessary line breaks.
Changes in v5:
- Change the commit message.
- Restore the names of the gpio device-tree properties without the "-gpio" suffix.
Changes in v4:
- Use gpiod_set_raw_value() for deassert_reset() and assert_reset() as gpiod_set_value() will change the sematics of these calls by taking any gpio flags into account.
- Remove some unnecesssary line breaks.
- Restore 'spi_en' gpio check in fw_flashing_seq() as it is currently optional.
Changes in v3:
- Add this patch in a patchset.
Changes in v2:
- Resolved compilation errors.
--- drivers/staging/greybus/arche-apb-ctrl.c | 152 +++++++++-------------- 1 file changed, 61 insertions(+), 91 deletions(-)
drivers/staging/greybus/arche-apb-ctrl.c +61 -91
@@ -8,9 +8,8 @@#include <linux/clk.h> #include <linux/delay.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/interrupt.h> -#include <linux/of_gpio.h> #include <linux/of_irq.h> #include <linux/module.h> #include <linux/pinctrl/consumer.h>
@@ -24,12 +23,12 @@ static void apb_bootret_deassert(struct device *dev);struct arche_apb_ctrl_drvdata {/* Control GPIO signals to and from AP <=> AP Bridges */ -int resetn_gpio; -int boot_ret_gpio; -int pwroff_gpio; -int wake_in_gpio; -int wake_out_gpio; -int pwrdn_gpio; +struct gpio_desc *resetn; +struct gpio_desc *boot_ret; +struct gpio_desc *pwroff; +struct gpio_desc *wake_in; +struct gpio_desc *wake_out; +struct gpio_desc *pwrdn;enum arche_platform_state state;bool init_disabled;
@@ -37,28 +36,28 @@ struct arche_apb_ctrl_drvdata {struct regulator *vcore;struct regulator *vio; -int clk_en_gpio; +struct gpio_desc *clk_en;struct clk *clk;struct pinctrl *pinctrl;struct pinctrl_state *pin_default;/* V2: SPI Bus control */ -int spi_en_gpio; +struct gpio_desc *spi_en;bool spi_en_polarity_high; };/* * Note that these low level api's are active high */ -static inline void deassert_reset (unsigned int gpio) +static inline void deassert_reset (struct gpio_desc *gpio) { -gpio_set_value (gpio,1 ); +gpiod_set_raw_value (gpio,1 ); } -static inline void assert_reset (unsigned int gpio) +static inline void assert_reset (struct gpio_desc *gpio) { -gpio_set_value (gpio,0 ); +gpiod_set_raw_value (gpio,0 ); }/*
@@ -75,11 +74,10 @@ static int coldboot_seq(struct platform_device *pdev)return 0 ;/* Hold APB in reset state */ -assert_reset (apb->resetn_gpio); +assert_reset (apb->resetn); -if (apb->state ==ARCHE_PLATFORM_STATE_FW_FLASHING && -gpio_is_valid (apb->spi_en_gpio)) -devm_gpio_free (dev, apb->spi_en_gpio); +if (apb->state ==ARCHE_PLATFORM_STATE_FW_FLASHING && apb->spi_en) +devm_gpiod_put (dev, apb->spi_en);/* Enable power to APB */ if (!IS_ERR (apb->vcore)) {
@@ -101,13 +99,13 @@ static int coldboot_seq(struct platform_device *pdev)apb_bootret_deassert (dev);/* On DB3 clock was not mandatory */ -if (gpio_is_valid (apb->clk_en_gpio)) -gpio_set_value (apb->clk_en_gpio,1 ); +if (apb->clk_en) +gpiod_set_value (apb->clk_en,1 );usleep_range (100 ,200 );/* deassert reset to APB : Active-low signal */ -deassert_reset (apb->resetn_gpio); +deassert_reset (apb->resetn); apb->state =ARCHE_PLATFORM_STATE_ACTIVE ;
@@ -136,25 +134,25 @@ static int fw_flashing_seq(struct platform_device *pdev)return ret; } -if (gpio_is_valid (apb->spi_en_gpio)) { +if (apb->spi_en) {unsigned long flags;if (apb->spi_en_polarity_high) - flags =GPIOF_OUT_INIT_HIGH ; + flags =GPIOD_OUT_HIGH ;else - flags =GPIOF_OUT_INIT_LOW ; + flags =GPIOD_OUT_LOW ; - ret =devm_gpio_request_one (dev, apb->spi_en_gpio, - flags,"apb_spi_en" ); -if (ret) { -dev_err (dev,"Failed requesting SPI bus en gpio %d\n" , - apb->spi_en_gpio); + apb->spi_en =devm_gpiod_get (dev,"spi-en" , flags); +if (IS_ERR (apb->spi_en)) { + ret =PTR_ERR (apb->spi_en); +dev_err (dev,"Failed requesting SPI bus en GPIO: %d\n" , + ret);return ret; } }/* for flashing device should be in reset state */ -assert_reset (apb->resetn_gpio); +assert_reset (apb->resetn); apb->state =ARCHE_PLATFORM_STATE_FW_FLASHING ;return 0 ;
@@ -176,9 +174,8 @@ static int standby_boot_seq(struct platform_device *pdev) apb->state == ARCHE_PLATFORM_STATE_OFF)return 0 ; -if (apb->state ==ARCHE_PLATFORM_STATE_FW_FLASHING && -gpio_is_valid (apb->spi_en_gpio)) -devm_gpio_free (dev, apb->spi_en_gpio); +if (apb->state ==ARCHE_PLATFORM_STATE_FW_FLASHING && apb->spi_en) +devm_gpiod_put (dev, apb->spi_en);/* * As per WDM spec, do nothing
@@ -201,13 +198,12 @@ static void poweroff_seq(struct platform_device *pdev)if (apb->init_disabled || apb->state ==ARCHE_PLATFORM_STATE_OFF )return ; -if (apb->state ==ARCHE_PLATFORM_STATE_FW_FLASHING && -gpio_is_valid (apb->spi_en_gpio)) -devm_gpio_free (dev, apb->spi_en_gpio); +if (apb->state ==ARCHE_PLATFORM_STATE_FW_FLASHING && apb->spi_en) +devm_gpiod_put (dev, apb->spi_en);/* disable the clock */ -if (gpio_is_valid (apb->clk_en_gpio)) -gpio_set_value (apb->clk_en_gpio,0 ); +if (apb->clk_en) +gpiod_set_value (apb->clk_en,0 );if (!IS_ERR (apb->vcore) &®ulator_is_enabled (apb->vcore) >0 )regulator_disable (apb->vcore);
@@ -216,7 +212,7 @@ static void poweroff_seq(struct platform_device *pdev)regulator_disable (apb->vio);/* As part of exit, put APB back in reset state */ -assert_reset (apb->resetn_gpio); +assert_reset (apb->resetn); apb->state =ARCHE_PLATFORM_STATE_OFF ;/* TODO: May have to send an event to SVC about this exit */
@@ -226,7 +222,7 @@ static void apb_bootret_deassert(struct device *dev) {struct arche_apb_ctrl_drvdata *apb =dev_get_drvdata (dev); -gpio_set_value (apb->boot_ret_gpio,0 ); +gpiod_set_value (apb->boot_ret,0 ); }int apb_ctrl_coldboot (struct device *dev)
@@ -322,66 +318,44 @@ static int apb_ctrl_get_devtree_data(struct platform_device *pdev, struct arche_apb_ctrl_drvdata *apb) {struct device *dev = &pdev->dev; -struct device_node *np = dev->of_node;int ret; - apb->resetn_gpio =of_get_named_gpio (np,"reset-gpios" ,0 ); -if (apb->resetn_gpio <0 ) { -dev_err (dev,"failed to get reset gpio\n" ); -return apb->resetn_gpio; - } - ret =devm_gpio_request_one (dev, apb->resetn_gpio, -GPIOF_OUT_INIT_LOW ,"apb-reset" ); -if (ret) { -dev_err (dev,"Failed requesting reset gpio %d\n" , - apb->resetn_gpio); + apb->resetn =devm_gpiod_get (dev,"reset" ,GPIOD_OUT_LOW ); +if (IS_ERR (apb->resetn)) { + ret =PTR_ERR (apb->resetn); +dev_err (dev,"Failed requesting reset GPIO: %d\n" , ret);return ret; } - apb->boot_ret_gpio =of_get_named_gpio (np,"boot-ret-gpios" ,0 ); -if (apb->boot_ret_gpio <0 ) { -dev_err (dev,"failed to get boot retention gpio\n" ); -return apb->boot_ret_gpio; - } - ret =devm_gpio_request_one (dev, apb->boot_ret_gpio, -GPIOF_OUT_INIT_LOW ,"boot retention" ); -if (ret) { -dev_err (dev,"Failed requesting bootret gpio %d\n" , - apb->boot_ret_gpio); + apb->boot_ret =devm_gpiod_get (dev,"boot-ret" ,GPIOD_OUT_LOW ); +if (IS_ERR (apb->boot_ret)) { + ret =PTR_ERR (apb->boot_ret); +dev_err (dev,"Failed requesting bootret GPIO: %d\n" , ret);return ret; }/* It's not mandatory to support power management interface */ - apb->pwroff_gpio =of_get_named_gpio (np,"pwr-off-gpios" ,0 ); -if (apb->pwroff_gpio <0 ) { -dev_err (dev,"failed to get power off gpio\n" ); -return apb->pwroff_gpio; - } - ret =devm_gpio_request_one (dev, apb->pwroff_gpio, -GPIOF_IN ,"pwroff_n" ); -if (ret) { -dev_err (dev,"Failed requesting pwroff_n gpio %d\n" , - apb->pwroff_gpio); + apb->pwroff =devm_gpiod_get_optional (dev,"pwr-off" ,GPIOD_IN ); +if (IS_ERR (apb->pwroff)) { + ret =PTR_ERR (apb->pwroff); +dev_err (dev,"Failed requesting pwroff_n GPIO: %d\n" , ret);return ret; }/* Do not make clock mandatory as of now (for DB3) */ - apb->clk_en_gpio =of_get_named_gpio (np,"clock-en-gpio" ,0 ); -if (apb->clk_en_gpio <0 ) { -dev_warn (dev,"failed to get clock en gpio\n" ); - }else if (gpio_is_valid (apb->clk_en_gpio)) { - ret =devm_gpio_request_one (dev, apb->clk_en_gpio, -GPIOF_OUT_INIT_LOW ,"apb_clk_en" ); -if (ret) { -dev_warn (dev,"Failed requesting APB clock en gpio %d\n" , - apb->clk_en_gpio); -return ret; - } + apb->clk_en =devm_gpiod_get_optional (dev,"clock-en" ,GPIOD_OUT_LOW ); +if (IS_ERR (apb->clk_en)) { + ret =PTR_ERR (apb->clk_en); +dev_err (dev,"Failed requesting APB clock en GPIO: %d\n" , ret); +return ret; } - apb->pwrdn_gpio =of_get_named_gpio (np,"pwr-down-gpios" ,0 ); -if (apb->pwrdn_gpio <0 ) -dev_warn (dev,"failed to get power down gpio\n" ); + apb->pwrdn =devm_gpiod_get (dev,"pwr-down" ,GPIOD_OUT_LOW ); +if (IS_ERR (apb->pwrdn)) { + ret =PTR_ERR (apb->pwrdn); +dev_warn (dev,"Failed requesting power down GPIO: %d\n" , ret); +return ret; + }/* Regulators are optional, as we may have fixed supply coming in */ apb->vcore =devm_regulator_get (dev,"vcore" );
@@ -404,12 +378,8 @@ static int apb_ctrl_get_devtree_data(struct platform_device *pdev, }/* Only applicable for platform >= V2 */ - apb->spi_en_gpio =of_get_named_gpio (np,"spi-en-gpio" ,0 ); -if (apb->spi_en_gpio >=0 ) { -if (of_property_read_bool (pdev->dev.of_node, -"spi-en-active-high" )) - apb->spi_en_polarity_high = true; - } +if (of_property_read_bool (pdev->dev.of_node,"gb,spi-en-active-high" )) + apb->spi_en_polarity_high = true;return 0 ; }
Signature · 1 line
2.17.1
PATCH v7 3/3 staging: greybus: arche-platform: Switch to the gpio descriptor interface
In reply to Nishad KamdarUse the gpiod interface instead of the deprecated old non-descriptor interface while continuing to ignore gpio flags from device tree in "svc_reset_onoff()" for now.
---
Changes in v7:
- No change.
Changes in v6:
- Make error messages consistent.
Changes in v5:
- Change the commit message.
- Restore the names of the gpio device-tree properties without the "-gpio" suffix.
Changes in v4:
- Move 'gpio_desc *svc_sysboot' below the reset flag as it is more logical to have reset flag below reset gpio.
- Remove a few unnecessary line breaks.
Changes in v3:
- Add this patch to a patchset.
Changes in v2:
- Move comment to the same line as to what it applies to.
--- drivers/staging/greybus/arche-platform.c | 124 ++++++++--------------- 1 file changed, 41 insertions(+), 83 deletions(-)
drivers/staging/greybus/arche-platform.c +41 -83
@@ -8,10 +8,9 @@#include <linux/clk.h> #include <linux/delay.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/of_gpio.h> #include <linux/of_platform.h> #include <linux/pinctrl/consumer.h> #include <linux/platform_device.h>
@@ -45,14 +44,14 @@ enum svc_wakedetect_state {struct arche_platform_drvdata {/* Control GPIO signals to and from AP <=> SVC */ -int svc_reset_gpio; +struct gpio_desc *svc_reset;bool is_reset_act_hi; -int svc_sysboot_gpio; -int wake_detect_gpio;/* bi-dir,maps to WAKE_MOD & WAKE_FRAME signals */ +struct gpio_desc *svc_sysboot; +struct gpio_desc *wake_detect;/* bi-dir,maps to WAKE_MOD & WAKE_FRAME signals */ enum arche_platform_state state; -int svc_refclk_req; +struct gpio_desc *svc_refclk_req;struct clk *svc_ref_clk;struct pinctrl *pinctrl;
@@ -85,9 +84,9 @@ static void arche_platform_set_wake_detect_state( arche_pdata->wake_detect_state = state; } -static inline void svc_reset_onoff (unsigned int gpio,bool onoff) +static inline void svc_reset_onoff (struct gpio_desc *gpio,bool onoff) { -gpio_set_value (gpio, onoff); +gpiod_set_raw_value (gpio, onoff); }static int apb_cold_boot (struct device *dev,void *data)
@@ -116,7 +115,6 @@ static int apb_poweroff(struct device *dev, void *data)static void arche_platform_wd_irq_en (struct arche_platform_drvdata *arche_pdata) {/* Enable interrupt here, to read event back from SVC */ -gpio_direction_input (arche_pdata->wake_detect_gpio);enable_irq (arche_pdata->wake_detect_irq); }
@@ -160,7 +158,7 @@ static irqreturn_t arche_platform_wd_irq(int irq, void *devid)spin_lock_irqsave (&arche_pdata->wake_lock, flags); -if (gpio_get_value (arche_pdata->wake_detect_gpio)) { +if (gpiod_get_value (arche_pdata->wake_detect)) {/* wake/detect rising */ /*
@@ -224,10 +222,9 @@ arche_platform_coldboot_seq(struct arche_platform_drvdata *arche_pdata)dev_info (arche_pdata->dev,"Booting from cold boot state\n" ); -svc_reset_onoff (arche_pdata->svc_reset_gpio, - arche_pdata->is_reset_act_hi); +svc_reset_onoff (arche_pdata->svc_reset, arche_pdata->is_reset_act_hi); -gpio_set_value (arche_pdata->svc_sysboot_gpio,0 ); +gpiod_set_value (arche_pdata->svc_sysboot,0 );usleep_range (100 ,200 ); ret =clk_prepare_enable (arche_pdata->svc_ref_clk);
@@ -238,8 +235,7 @@ arche_platform_coldboot_seq(struct arche_platform_drvdata *arche_pdata) }/* bring SVC out of reset */ -svc_reset_onoff (arche_pdata->svc_reset_gpio, - !arche_pdata->is_reset_act_hi); +svc_reset_onoff (arche_pdata->svc_reset, !arche_pdata->is_reset_act_hi);arche_platform_set_state (arche_pdata,ARCHE_PLATFORM_STATE_ACTIVE );
@@ -259,10 +255,9 @@ arche_platform_fw_flashing_seq(struct arche_platform_drvdata *arche_pdata)dev_info (arche_pdata->dev,"Switching to FW flashing state\n" ); -svc_reset_onoff (arche_pdata->svc_reset_gpio, - arche_pdata->is_reset_act_hi); +svc_reset_onoff (arche_pdata->svc_reset, arche_pdata->is_reset_act_hi); -gpio_set_value (arche_pdata->svc_sysboot_gpio,1 ); +gpiod_set_value (arche_pdata->svc_sysboot,1 );usleep_range (100 ,200 );
@@ -273,8 +268,7 @@ arche_platform_fw_flashing_seq(struct arche_platform_drvdata *arche_pdata)return ret; } -svc_reset_onoff (arche_pdata->svc_reset_gpio, - !arche_pdata->is_reset_act_hi); +svc_reset_onoff (arche_pdata->svc_reset, !arche_pdata->is_reset_act_hi);arche_platform_set_state (arche_pdata,ARCHE_PLATFORM_STATE_FW_FLASHING );
@@ -305,8 +299,7 @@ arche_platform_poweroff_seq(struct arche_platform_drvdata *arche_pdata)clk_disable_unprepare (arche_pdata->svc_ref_clk);/* As part of exit, put APB back in reset state */ -svc_reset_onoff (arche_pdata->svc_reset_gpio, - arche_pdata->is_reset_act_hi); +svc_reset_onoff (arche_pdata->svc_reset, arche_pdata->is_reset_act_hi);arche_platform_set_state (arche_pdata,ARCHE_PLATFORM_STATE_OFF ); }
@@ -435,6 +428,7 @@ static int arche_platform_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct device_node *np = dev->of_node;int ret; +unsigned int flags; arche_pdata =devm_kzalloc (&pdev->dev,sizeof (*arche_pdata),GFP_KERNEL );
@@ -444,61 +438,33 @@ static int arche_platform_probe(struct platform_device *pdev)/* setup svc reset gpio */ 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 (!gpio_is_valid (arche_pdata->svc_reset_gpio)) { -dev_err (dev,"failed to get reset-gpio\n" ); -return arche_pdata->svc_reset_gpio; - } - 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 (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); +if (arche_pdata->is_reset_act_hi) + flags =GPIOD_OUT_HIGH ; +else + flags =GPIOD_OUT_LOW ; + + arche_pdata->svc_reset =devm_gpiod_get (dev,"svc,reset" , flags); +if (IS_ERR (arche_pdata->svc_reset)) { + ret =PTR_ERR (arche_pdata->svc_reset); +dev_err (dev,"failed to request svc-reset GPIO: %d\n" , ret);return ret; }arche_platform_set_state (arche_pdata,ARCHE_PLATFORM_STATE_OFF ); - arche_pdata->svc_sysboot_gpio =of_get_named_gpio (np, -"svc,sysboot-gpio" , -0 ); -if (!gpio_is_valid (arche_pdata->svc_sysboot_gpio)) { -dev_err (dev,"failed to get sysboot gpio\n" ); -return arche_pdata->svc_sysboot_gpio; - } - 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 (arche_pdata->svc_sysboot_gpio,0 ); -if (ret) { -dev_err (dev,"failed to set svc-reset gpio dir:%d\n" , ret); + arche_pdata->svc_sysboot =devm_gpiod_get (dev,"svc,sysboot" , +GPIOD_OUT_LOW ); +if (IS_ERR (arche_pdata->svc_sysboot)) { + ret =PTR_ERR (arche_pdata->svc_sysboot); +dev_err (dev,"failed to request sysboot0 GPIO: %d\n" , ret);return ret; }/* setup the clock request gpio first */ - arche_pdata->svc_refclk_req =of_get_named_gpio (np, -"svc,refclk-req-gpio" , -0 ); -if (!gpio_is_valid (arche_pdata->svc_refclk_req)) { -dev_err (dev,"failed to get svc clock-req gpio\n" ); -return arche_pdata->svc_refclk_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 (arche_pdata->svc_refclk_req); -if (ret) { -dev_err (dev,"failed to set svc-clk-req gpio dir :%d\n" , ret); + arche_pdata->svc_refclk_req =devm_gpiod_get (dev,"svc,refclk-req" , +GPIOD_IN ); +if (IS_ERR (arche_pdata->svc_refclk_req)) { + ret =PTR_ERR (arche_pdata->svc_refclk_req); +dev_err (dev,"failed to request svc-clk-req GPIO: %d\n" , ret);return ret; }
@@ -515,19 +481,11 @@ static int arche_platform_probe(struct platform_device *pdev) arche_pdata->num_apbs =of_get_child_count (np);dev_dbg (dev,"Number of APB's available - %d\n" , arche_pdata->num_apbs); - arche_pdata->wake_detect_gpio =of_get_named_gpio (np, -"svc,wake-detect-gpio" , -0 ); -if (arche_pdata->wake_detect_gpio <0 ) { -dev_err (dev,"failed to get wake detect gpio\n" ); -return arche_pdata->wake_detect_gpio; - } - - ret =devm_gpio_request (dev, arche_pdata->wake_detect_gpio, -"wake detect" ); -if (ret) { -dev_err (dev,"Failed requesting wake_detect gpio %d\n" , - arche_pdata->wake_detect_gpio); + arche_pdata->wake_detect =devm_gpiod_get (dev,"svc,wake-detect" , +GPIOD_IN ); +if (IS_ERR (arche_pdata->wake_detect)) { + ret =PTR_ERR (arche_pdata->wake_detect); +dev_err (dev,"Failed requesting wake_detect GPIO: %d\n" , ret);return ret; }
@@ -538,7 +496,7 @@ static int arche_platform_probe(struct platform_device *pdev)spin_lock_init (&arche_pdata->wake_lock);mutex_init (&arche_pdata->platform_state_mutex); arche_pdata->wake_detect_irq = -gpio_to_irq (arche_pdata->wake_detect_gpio); +gpiod_to_irq (arche_pdata->wake_detect); ret = devm_request_threaded_irq(dev, arche_pdata->wake_detect_irq, arche_platform_wd_irq,
Signature · 1 line
2.17.1
Johan Hovold
maintainerQuoted 7 lines · Nishad Kamdar
This patch series converts uses of the old GPIO API to the GPIO descriptor API. It also converts the GPIO driver to use the GPIO irqchip library
GPIOLIB_IRQCHIPinstead of repimplementing the same.Chnages in v7:
- Combine the three patches together.
Thanks for resending, all looks good now.
Johan