mirror of https://gitee.com/openkylin/linux.git
usb: max3421: Add devicetree support
Adds support for devicetree to the max3421 driver. Signed-off-by: Jules Maselbas <jules.maselbas@grenoble-inp.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jules Maselbas
Greg Kroah-Hartman
parent
c15562c0dc
commit
721fdc83b3
|
|
@ -60,6 +60,7 @@
|
|||
#include <linux/spi/spi.h>
|
||||
#include <linux/usb.h>
|
||||
#include <linux/usb/hcd.h>
|
||||
#include <linux/of.h>
|
||||
|
||||
#include <linux/platform_data/max3421-hcd.h>
|
||||
|
||||
|
|
@ -85,6 +86,8 @@
|
|||
USB_PORT_STAT_C_OVERCURRENT | \
|
||||
USB_PORT_STAT_C_RESET) << 16)
|
||||
|
||||
#define MAX3421_GPOUT_COUNT 8
|
||||
|
||||
enum max3421_rh_state {
|
||||
MAX3421_RH_RESET,
|
||||
MAX3421_RH_SUSPENDED,
|
||||
|
|
@ -1672,7 +1675,7 @@ max3421_gpout_set_value(struct usb_hcd *hcd, u8 pin_number, u8 value)
|
|||
u8 mask, idx;
|
||||
|
||||
--pin_number;
|
||||
if (pin_number > 7)
|
||||
if (pin_number >= MAX3421_GPOUT_COUNT)
|
||||
return;
|
||||
|
||||
mask = 1u << (pin_number % 4);
|
||||
|
|
@ -1699,6 +1702,10 @@ max3421_hub_control(struct usb_hcd *hcd, u16 type_req, u16 value, u16 index,
|
|||
spin_lock_irqsave(&max3421_hcd->lock, flags);
|
||||
|
||||
pdata = spi->dev.platform_data;
|
||||
if (!pdata) {
|
||||
dev_err(&spi->dev, "Device platform data is missing\n");
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
switch (type_req) {
|
||||
case ClearHubFeature:
|
||||
|
|
@ -1831,11 +1838,35 @@ static const struct hc_driver max3421_hcd_desc = {
|
|||
.bus_resume = max3421_bus_resume,
|
||||
};
|
||||
|
||||
static int
|
||||
max3421_of_vbus_en_pin(struct device *dev, struct max3421_hcd_platform_data *pdata)
|
||||
{
|
||||
int retval;
|
||||
uint32_t value[2];
|
||||
|
||||
if (!pdata)
|
||||
return -EINVAL;
|
||||
|
||||
retval = of_property_read_u32_array(dev->of_node, "maxim,vbus-en-pin", value, 2);
|
||||
if (retval) {
|
||||
dev_err(dev, "device tree node property 'maxim,vbus-en-pin' is missing\n");
|
||||
return retval;
|
||||
}
|
||||
dev_info(dev, "property 'maxim,vbus-en-pin' value is <%d %d>\n", value[0], value[1]);
|
||||
|
||||
pdata->vbus_gpout = value[0];
|
||||
pdata->vbus_active_level = value[1];
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
max3421_probe(struct spi_device *spi)
|
||||
{
|
||||
struct device *dev = &spi->dev;
|
||||
struct max3421_hcd *max3421_hcd;
|
||||
struct usb_hcd *hcd = NULL;
|
||||
struct max3421_hcd_platform_data *pdata = NULL;
|
||||
int retval = -ENOMEM;
|
||||
|
||||
if (spi_setup(spi) < 0) {
|
||||
|
|
@ -1843,6 +1874,42 @@ max3421_probe(struct spi_device *spi)
|
|||
return -EFAULT;
|
||||
}
|
||||
|
||||
if (!spi->irq) {
|
||||
dev_err(dev, "Failed to get SPI IRQ");
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
|
||||
pdata = devm_kzalloc(&spi->dev, sizeof(*pdata), GFP_KERNEL);
|
||||
if (!pdata) {
|
||||
dev_err(&spi->dev, "failed to allocate memory for private data\n");
|
||||
retval = -ENOMEM;
|
||||
goto error;
|
||||
}
|
||||
retval = max3421_of_vbus_en_pin(dev, pdata);
|
||||
if (retval)
|
||||
goto error;
|
||||
|
||||
spi->dev.platform_data = pdata;
|
||||
}
|
||||
|
||||
pdata = spi->dev.platform_data;
|
||||
if (!pdata) {
|
||||
dev_err(&spi->dev, "driver configuration data is not provided\n");
|
||||
retval = -EFAULT;
|
||||
goto error;
|
||||
}
|
||||
if (pdata->vbus_active_level > 1) {
|
||||
dev_err(&spi->dev, "vbus active level value %d is out of range (0/1)\n", pdata->vbus_active_level);
|
||||
retval = -EINVAL;
|
||||
goto error;
|
||||
}
|
||||
if (pdata->vbus_gpout < 1 || pdata->vbus_gpout > MAX3421_GPOUT_COUNT) {
|
||||
dev_err(&spi->dev, "vbus gpout value %d is out of range (1..8)\n", pdata->vbus_gpout);
|
||||
retval = -EINVAL;
|
||||
goto error;
|
||||
}
|
||||
|
||||
hcd = usb_create_hcd(&max3421_hcd_desc, &spi->dev,
|
||||
dev_name(&spi->dev));
|
||||
if (!hcd) {
|
||||
|
|
@ -1885,6 +1952,11 @@ max3421_probe(struct spi_device *spi)
|
|||
return 0;
|
||||
|
||||
error:
|
||||
if (IS_ENABLED(CONFIG_OF) && dev->of_node && pdata) {
|
||||
devm_kfree(&spi->dev, pdata);
|
||||
spi->dev.platform_data = NULL;
|
||||
}
|
||||
|
||||
if (hcd) {
|
||||
kfree(max3421_hcd->tx);
|
||||
kfree(max3421_hcd->rx);
|
||||
|
|
@ -1923,17 +1995,30 @@ max3421_remove(struct spi_device *spi)
|
|||
|
||||
spin_unlock_irqrestore(&max3421_hcd->lock, flags);
|
||||
|
||||
if (IS_ENABLED(CONFIG_OF) && spi->dev.platform_data) {
|
||||
dev_dbg(&spi->dev, "Freeing platform data structure\n");
|
||||
devm_kfree(&spi->dev, spi->dev.platform_data);
|
||||
spi->dev.platform_data = NULL;
|
||||
}
|
||||
|
||||
free_irq(spi->irq, hcd);
|
||||
|
||||
usb_put_hcd(hcd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id max3421_of_match_table[] = {
|
||||
{ .compatible = "maxim,max3421", },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, max3421_of_match_table);
|
||||
|
||||
static struct spi_driver max3421_driver = {
|
||||
.probe = max3421_probe,
|
||||
.remove = max3421_remove,
|
||||
.driver = {
|
||||
.name = "max3421-hcd",
|
||||
.of_match_table = of_match_ptr(max3421_of_match_table),
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue