ARM: davinci: ohci-da8xx: model the vbus GPIO as a fixed regulator
Subsystems (6)
PATCH v2 1/6 ARM: davinci: add missing sentinels to GPIO lookup tables
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Some GPIO lookup tables defined in davinci board files are missing array sentinels. If an entry for given device cannot be found, this will cause a kernel panic.
--- arch/arm/mach-davinci/board-da830-evm.c | 2 ++ arch/arm/mach-davinci/board-da850-evm.c | 1 + arch/arm/mach-davinci/board-dm355-evm.c | 1 + arch/arm/mach-davinci/board-dm644x-evm.c | 1 + arch/arm/mach-davinci/board-omapl138-hawk.c | 1 + 5 files changed, 6 insertions(+)
arch/arm/mach-davinci/board-da830-evm.c +2 -0
@@ -58,6 +58,7 @@ static struct gpiod_lookup_table da830_evm_usb_gpio_lookup = { .table = {GPIO_LOOKUP ("davinci_gpio" ,ON_BD_USB_DRV ,"vbus" ,0 ), GPIO_LOOKUP("davinci_gpio", ON_BD_USB_OVC, "oc", 0), + { } }, };
@@ -156,6 +157,7 @@ static struct gpiod_lookup_table mmc_gpios_table = { GPIO_ACTIVE_LOW), GPIO_LOOKUP("davinci_gpio", DA830_MMCSD_WP_PIN, "wp", GPIO_ACTIVE_LOW), + { } }, };
arch/arm/mach-davinci/board-da850-evm.c +1 -0
@@ -784,6 +784,7 @@ static struct gpiod_lookup_table mmc_gpios_table = { GPIO_ACTIVE_LOW), GPIO_LOOKUP("davinci_gpio", DA850_MMCSD_WP_PIN, "wp", GPIO_ACTIVE_HIGH), + { } }, };
arch/arm/mach-davinci/board-dm355-evm.c +1 -0
@@ -121,6 +121,7 @@ static struct gpiod_lookup_table i2c_recovery_gpiod_table = { GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN), GPIO_LOOKUP("davinci_gpio", DM355_I2C_SCL_PIN, "scl", GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN), + { } }, };
arch/arm/mach-davinci/board-dm644x-evm.c +1 -0
@@ -663,6 +663,7 @@ static struct gpiod_lookup_table i2c_recovery_gpiod_table = { GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN), GPIO_LOOKUP("davinci_gpio", DM644X_I2C_SCL_PIN, "scl", GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN), + { } }, };
arch/arm/mach-davinci/board-omapl138-hawk.c +1 -0
@@ -303,6 +303,7 @@ static struct gpiod_lookup_table hawk_usb_gpio_lookup = { .table = {GPIO_LOOKUP ("davinci_gpio" ,DA850_USB1_VBUS_PIN ,"vbus" ,0 ), GPIO_LOOKUP("davinci_gpio", DA850_USB1_OC_PIN, "oc", 0), + { } }, };
PATCH v2 2/6 usb: ohci-da8xx: let the regulator framework keep track of use count
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
There's no reason to have a separate variable to keep track of the regulator state. The regulator core already does that. Remove reg_enabled from struct da8xx_ohci_hcd.
--- drivers/usb/host/ohci-da8xx.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/usb/host/ohci-da8xx.c +2 -6
@@ -40,7 +40,6 @@ struct da8xx_ohci_hcd {struct phy *usb11_phy;struct regulator *vbus_reg;struct notifier_block nb; -unsigned int reg_enabled;struct gpio_desc *vbus_gpio;struct gpio_desc *oc_gpio; };
@@ -100,21 +99,18 @@ static int ohci_da8xx_set_power(struct usb_hcd *hcd, int on)if (!da8xx_ohci->vbus_reg)return 0 ; -if (on && !da8xx_ohci->reg_enabled) { +if (on) { ret =regulator_enable (da8xx_ohci->vbus_reg);if (ret) {dev_err (dev,"Failed to enable regulator: %d\n" , ret);return ret; } - da8xx_ohci->reg_enabled =1 ; - - }else if (!on && da8xx_ohci->reg_enabled) { + }else if (!on) { ret =regulator_disable (da8xx_ohci->vbus_reg);if (ret) {dev_err (dev,"Failed to disable regulator: %d\n" , ret);return ret; } - da8xx_ohci->reg_enabled =0 ; }return 0 ;
PATCH v2 3/6 usb: ohci-da8xx: disable the regulator if the overcurrent irq fired
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Historically the power supply management in this driver has been handled in two separate places in parallel. Device-tree users simply defined an appropriate regulator, while two boards with no DT support (da830-evm and omapl138-hawk) passed functions defined in their respective board files over platform data. These functions simply used legacy GPIO calls to watch the oc GPIO for interrupts and disable the vbus GPIO when the irq fires.
Commit d193abf1c913 ("usb: ohci-da8xx: add vbus and overcurrent gpios") updated these GPIO calls to the modern API and moved them inside the driver.
This however is not the optimal solution for the vbus GPIO which should be modeled as a fixed regulator that can be controlled with a GPIO.
In order to keep the overcurrent protection available once we move the board files to using fixed regulators we need to disable the enable_reg regulator when the overcurrent indicator interrupt fires. Since we cannot call regulator_disable() from interrupt context, we need to switch to using a oneshot threaded interrupt.
--- drivers/usb/host/ohci-da8xx.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
drivers/usb/host/ohci-da8xx.c +24 -5
@@ -206,8 +206,25 @@ static irqreturn_t ohci_da8xx_oc_handler(int irq, void *data) {struct da8xx_ohci_hcd *da8xx_ohci = data; -if (gpiod_get_value (da8xx_ohci->oc_gpio)) -gpiod_set_value (da8xx_ohci->vbus_gpio,0 ); +if (gpiod_get_value (da8xx_ohci->oc_gpio)) { +if (da8xx_ohci->vbus_gpio) +gpiod_set_value (da8xx_ohci->vbus_gpio,0 ); +else if (da8xx_ohci->vbus_reg) +return IRQ_WAKE_THREAD ; + } + +return IRQ_HANDLED ; +} + +static irqreturn_t ohci_da8xx_oc_thread (int irq,void *data) +{ +struct da8xx_ohci_hcd *da8xx_ohci = data; +struct device *dev = da8xx_ohci->hcd->self.controller; +int ret; + + ret =regulator_disable (da8xx_ohci->vbus_reg); +if (ret) +dev_err (dev,"Failed to disable regulator: %d\n" , ret);return IRQ_HANDLED ; }
@@ -434,9 +451,11 @@ static int ohci_da8xx_probe(struct platform_device *pdev)if (oc_irq <0 ) goto err; - error =devm_request_irq (dev, oc_irq, ohci_da8xx_oc_handler, -IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , -"OHCI over-current indicator" , da8xx_ohci); + error =devm_request_threaded_irq (dev, oc_irq, + ohci_da8xx_oc_handler, ohci_da8xx_oc_thread, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING | +IRQF_ONESHOT ,"OHCI over-current indicator" , + da8xx_ohci);if (error) goto err; }
PATCH v2 4/6 ARM: davinci: omapl138-hawk: add a fixed regulator for ohci-da8xx
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Instead of directly using the vbus GPIO we should model it as a fixed regulator. Add all necessary fix-ups for the regulator to be registered and configure the vbus GPIO as its enable pin.
--- arch/arm/mach-davinci/board-omapl138-hawk.c | 49 +++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-)
arch/arm/mach-davinci/board-omapl138-hawk.c +46 -3
@@ -21,6 +21,7 @@#include <linux/platform_data/mtd-davinci.h> #include <linux/platform_data/mtd-davinci-aemif.h> #include <linux/platform_data/ti-aemif.h> +#include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> #include <asm/mach-types.h>
@@ -298,15 +299,50 @@ static const short da850_hawk_usb11_pins[] = {-1 }; -static struct gpiod_lookup_table hawk_usb_gpio_lookup = { +static struct regulator_consumer_supply hawk_usb_supplies[] = { +REGULATOR_SUPPLY ("vbus" ,NULL ), +}; + +static struct regulator_init_data hawk_usb_vbus_data = { + .consumer_supplies = hawk_usb_supplies, + .num_consumer_supplies =ARRAY_SIZE (hawk_usb_supplies), +}; + +static struct fixed_voltage_config hawk_usb_vbus = { + .supply_name ="vbus" , + .microvolts =3300000 , + .init_data = &hawk_usb_vbus_data, +}; + +static struct platform_device hawk_usb_vbus_device = { + .name ="reg-fixed-voltage" , + .id =1 , + .dev = { + .platform_data = &hawk_usb_vbus, + }, +}; + +static struct gpiod_lookup_table hawk_usb_oc_gpio_lookup = { .dev_id ="ohci-da8xx" , .table = { -GPIO_LOOKUP ("davinci_gpio" ,DA850_USB1_VBUS_PIN ,"vbus" ,0 ),GPIO_LOOKUP ("davinci_gpio" ,DA850_USB1_OC_PIN ,"oc" ,0 ), { } }, }; +static struct gpiod_lookup_table hawk_usb_vbus_gpio_lookup = { + .dev_id ="reg-fixed-voltage.1" , + .table = { +GPIO_LOOKUP ("davinci_gpio" ,DA850_USB1_VBUS_PIN ,NULL ,0 ), + { } + }, +}; + +static struct gpiod_lookup_table *hawk_usb_gpio_lookups[] = { + &hawk_usb_oc_gpio_lookup, + &hawk_usb_vbus_gpio_lookup, +}; +static struct da8xx_ohci_root_hub omapl138_hawk_usb11_pdata = {/* TPS2087 switch @ 5V */ .potpgt = (3 +1 ) /2 ,/* 3 ms max */
@@ -327,12 +363,19 @@ static __init void omapl138_hawk_usb_init(void)pr_warn ("%s: USB PHY CLK registration failed: %d\n" , __func__, ret); +gpiod_add_lookup_tables (hawk_usb_gpio_lookups, +ARRAY_SIZE (hawk_usb_gpio_lookups)); + ret =da8xx_register_usb_phy ();if (ret)pr_warn ("%s: USB PHY registration failed: %d\n" , __func__, ret); -gpiod_add_lookup_table (&hawk_usb_gpio_lookup); + ret =platform_device_register (&hawk_usb_vbus_device); +if (ret) { +pr_warn ("%s: Unable to register the vbus supply\n" , __func__); +return ; + } ret =da8xx_register_usb11 (&omapl138_hawk_usb11_pdata);if (ret)
PATCH v2 5/6 ARM: davinci: da830-evm: add a fixed regulator for ohci-da8xx
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Instead of directly using the vbus GPIO we should model it as a fixed regulator. Add all necessary fix-ups for the regulator to be registered and configure the vbus GPIO as its enable pin.
--- arch/arm/mach-davinci/board-da830-evm.c | 49 +++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-)
arch/arm/mach-davinci/board-da830-evm.c +46 -3
@@ -29,6 +29,7 @@#include <linux/platform_data/spi-davinci.h> #include <linux/platform_data/usb-davinci.h> #include <linux/platform_data/ti-aemif.h> +#include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> #include <linux/nvmem-provider.h>
@@ -53,15 +54,50 @@ static const short da830_evm_usb11_pins[] = {-1 }; -static struct gpiod_lookup_table da830_evm_usb_gpio_lookup = { +static struct regulator_consumer_supply da830_evm_usb_supplies[] = { +REGULATOR_SUPPLY ("vbus" ,NULL ), +}; + +static struct regulator_init_data da830_evm_usb_vbus_data = { + .consumer_supplies = da830_evm_usb_supplies, + .num_consumer_supplies =ARRAY_SIZE (da830_evm_usb_supplies), +}; + +static struct fixed_voltage_config da830_evm_usb_vbus = { + .supply_name ="vbus" , + .microvolts =33000000 , + .init_data = &da830_evm_usb_vbus_data, +}; + +static struct platform_device da830_evm_usb_vbus_device = { + .name ="reg-fixed-voltage" , + .id =1 , + .dev = { + .platform_data = &da830_evm_usb_vbus, + }, +}; + +static struct gpiod_lookup_table da830_evm_usb_oc_gpio_lookup = { .dev_id ="ohci-da8xx" , .table = { -GPIO_LOOKUP ("davinci_gpio" ,ON_BD_USB_DRV ,"vbus" ,0 ),GPIO_LOOKUP ("davinci_gpio" ,ON_BD_USB_OVC ,"oc" ,0 ), { } }, }; +static struct gpiod_lookup_table da830_evm_usb_vbus_gpio_lookup = { + .dev_id ="reg-fixed-voltage.1" , + .table = { +GPIO_LOOKUP ("davinci_gpio" ,ON_BD_USB_DRV ,"vbus" ,0 ), + { } + }, +}; + +static struct gpiod_lookup_table *da830_evm_usb_gpio_lookups[] = { + &da830_evm_usb_oc_gpio_lookup, + &da830_evm_usb_vbus_gpio_lookup, +}; +static struct da8xx_ohci_root_hub da830_evm_usb11_pdata = {/* TPS2065 switch @ 5V */ .potpgt = (3 +1 ) /2 ,/* 3 ms max */
@@ -76,6 +112,9 @@ static __init void da830_evm_usb_init(void)pr_warn ("%s: USB PHY CLK registration failed: %d\n" , __func__, ret); +gpiod_add_lookup_tables (da830_evm_usb_gpio_lookups, +ARRAY_SIZE (da830_evm_usb_gpio_lookups)); + ret =da8xx_register_usb_phy ();if (ret) pr_warn("%s: USB PHY registration failed: %d\n",
@@ -101,7 +140,11 @@ static __init void da830_evm_usb_init(void)return ; } -gpiod_add_lookup_table (&da830_evm_usb_gpio_lookup); + ret =platform_device_register (&da830_evm_usb_vbus_device); +if (ret) { +pr_warn ("%s: Unable to register the vbus supply\n" , __func__); +return ; + } ret =da8xx_register_usb11 (&da830_evm_usb11_pdata);if (ret)
PATCH v2 6/6 usb: ohci-da8xx: drop the vbus GPIO
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
All users now setup a fixed regulator for the vbus supply. We can drop the vbus GPIO code.
--- drivers/usb/host/ohci-da8xx.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-)
drivers/usb/host/ohci-da8xx.c +1 -20
@@ -40,7 +40,6 @@ struct da8xx_ohci_hcd {struct phy *usb11_phy;struct regulator *vbus_reg;struct notifier_block nb; -struct gpio_desc *vbus_gpio;struct gpio_desc *oc_gpio; };
@@ -91,11 +90,6 @@ static int ohci_da8xx_set_power(struct usb_hcd *hcd, int on)struct device *dev = hcd->self.controller;int ret; -if (da8xx_ohci->vbus_gpio) { -gpiod_set_value_cansleep (da8xx_ohci->vbus_gpio, on); -return 0 ; - } -if (!da8xx_ohci->vbus_reg)return 0 ;
@@ -120,9 +114,6 @@ static int ohci_da8xx_get_power(struct usb_hcd *hcd) {struct da8xx_ohci_hcd *da8xx_ohci =to_da8xx_ohci (hcd); -if (da8xx_ohci->vbus_gpio) -return gpiod_get_value_cansleep (da8xx_ohci->vbus_gpio); -if (da8xx_ohci->vbus_reg)return regulator_is_enabled (da8xx_ohci->vbus_reg);
@@ -155,9 +146,6 @@ static int ohci_da8xx_has_set_power(struct usb_hcd *hcd) {struct da8xx_ohci_hcd *da8xx_ohci =to_da8xx_ohci (hcd); -if (da8xx_ohci->vbus_gpio) -return 1 ; -if (da8xx_ohci->vbus_reg)return 1 ;
@@ -207,9 +195,7 @@ static irqreturn_t ohci_da8xx_oc_handler(int irq, void *data)struct da8xx_ohci_hcd *da8xx_ohci = data;if (gpiod_get_value (da8xx_ohci->oc_gpio)) { -if (da8xx_ohci->vbus_gpio) -gpiod_set_value (da8xx_ohci->vbus_gpio,0 ); -else if (da8xx_ohci->vbus_reg) +if (da8xx_ohci->vbus_reg)return IRQ_WAKE_THREAD ; }
@@ -437,11 +423,6 @@ static int ohci_da8xx_probe(struct platform_device *pdev) } } - da8xx_ohci->vbus_gpio =devm_gpiod_get_optional (dev,"vbus" , -GPIOD_OUT_HIGH ); -if (IS_ERR (da8xx_ohci->vbus_gpio)) - goto err; - da8xx_ohci->oc_gpio =devm_gpiod_get_optional (dev,"oc" ,GPIOD_IN );if (IS_ERR (da8xx_ohci->oc_gpio)) goto err;
v2 cover ARM: davinci: ohci-da8xx: model the vbus GPIO as a fixed regulator
From: Bartosz Golaszewski <[email protected]>
Historically the power supply management in this driver has been handled in two separate places in parallel. Device-tree users simply defined an appropriate regulator, while two boards with no DT support (da830-evm and omapl138-hawk) passed functions defined in their respective board files over platform data. These functions simply used legacy GPIO calls to watch the oc GPIO for interrupts and disable the vbus GPIO when the irq fires.
Commit d193abf1c913 ("usb: ohci-da8xx: add vbus and overcurrent gpios") updated these GPIO calls to the modern API and moved them inside the driver.
This however is not the optimal solution for the vbus GPIO as it duplicates code. Instead we should model the GPIO as a fixed regulator that can be controlled with a GPIO.
This series adds fixed regulators for all users of vbus GPIO, adds overcurrent protection using the existing vbus regulator in the USB driver and removes the vbus GPIO calls once they're no longer used.
v1 -> v2:
- add patch 1/6 that fixes an existing problem with missing array sentinels in GPIO lookups
- add patch 2/6 that removes an unnecessary use count variable from the driver
- reorder the changes: add support for overcurrent protection using the existing vbus regulator first, then setup fixed regulators in board files and finally remove the vbus GPIO from the ohci driver
Bartosz Golaszewski (6):
ARM: davinci: add missing sentinels to GPIO lookup tables
usb: ohci-da8xx: let the regulator framework keep track of use count
usb: ohci-da8xx: disable the regulator if the overcurrent irq fired
ARM: davinci: omapl138-hawk: add a fixed regulator for ohci-da8xx
ARM: davinci: da830-evm: add a fixed regulator for ohci-da8xx
usb: ohci-da8xx: drop the vbus GPIO
arch/arm/mach-davinci/board-da830-evm.c | 51 ++++++++++++++++++-- arch/arm/mach-davinci/board-da850-evm.c | 1 + arch/arm/mach-davinci/board-dm355-evm.c | 1 + arch/arm/mach-davinci/board-dm644x-evm.c | 1 + arch/arm/mach-davinci/board-omapl138-hawk.c | 50 ++++++++++++++++++-- drivers/usb/host/ohci-da8xx.c | 52 ++++++++++----------- 6 files changed, 122 insertions(+), 34 deletions(-)
Signature · 7 lines
2.21.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 39 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Historically the power supply management in this driver has been handled in two separate places in parallel. Device-tree users simply defined an appropriate regulator, while two boards with no DT support (da830-evm and omapl138-hawk) passed functions defined in their respective board files over platform data. These functions simply used legacy GPIO calls to watch the oc GPIO for interrupts and disable the vbus GPIO when the irq fires.
Commit
d193abf1c913("usb: ohci-da8xx: add vbus and overcurrent gpios") updated these GPIO calls to the modern API and moved them inside the driver.This however is not the optimal solution for the vbus GPIO as it duplicates code. Instead we should model the GPIO as a fixed regulator that can be controlled with a GPIO.
This series adds fixed regulators for all users of vbus GPIO, adds overcurrent protection using the existing vbus regulator in the USB driver and removes the vbus GPIO calls once they're no longer used.
v1 -> v2:
- add patch 1/6 that fixes an existing problem with missing array sentinels in GPIO lookups
- add patch 2/6 that removes an unnecessary use count variable from the driver
- reorder the changes: add support for overcurrent protection using the existing vbus regulator first, then setup fixed regulators in board files and finally remove the vbus GPIO from the ohci driverBartosz Golaszewski (6):
ARM: davinci: add missing sentinels to GPIO lookup tables
usb: ohci-da8xx: let the regulator framework keep track of use count
usb: ohci-da8xx: disable the regulator if the overcurrent irq fired
ARM: davinci: omapl138-hawk: add a fixed regulator for ohci-da8xx
ARM: davinci: da830-evm: add a fixed regulator for ohci-da8xx
usb: ohci-da8xx: drop the vbus GPIO
Quoted 7 lines
arch/arm/mach-davinci/board-da830-evm.c | 51 ++++++++++++++++++-- arch/arm/mach-davinci/board-da850-evm.c | 1 + arch/arm/mach-davinci/board-dm355-evm.c | 1 + arch/arm/mach-davinci/board-dm644x-evm.c | 1 + arch/arm/mach-davinci/board-omapl138-hawk.c | 50 ++++++++++++++++++-- drivers/usb/host/ohci-da8xx.c | 52 ++++++++++----------- 6 files changed, 122 insertions(+), 34 deletions(-)
For patches 2, 3, and 6:
Alan Stern
Sasha Levin
maintainerRe: [PATCH v2 1/6] ARM: davinci: add missing sentinels to GPIO lookup tables
In reply to Bartosz GolaszewskiHi,
[This is an automated email]
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.0.5, v4.19.32, v4.14.109, v4.9.166, v4.4.177, v3.18.137.
v5.0.5: Failed to apply! Possible dependencies:
1703cf5d4fc0 ("ARM: davinci: da830-evm: use gpio lookup entries for usb gpios") c08df69149db ("ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios")
v4.19.32: Failed to apply! Possible dependencies:
1703cf5d4fc0 ("ARM: davinci: da830-evm: use gpio lookup entries for usb gpios") c08df69149db ("ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios")
v4.14.109: Failed to apply! Possible dependencies:
1703cf5d4fc0 ("ARM: davinci: da830-evm: use gpio lookup entries for usb gpios") c08df69149db ("ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios") cd2428c368a6 ("i2c: davinci: switch to using gpiod for bus recovery gpios") e53537653791 ("i2c/ARM: davinci: Deep refactoring of I2C recovery")
v4.9.166: Failed to apply! Possible dependencies:
1703cf5d4fc0 ("ARM: davinci: da830-evm: use gpio lookup entries for usb gpios") 1b6fe9798af8 ("ARM: davinci: board-da850-evm: fix WP pin polarity for MMC/SD") 51e9f1216322 ("ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD") 67c6b6ff221f ("ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD") b5e1438cf98a ("ARM: davinci: da830-evm: use gpio descriptor for mmc pins") bdf0e8364fd3 ("ARM: davinci: da850-evm: use gpio descriptor for mmc pins") c08df69149db ("ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios") cd2428c368a6 ("i2c: davinci: switch to using gpiod for bus recovery gpios") e53537653791 ("i2c/ARM: davinci: Deep refactoring of I2C recovery")
v4.4.177: Failed to apply! Possible dependencies:
1703cf5d4fc0 ("ARM: davinci: da830-evm: use gpio lookup entries for usb gpios") 1b6fe9798af8 ("ARM: davinci: board-da850-evm: fix WP pin polarity for MMC/SD") 51e9f1216322 ("ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD") 67c6b6ff221f ("ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD") b5e1438cf98a ("ARM: davinci: da830-evm: use gpio descriptor for mmc pins") bdf0e8364fd3 ("ARM: davinci: da850-evm: use gpio descriptor for mmc pins") c08df69149db ("ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios") cd2428c368a6 ("i2c: davinci: switch to using gpiod for bus recovery gpios") e53537653791 ("i2c/ARM: davinci: Deep refactoring of I2C recovery")
v3.18.137: Failed to apply! Possible dependencies:
1703cf5d4fc0 ("ARM: davinci: da830-evm: use gpio lookup entries for usb gpios") 1b6fe9798af8 ("ARM: davinci: board-da850-evm: fix WP pin polarity for MMC/SD") 2c6ef04ffaf7 ("i2c: davinci: switch to use platform_get_irq") 2e65676f710e ("i2c: davinci: use bus recovery infrastructure") 51e9f1216322 ("ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD") 67c6b6ff221f ("ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD") 7ef97e9a312c ("i2c: davinci: use ICPFUNC to toggle I2C as gpio for bus recovery") a7ca2bcf2d2e ("ARM: davinci: Use standard logging styles") b5e1438cf98a ("ARM: davinci: da830-evm: use gpio descriptor for mmc pins") bdf0e8364fd3 ("ARM: davinci: da850-evm: use gpio descriptor for mmc pins") c08df69149db ("ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios") cd2428c368a6 ("i2c: davinci: switch to using gpiod for bus recovery gpios") e53537653791 ("i2c/ARM: davinci: Deep refactoring of I2C recovery")
How should we proceed with this patch?
--
Thanks,
Sasha
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 1/6] ARM: davinci: add missing sentinels to GPIO lookup tables
sob., 30 mar 2019 o 14:45 Sasha Levin <[email protected]> napisał(a):
Quoted 62 lines
Hi,
[This is an automated email]
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.0.5, v4.19.32, v4.14.109, v4.9.166, v4.4.177, v3.18.137.
v5.0.5: Failed to apply! Possible dependencies:
1703cf5d4fc0("ARM: davinci: da830-evm: use gpio lookup entries for usb gpios")c08df69149db("ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios")v4.19.32: Failed to apply! Possible dependencies:
1703cf5d4fc0("ARM: davinci: da830-evm: use gpio lookup entries for usb gpios")c08df69149db("ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios")v4.14.109: Failed to apply! Possible dependencies:
1703cf5d4fc0("ARM: davinci: da830-evm: use gpio lookup entries for usb gpios")c08df69149db("ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios")cd2428c368a6("i2c: davinci: switch to using gpiod for bus recovery gpios")e53537653791("i2c/ARM: davinci: Deep refactoring of I2C recovery")v4.9.166: Failed to apply! Possible dependencies:
1703cf5d4fc0("ARM: davinci: da830-evm: use gpio lookup entries for usb gpios")1b6fe9798af8("ARM: davinci: board-da850-evm: fix WP pin polarity for MMC/SD")51e9f1216322("ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD")67c6b6ff221f("ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD")b5e1438cf98a("ARM: davinci: da830-evm: use gpio descriptor for mmc pins")bdf0e8364fd3("ARM: davinci: da850-evm: use gpio descriptor for mmc pins")c08df69149db("ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios")cd2428c368a6("i2c: davinci: switch to using gpiod for bus recovery gpios")e53537653791("i2c/ARM: davinci: Deep refactoring of I2C recovery")v4.4.177: Failed to apply! Possible dependencies:
1703cf5d4fc0("ARM: davinci: da830-evm: use gpio lookup entries for usb gpios")1b6fe9798af8("ARM: davinci: board-da850-evm: fix WP pin polarity for MMC/SD")51e9f1216322("ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD")67c6b6ff221f("ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD")b5e1438cf98a("ARM: davinci: da830-evm: use gpio descriptor for mmc pins")bdf0e8364fd3("ARM: davinci: da850-evm: use gpio descriptor for mmc pins")c08df69149db("ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios")cd2428c368a6("i2c: davinci: switch to using gpiod for bus recovery gpios")e53537653791("i2c/ARM: davinci: Deep refactoring of I2C recovery")v3.18.137: Failed to apply! Possible dependencies:
1703cf5d4fc0("ARM: davinci: da830-evm: use gpio lookup entries for usb gpios")1b6fe9798af8("ARM: davinci: board-da850-evm: fix WP pin polarity for MMC/SD")2c6ef04ffaf7("i2c: davinci: switch to useplatform_get_irq")2e65676f710e("i2c: davinci: use bus recovery infrastructure")51e9f1216322("ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD")67c6b6ff221f("ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD")7ef97e9a312c("i2c: davinci: use ICPFUNC to toggle I2C as gpio for bus recovery")a7ca2bcf2d2e("ARM: davinci: Use standard logging styles")b5e1438cf98a("ARM: davinci: da830-evm: use gpio descriptor for mmc pins")bdf0e8364fd3("ARM: davinci: da850-evm: use gpio descriptor for mmc pins")c08df69149db("ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios")cd2428c368a6("i2c: davinci: switch to using gpiod for bus recovery gpios")e53537653791("i2c/ARM: davinci: Deep refactoring of I2C recovery")
Quoted 5 lines
How should we proceed with this patch?
--
Thanks,
Sasha
Different GPIO lookup tables were added at different points and backporting this patch will be a mess. I guess - since nobody complained so far about any breakage - we can simply drop the stable tag and treat it as an improvement of existing code.
Bart
Re: [PATCH v2 4/6] ARM: davinci: omapl138-hawk: add a fixed regulator for ohci-da8xx
In reply to Bartosz GolaszewskiHi Bart,
Quoted 36 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Instead of directly using the vbus GPIO we should model it as a fixed regulator. Add all necessary fix-ups for the regulator to be registered and configure the vbus GPIO as its enable pin.
Signed-off-by Bartosz Golaszewski <[email protected]>--- arch/arm/mach-davinci/board-omapl138-hawk.c | 49 +++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-)arch/arm/mach-davinci/board-omapl138-hawk.c +9
-1@@ -21,6 +21,7 @@#include <linux/platform_data/mtd-davinci.h> #include <linux/platform_data/mtd-davinci-aemif.h> #include <linux/platform_data/ti-aemif.h> +#include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> #include <asm/mach-types.h> @@ -298,15 +299,50 @@ static const short da850_hawk_usb11_pins[] = { -1 }; -static struct gpiod_lookup_table hawk_usb_gpio_lookup = { +static struct regulator_consumer_supply hawk_usb_supplies[] = { +REGULATOR_SUPPLY ("vbus" ,NULL ), +}; + +static struct regulator_init_data hawk_usb_vbus_data = { + .consumer_supplies = hawk_usb_supplies, + .num_consumer_supplies =ARRAY_SIZE (hawk_usb_supplies), +};
arch/arm/mach-davinci/board-omapl138-hawk.c static const short da850_hawk_usb11_pins[] = { · line 319
Quoted 10 lines
arch/arm/mach-davinci/board-omapl138-hawk.c +10
-0+ +static struct fixed_voltage_config hawk_usb_vbus = { + .supply_name ="vbus" , + .microvolts =3300000 , + .init_data = &hawk_usb_vbus_data, +}; + +static struct platform_device hawk_usb_vbus_device = { + .name ="reg-fixed-voltage" , + .id =1 ,
Can you explain choice of of 1 for id here? Its the first fixed regulator being registered. Shouldn't it be 0?
Thanks,
Sekhar
Re: [PATCH v2 4/6] ARM: davinci: omapl138-hawk: add a fixed regulator for ohci-da8xx
wt., 2 kwi 2019 o 13:01 Sekhar Nori <[email protected]> napisał(a):
Quoted 54 lines
Hi Bart,
Quoted 36 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Instead of directly using the vbus GPIO we should model it as a fixed regulator. Add all necessary fix-ups for the regulator to be registered and configure the vbus GPIO as its enable pin.
Signed-off-by Bartosz Golaszewski <[email protected]>--- arch/arm/mach-davinci/board-omapl138-hawk.c | 49 +++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-)arch/arm/mach-davinci/board-omapl138-hawk.c +9
-1@@ -21,6 +21,7 @@#include <linux/platform_data/mtd-davinci.h> #include <linux/platform_data/mtd-davinci-aemif.h> #include <linux/platform_data/ti-aemif.h> +#include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> #include <asm/mach-types.h> @@ -298,15 +299,50 @@ static const short da850_hawk_usb11_pins[] = { -1 }; -static struct gpiod_lookup_table hawk_usb_gpio_lookup = { +static struct regulator_consumer_supply hawk_usb_supplies[] = { +REGULATOR_SUPPLY ("vbus" ,NULL ), +}; + +static struct regulator_init_data hawk_usb_vbus_data = { + .consumer_supplies = hawk_usb_supplies, + .num_consumer_supplies =ARRAY_SIZE (hawk_usb_supplies), +};arch/arm/mach-davinci/board-omapl138-hawk.c static const short da850_hawk_usb11_pins[] = { · line 319
Quoted 10 lines
arch/arm/mach-davinci/board-omapl138-hawk.c +10
-0+ +static struct fixed_voltage_config hawk_usb_vbus = { + .supply_name ="vbus" , + .microvolts =3300000 , + .init_data = &hawk_usb_vbus_data, +}; + +static struct platform_device hawk_usb_vbus_device = { + .name ="reg-fixed-voltage" , + .id =1 ,Can you explain choice of of 1 for id here? Its the first fixed regulator being registered. Shouldn't it be 0?
Quoted 2 lines
Thanks,
Sekhar
Good point, I guess you're right. Something for v3 I guess.
Bart
Re: [PATCH v2 3/6] usb: ohci-da8xx: disable the regulator if the overcurrent irq fired
In reply to Bartosz Golaszewskipt., 29 mar 2019 o 10:33 Bartosz Golaszewski <[email protected]> napisał(a):
Quoted 63 lines
From: Bartosz Golaszewski <[email protected]>
Historically the power supply management in this driver has been handled in two separate places in parallel. Device-tree users simply defined an appropriate regulator, while two boards with no DT support (da830-evm and omapl138-hawk) passed functions defined in their respective board files over platform data. These functions simply used legacy GPIO calls to watch the oc GPIO for interrupts and disable the vbus GPIO when the irq fires.
Commit
d193abf1c913("usb: ohci-da8xx: add vbus and overcurrent gpios") updated these GPIO calls to the modern API and moved them inside the driver.This however is not the optimal solution for the vbus GPIO which should be modeled as a fixed regulator that can be controlled with a GPIO.
In order to keep the overcurrent protection available once we move the board files to using fixed regulators we need to disable the
enable_regregulator when the overcurrent indicator interrupt fires. Since we cannot callregulator_disable()from interrupt context, we need to switch to using a oneshot threaded interrupt.Signed-off-by Bartosz Golaszewski <[email protected]>--- drivers/usb/host/ohci-da8xx.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)drivers/usb/host/ohci-da8xx.c +19
-2@@ -206,8 +206,25 @@ static irqreturn_t ohci_da8xx_oc_handler(int irq, void *data) {struct da8xx_ohci_hcd *da8xx_ohci = data; -if (gpiod_get_value (da8xx_ohci->oc_gpio)) -gpiod_set_value (da8xx_ohci->vbus_gpio,0 ); +if (gpiod_get_value (da8xx_ohci->oc_gpio)) { +if (da8xx_ohci->vbus_gpio) +gpiod_set_value (da8xx_ohci->vbus_gpio,0 ); +else if (da8xx_ohci->vbus_reg) +return IRQ_WAKE_THREAD ; + } + +return IRQ_HANDLED ; +} + +static irqreturn_t ohci_da8xx_oc_thread (int irq,void *data) +{ +struct da8xx_ohci_hcd *da8xx_ohci = data; +struct device *dev = da8xx_ohci->hcd->self.controller; +int ret; + + ret =regulator_disable (da8xx_ohci->vbus_reg); +if (ret) +dev_err (dev,"Failed to disable regulator: %d\n" , ret);return IRQ_HANDLED ; }@@ -434,9 +451,11 @@ static int ohci_da8xx_probe(struct platform_device *pdev)if (oc_irq <0 )
drivers/usb/host/ohci-da8xx.c static int ohci_da8xx_probe(struct platform_device *pdev) · line 458
Quoted 10 lines
drivers/usb/host/ohci-da8xx.c +5
-3goto err; - error =devm_request_irq (dev, oc_irq, ohci_da8xx_oc_handler, -IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , -"OHCI over-current indicator" , da8xx_ohci); + error =devm_request_threaded_irq (dev, oc_irq, + ohci_da8xx_oc_handler, ohci_da8xx_oc_thread, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING | +IRQF_ONESHOT ,"OHCI over-current indicator" , + da8xx_ohci);
Ugh I noticed a problem with this patch if the module is built-in - after calling devm_request_threaded_irq() any subsequent msleep() will hang. This doesn't happen if the driver is built as a module. I'm not sure what the reason is yet.
Bart
Quoted 6 lines
drivers/usb/host/ohci-da8xx.c +0
-1if (error) goto err; } --2.21.0