nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

platform: tegra: uss-io-proxy: Migrate to GPIOD

Browse Source 
Upstream commit a55893133830 ("gpiolib: Remove unused
devm_gpio_request()") removed the devm_gpio_request() function and this
breaks the Tegra USS IO Proxy driver. The devm_gpiod_get() function has
been supported in the Linux kernel since v4.3 and now that the legacy
GPIO functions are being removed, migrate the Tegra USS IO Proxy driver
over to using GPIO descriptors.

Bug 4387902
Bug 5420210

Change-Id: I0c62977dc4ec829e14f105babdd08bbd64113fa2
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3423827
(cherry picked from commit e4572a5ff434f778178b1dfb39b4c1cf7923db6d)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3462463
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Jon Hunter
2025-09-02 12:05:01 +01:00
committed by mobile promotions
parent d814c113bb
commit 74171df1a4
1 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
drivers/platform/tegra/tegra-uss-io-proxy.c
View File

@@ -32,10 +32,10 @@ struct tegra_uss_io_proxy {
struct clk *uss_clk; struct clk *uss_clk;
unsigned int hss_version; unsigned int hss_version;
int uss_reset_gpio; struct gpio_desc *uss_reset_gpio;
int vsup_dia_gpio; struct gpio_desc *vsup_dia_gpio;
unsigned int vsup_fault_gpio; struct gpio_desc *vsup_fault_gpio;
unsigned int vsup_latch_gpio; struct gpio_desc *vsup_latch_gpio;
struct gpio_descs *g1_gpiods; struct gpio_descs *g1_gpiods;
struct gpio_descs *g2_gpiods; struct gpio_descs *g2_gpiods;
unsigned long g1_bitmap; unsigned long g1_bitmap;
@@ -113,9 +113,9 @@ static ssize_t uss_reset_store(struct device *dev,
return -EINVAL; return -EINVAL;
if (val == 0) if (val == 0)
gpio_set_value(proxy->uss_reset_gpio, 1); gpiod_set_raw_value(proxy->uss_reset_gpio, 1);
else else
gpio_set_value(proxy->uss_reset_gpio, 0); gpiod_set_raw_value(proxy->uss_reset_gpio, 0);
return count; return count;
} }
@@ -125,7 +125,7 @@ static ssize_t uss_reset_show(struct device *dev, struct device_attribute *attr,
{ {
struct tegra_uss_io_proxy *proxy = dev_get_drvdata(dev); struct tegra_uss_io_proxy *proxy = dev_get_drvdata(dev);
return sprintf(buf, "%d\n", !gpio_get_value(proxy->uss_reset_gpio)); return sprintf(buf, "%d\n", !gpiod_get_raw_value(proxy->uss_reset_gpio));
} }
static DEVICE_ATTR_RW(uss_reset); static DEVICE_ATTR_RW(uss_reset);
@@ -140,9 +140,9 @@ static ssize_t vsup_dia_store(struct device *dev, struct device_attribute *attr,
return -EINVAL; return -EINVAL;
if (val == 0) if (val == 0)
gpio_set_value(proxy->vsup_dia_gpio, 0); gpiod_set_raw_value(proxy->vsup_dia_gpio, 0);
else else
gpio_set_value(proxy->vsup_dia_gpio, 1); gpiod_set_raw_value(proxy->vsup_dia_gpio, 1);
return count; return count;
} }
@@ -152,7 +152,7 @@ static ssize_t vsup_dia_show(struct device *dev, struct device_attribute *attr,
{ {
struct tegra_uss_io_proxy *proxy = dev_get_drvdata(dev); struct tegra_uss_io_proxy *proxy = dev_get_drvdata(dev);
return sprintf(buf, "%d\n", gpio_get_value(proxy->vsup_dia_gpio)); return sprintf(buf, "%d\n", gpiod_get_raw_value(proxy->vsup_dia_gpio));
} }
static DEVICE_ATTR_RW(vsup_dia); static DEVICE_ATTR_RW(vsup_dia);
@@ -168,9 +168,9 @@ static ssize_t vsup_latch_store(struct device *dev,
return -EINVAL; return -EINVAL;
if (val == 0) if (val == 0)
gpio_set_value(proxy->vsup_latch_gpio, 0); gpiod_set_raw_value(proxy->vsup_latch_gpio, 0);
else else
gpio_set_value(proxy->vsup_latch_gpio, 1); gpiod_set_raw_value(proxy->vsup_latch_gpio, 1);
return count; return count;
} }
@@ -180,7 +180,7 @@ static ssize_t vsup_latch_show(struct device *dev,
{ {
struct tegra_uss_io_proxy *proxy = dev_get_drvdata(dev); struct tegra_uss_io_proxy *proxy = dev_get_drvdata(dev);
return sprintf(buf, "%d\n", gpio_get_value(proxy->vsup_latch_gpio)); return sprintf(buf, "%d\n", gpiod_get_raw_value(proxy->vsup_latch_gpio));
} }
static DEVICE_ATTR_RW(vsup_latch); static DEVICE_ATTR_RW(vsup_latch);
@@ -190,7 +190,7 @@ static ssize_t vsup_fault_show(struct device *dev,
{ {
struct tegra_uss_io_proxy *proxy = dev_get_drvdata(dev); struct tegra_uss_io_proxy *proxy = dev_get_drvdata(dev);
return sprintf(buf, "%d\n", gpio_get_value(proxy->vsup_fault_gpio)); return sprintf(buf, "%d\n", gpiod_get_raw_value(proxy->vsup_fault_gpio));
} }
static DEVICE_ATTR_ADMIN_RO(vsup_fault); static DEVICE_ATTR_ADMIN_RO(vsup_fault);
@@ -339,33 +339,31 @@ static void tegra_uss_remove_dev_attrs(struct platform_device *pdev)
device_remove_file(&pdev->dev, &dev_attr_sensor_gpios); device_remove_file(&pdev->dev, &dev_attr_sensor_gpios);
} }
static int tegra_uss_request_gpio(struct platform_device *pdev, const char *name) static struct gpio_desc *tegra_uss_request_gpio(struct platform_device *pdev, const char *name,
bool is_output)
{ {
struct device_node *np = pdev->dev.of_node; struct gpio_desc *gpiod;
int gpio, rc; int rc;
gpio = of_get_named_gpio(np, name, 0); gpiod = devm_gpiod_get(&pdev->dev, name, GPIOD_ASIS);
if (gpio == -EPROBE_DEFER) if (IS_ERR(gpiod)) {
return gpio; dev_err(&pdev->dev, "could not request %s %ld\n", name,
PTR_ERR(gpiod));
if (!gpio_is_valid(gpio)) { return gpiod;
dev_err(&pdev->dev, "%s is invalid\n", name);
return -EINVAL;
} }
rc = devm_gpio_request(&pdev->dev, gpio, name); if (is_output)
rc = gpiod_direction_output_raw(gpiod, 0);
else
rc = gpiod_direction_input(gpiod);
if (rc) { if (rc) {
dev_err(&pdev->dev, "could not request %s %d\n", name, rc); dev_err(&pdev->dev, "could not set direction for %s %d\n",
return rc; name, rc);
return ERR_PTR(rc);
} }
rc = gpio_direction_output(gpio, 0); return gpiod;
if (rc) {
dev_err(&pdev->dev, "could not set %s output %d\n", name, rc);
return rc;
}
return gpio;
} }
static int tegra_uss_io_proxy_probe(struct platform_device *pdev) static int tegra_uss_io_proxy_probe(struct platform_device *pdev)
@@ -408,33 +406,37 @@ static int tegra_uss_io_proxy_probe(struct platform_device *pdev)
"uss_hss_version is not valid."); "uss_hss_version is not valid.");
} }
proxy->uss_reset_gpio = tegra_uss_request_gpio(pdev, "uss-nres"); proxy->uss_reset_gpio = tegra_uss_request_gpio(pdev, "uss-nres", true);
if (proxy->uss_reset_gpio < 0) { if (IS_ERR(proxy->uss_reset_gpio)) {
return dev_err_probe(&pdev->dev, proxy->uss_reset_gpio, return dev_err_probe(&pdev->dev, PTR_ERR(proxy->uss_reset_gpio),
"failed to get uss-nres GPIO\n"); "failed to get uss-nres GPIO\n");
} }
proxy->vsup_dia_gpio = tegra_uss_request_gpio(pdev, "uss-vsup-dia"); proxy->vsup_dia_gpio = tegra_uss_request_gpio(pdev, "uss-vsup-dia",
if (proxy->vsup_dia_gpio < 0) { true);
return dev_err_probe(&pdev->dev, proxy->vsup_dia_gpio, if (IS_ERR(proxy->vsup_dia_gpio)) {
return dev_err_probe(&pdev->dev, PTR_ERR(proxy->vsup_dia_gpio),
"failed to get vsup-dia GPIO\n"); "failed to get vsup-dia GPIO\n");
} }
if (proxy->hss_version == 1) { if (proxy->hss_version == 1) {
rc = tegra_uss_request_gpio(pdev, "uss-vsup-latch"); proxy->vsup_fault_gpio = tegra_uss_request_gpio(pdev,
if (rc < 0) "uss-vsup-latch",
return dev_err_probe(&pdev->dev, rc, "failed to get vsup-latch GPIO\n"); true);
if (IS_ERR(proxy->vsup_fault_gpio))
proxy->vsup_fault_gpio = rc; return dev_err_probe(&pdev->dev,
PTR_ERR(proxy->vsup_fault_gpio),
"failed to get vsup-latch GPIO\n");
} }
if (proxy->hss_version == 2) { if (proxy->hss_version == 2) {
rc = tegra_uss_request_gpio(pdev, "uss-vsup-fault"); proxy->vsup_fault_gpio = tegra_uss_request_gpio(pdev,
if (rc < 0) "uss-vsup-fault",
return dev_err_probe(&pdev->dev, rc, "failed to get vsup-fault GPIO\n"); false);
if (IS_ERR(proxy->vsup_fault_gpio))
proxy->vsup_fault_gpio = rc; return dev_err_probe(&pdev->dev,
gpio_direction_input(proxy->vsup_fault_gpio); PTR_ERR(proxy->vsup_fault_gpio),
"failed to get vsup-fault GPIO\n");
} }
proxy->g1_gpiods = devm_gpiod_get_array(&pdev->dev, "sensor-group-1", proxy->g1_gpiods = devm_gpiod_get_array(&pdev->dev, "sensor-group-1",
@@ -463,7 +465,7 @@ static void tegra_uss_reset(struct platform_device *pdev)
unsigned long bitmap = 0; unsigned long bitmap = 0;
int rc; int rc;
gpio_set_value(proxy->uss_reset_gpio, 0); gpiod_set_raw_value(proxy->uss_reset_gpio, 0);
rc = reset_control_assert(proxy->i2s8_reset); rc = reset_control_assert(proxy->i2s8_reset);
if (rc) if (rc)