summaryrefslogtreecommitdiffstats
path: root/include/linux/can/dev.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-09-20 15:56:58 +0100
committerMark Brown <broonie@kernel.org>2021-09-21 15:23:35 +0100
commitffb1e76f4f32d2b8ea4189df0484980370476395 (patch)
treec62376eab558809973dc5b71806df07c388bfc1a /include/linux/can/dev.h
parent2bab94090b01bc593d8bc25f68df41f198721173 (diff)
parente4e737bb5c170df6135a127739a9e6148ee3da82 (diff)
downloadcachepc-linux-ffb1e76f4f32d2b8ea4189df0484980370476395.tar.gz
cachepc-linux-ffb1e76f4f32d2b8ea4189df0484980370476395.zip
Merge tag 'v5.15-rc2' into spi-5.15
Linux 5.15-rc2
Diffstat (limited to 'include/linux/can/dev.h')
-rw-r--r--include/linux/can/dev.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 27b275e463da..2413253e54c7 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -32,6 +32,12 @@ enum can_mode {
CAN_MODE_SLEEP
};
+enum can_termination_gpio {
+ CAN_TERMINATION_GPIO_DISABLED = 0,
+ CAN_TERMINATION_GPIO_ENABLED,
+ CAN_TERMINATION_GPIO_MAX,
+};
+
/*
* CAN common private data
*/
@@ -55,6 +61,8 @@ struct can_priv {
unsigned int termination_const_cnt;
const u16 *termination_const;
u16 termination;
+ struct gpio_desc *termination_gpio;
+ u16 termination_gpio_ohms[CAN_TERMINATION_GPIO_MAX];
enum can_state state;