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

net: can: mttcan: Drop unnecessary version checks

Browse Source 
GPIO descriptor support has been supported in the Linux kernel since
v3.16. Therefore, simplify the MTTCAN driver by removing the legacy GPIO
support and only use GPIO descriptors.

Bug 4119327
Bug 4228080

Change-Id: Ib1c50d17c514dee6a5c69145a8f5d3e07b5b3855
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2981396
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Jon Hunter
2023-09-18 16:57:28 +01:00
committed by mobile promotions
parent 4ae0f1a759
commit 8f976ab022
2 changed files with 1 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/can/mttcan/include/m_ttcan_linux.h
View File

@@ -76,11 +76,7 @@ struct tegra_mttcan_soc_info {
}; };
struct can_gpio { struct can_gpio {
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
int gpio;
#else
struct gpio_desc *gpio; struct gpio_desc *gpio;
#endif
int active_low; int active_low;
}; };

55
drivers/net/can/mttcan/native/m_ttcan_linux.c
View File

@@ -1251,17 +1251,6 @@ static int mttcan_power_up(struct mttcan_priv *priv)
int level; int level;
mttcan_pm_runtime_get_sync(priv); mttcan_pm_runtime_get_sync(priv);
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
if (gpio_is_valid(priv->gpio_can_stb.gpio)) {
level = !priv->gpio_can_stb.active_low;
gpio_direction_output(priv->gpio_can_stb.gpio, level);
}
if (gpio_is_valid(priv->gpio_can_en.gpio)) {
level = !priv->gpio_can_en.active_low;
gpio_direction_output(priv->gpio_can_en.gpio, level);
}
#else
if (priv->gpio_can_stb.gpio) { if (priv->gpio_can_stb.gpio) {
level = !priv->gpio_can_stb.active_low; level = !priv->gpio_can_stb.active_low;
gpiod_direction_output(priv->gpio_can_stb.gpio, level); gpiod_direction_output(priv->gpio_can_stb.gpio, level);
@@ -1271,7 +1260,7 @@ static int mttcan_power_up(struct mttcan_priv *priv)
level = !priv->gpio_can_en.active_low; level = !priv->gpio_can_en.active_low;
gpiod_direction_output(priv->gpio_can_en.gpio, level); gpiod_direction_output(priv->gpio_can_en.gpio, level);
} }
#endif
return ttcan_set_power(priv->ttcan, 1); return ttcan_set_power(priv->ttcan, 1);
} }
@@ -1283,17 +1272,6 @@ static int mttcan_power_down(struct net_device *dev)
if (ttcan_set_power(priv->ttcan, 0)) if (ttcan_set_power(priv->ttcan, 0))
return -ETIMEDOUT; return -ETIMEDOUT;
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
if (gpio_is_valid(priv->gpio_can_stb.gpio)) {
level = priv->gpio_can_stb.active_low;
gpio_direction_output(priv->gpio_can_stb.gpio, level);
}
if (gpio_is_valid(priv->gpio_can_en.gpio)) {
level = priv->gpio_can_en.active_low;
gpio_direction_output(priv->gpio_can_en.gpio, level);
}
#else
if (priv->gpio_can_stb.gpio) { if (priv->gpio_can_stb.gpio) {
level = priv->gpio_can_stb.active_low; level = priv->gpio_can_stb.active_low;
gpiod_direction_output(priv->gpio_can_stb.gpio, level); gpiod_direction_output(priv->gpio_can_stb.gpio, level);
@@ -1303,7 +1281,6 @@ static int mttcan_power_down(struct net_device *dev)
level = priv->gpio_can_en.active_low; level = priv->gpio_can_en.active_low;
gpiod_direction_output(priv->gpio_can_en.gpio, level); gpiod_direction_output(priv->gpio_can_en.gpio, level);
} }
#endif
mttcan_pm_runtime_put_sync(priv); mttcan_pm_runtime_put_sync(priv);
@@ -1729,9 +1706,6 @@ static int mttcan_probe(struct platform_device *pdev)
{ {
int ret = 0; int ret = 0;
int irq = 0; int irq = 0;
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
enum of_gpio_flags flags;
#endif
void __iomem *regs = NULL, *xregs = NULL; void __iomem *regs = NULL, *xregs = NULL;
void __iomem *mram_addr = NULL; void __iomem *mram_addr = NULL;
struct net_device *dev; struct net_device *dev;
@@ -1812,21 +1786,12 @@ static int mttcan_probe(struct platform_device *pdev)
goto exit_free_device; goto exit_free_device;
/* set device-tree properties */ /* set device-tree properties */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
priv->gpio_can_en.gpio = devm_gpiod_get_optional(&pdev->dev, priv->gpio_can_en.gpio = devm_gpiod_get_optional(&pdev->dev,
"gpio_can_en", 0); "gpio_can_en", 0);
priv->gpio_can_en.active_low = GPIOD_OUT_LOW; priv->gpio_can_en.active_low = GPIOD_OUT_LOW;
priv->gpio_can_stb.gpio = devm_gpiod_get_optional(&pdev->dev, priv->gpio_can_stb.gpio = devm_gpiod_get_optional(&pdev->dev,
"gpio_can_stb", 0); "gpio_can_stb", 0);
priv->gpio_can_stb.active_low = GPIOD_OUT_LOW; priv->gpio_can_stb.active_low = GPIOD_OUT_LOW;
#else
priv->gpio_can_en.gpio = of_get_named_gpio_flags(np,
"gpio_can_en", 0, &flags);
priv->gpio_can_en.active_low = flags & OF_GPIO_ACTIVE_LOW;
priv->gpio_can_stb.gpio = of_get_named_gpio_flags(np,
"gpio_can_stb", 0, &flags);
priv->gpio_can_stb.active_low = flags & OF_GPIO_ACTIVE_LOW;
#endif
priv->instance = of_alias_get_id(np, "mttcan"); priv->instance = of_alias_get_id(np, "mttcan");
priv->poll = of_property_read_bool(np, "use-polling"); priv->poll = of_property_read_bool(np, "use-polling");
@@ -1850,24 +1815,6 @@ static int mttcan_probe(struct platform_device *pdev)
goto exit_free_device; goto exit_free_device;
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
if (gpio_is_valid(priv->gpio_can_stb.gpio)) {
if (devm_gpio_request(priv->device, priv->gpio_can_stb.gpio,
"gpio_can_stb") < 0) {
dev_err(priv->device, "stb gpio request failed\n");
goto exit_free_device;
}
}
if (gpio_is_valid(priv->gpio_can_en.gpio)) {
if (devm_gpio_request(priv->device, priv->gpio_can_en.gpio,
"gpio_can_en") < 0) {
dev_err(priv->device, "stb gpio request failed\n");
goto exit_free_device;
}
}
#endif
/* allocate controller struct memory and set fields */ /* allocate controller struct memory and set fields */
priv->ttcan = priv->ttcan =
devm_kzalloc(priv->device, sizeof(struct ttcan_controller), devm_kzalloc(priv->device, sizeof(struct ttcan_controller),