From 4dfc5493fec8f6290457446b0478695b153da60a Mon Sep 17 00:00:00 2001 From: Dominik Sliwa Date: Mon, 29 Oct 2018 10:50:58 +0100 Subject: pin_config: add pull up on CAN TX pins Signed-off-by: Dominik Sliwa --- board/pin_mux.c | 14 ++++++++++++-- drivers/fsl_sim.c | 0 drivers/fsl_sim.h | 0 3 files changed, 12 insertions(+), 2 deletions(-) mode change 100755 => 100644 drivers/fsl_sim.c mode change 100755 => 100644 drivers/fsl_sim.h diff --git a/board/pin_mux.c b/board/pin_mux.c index 12d133c..d012afc 100644 --- a/board/pin_mux.c +++ b/board/pin_mux.c @@ -56,6 +56,7 @@ void BOARD_InitPins(void) kGPIO_DigitalInput, }; port_pin_config_t od_config; + port_pin_config_t can_tx_config; port_pin_config_t in_config; CLOCK_EnableClock(kCLOCK_PortA); @@ -68,12 +69,21 @@ void BOARD_InitPins(void) PORT_SetPinMux(PORTA, 18UL, kPORT_PinDisabledOrAnalog); PORT_SetPinMux(PORTA, 19UL, kPORT_PinDisabledOrAnalog); #ifndef TESTER_BUILD + + can_tx_config.mux = kPORT_MuxAlt2; + can_tx_config.openDrainEnable = kPORT_OpenDrainDisable; + can_tx_config.pullSelect = kPORT_PullUp; + can_tx_config.slewRate = kPORT_FastSlewRate; + can_tx_config.passiveFilterEnable = kPORT_PassiveFilterDisable; + can_tx_config.driveStrength = kPORT_LowDriveStrength; + can_tx_config.lockRegister = kPORT_UnlockRegister; + /* CAN0 pinmux config */ - PORT_SetPinMux(PORTA, 12u, kPORT_MuxAlt2); /* CAN0 TX */ + PORT_SetPinConfig(PORTA, 12u, &can_tx_config); /* CAN0 TX */ PORT_SetPinMux(PORTA, 13u, kPORT_MuxAlt2); /* CAN0 RX */ /* CAN1 pinmux config */ - PORT_SetPinMux(PORTC, 17u, kPORT_MuxAlt2); /* CAN1 TX */ + PORT_SetPinConfig(PORTC, 17u, &can_tx_config); /* CAN1 TX */ PORT_SetPinMux(PORTC, 16u, kPORT_MuxAlt2); /* CAN1 RX */ #ifdef SDK_DEBUGCONSOLE diff --git a/drivers/fsl_sim.c b/drivers/fsl_sim.c old mode 100755 new mode 100644 diff --git a/drivers/fsl_sim.h b/drivers/fsl_sim.h old mode 100755 new mode 100644 -- cgit v1.2.3