summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2025-07-15 13:32:08 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2025-07-15 13:32:08 +0200
commit4be430b2659b6d25df1cae46ed5b86bed72755f7 (patch)
tree22c51c4a6fc924e0f44dd40f3c5dafdbc20c8902
parent21e9b7d11218e7ba009e74bf51abacf0534f5626 (diff)
parent5323af351e7524497930b7793153ff68ee5c0ec1 (diff)
Merge patch series "can: Kconfig: add missing COMPILE_TEST"
Vincent Mailhol <mailhol.vincent@wanadoo.fr> says: The ti_hecc and tscan1 CAN drivers can not be built on an x86_64 platform. Add the COMPILE_TEST dependency to allow build testing. Doing that, a so far unnoticed W=0 warning showed up in ti_hecc. Fix this warning. To prevent any potential noise in some future git bisect, the warning is fixed before introducing COMPILE_TEST. Note that the mscan and mpc5xxx drivers have the same issue but those two use some helper functions, such as in_8() and out_8(), which are only available on the powerpc platform. Those two drivers would require some deeper code refactor to be built on x86_64 and are thus left out of scope. Link: https://patch.msgid.link/20250715-can-compile-test-v2-0-f7fd566db86f@wanadoo.fr Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--drivers/net/can/Kconfig2
-rw-r--r--drivers/net/can/sja1000/Kconfig2
-rw-r--r--drivers/net/can/ti_hecc.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index cf989bea9aa3..d58fab0161b3 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -201,7 +201,7 @@ config CAN_SUN4I
be called sun4i_can.
config CAN_TI_HECC
- depends on ARM
+ depends on ARM || COMPILE_TEST
tristate "TI High End CAN Controller"
select CAN_RX_OFFLOAD
help
diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index 2f516cc6d22c..ba16d7bc09ef 100644
--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig
@@ -105,7 +105,7 @@ config CAN_SJA1000_PLATFORM
config CAN_TSCAN1
tristate "TS-CAN1 PC104 boards"
- depends on ISA
+ depends on ISA || (COMPILE_TEST && HAS_IOPORT)
help
This driver is for Technologic Systems' TSCAN-1 PC104 boards.
https://www.embeddedts.com/products/TS-CAN1
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 644e8b8eb91e..e6d6661a908a 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -383,7 +383,7 @@ static void ti_hecc_start(struct net_device *ndev)
* overflows instead of the hardware silently dropping the
* messages.
*/
- mbx_mask = ~BIT(HECC_RX_LAST_MBOX);
+ mbx_mask = ~BIT_U32(HECC_RX_LAST_MBOX);
hecc_write(priv, HECC_CANOPC, mbx_mask);
/* Enable interrupts */