can: ti hecc module : add platform specific initialization callback.
Subsystems (3)
PATCH v3 1/1 can: ti hecc module : add platform specific initialization callback.
CAN module on AM3517 requires programming of IO expander as part of init sequence - to enable CAN PHY. Added platform specific callback to handle phy control(switch on /off).
---
Addressed review comments and also added conditional compile macros to gaurd against multiple inclusion of header file.
drivers/net/can/ti_hecc.c | 17 ++++++++++++++++- include/linux/can/platform/ti_hecc.h | 8 ++++++-- 2 files changed, 22 insertions(+), 3 deletions(-)
drivers/net/can/ti_hecc.c +16 -1
@@ -28,9 +28,11 @@* .mbx_offset = 0x2000, * .int_line = 0, * .revision = 1, +* .transceiver_switch = hecc_phy_control, * }; * -* Please see include/can/platform/ti_hecc.h for description of above fields +* Please see include/linux/can/platform/ti_hecc.h for description of +* above fields. * */
@@ -220,6 +222,7 @@ struct ti_hecc_priv {u32 tx_head;u32 tx_tail;u32 rx_next; +void (*transceiver_switch)(int ); };static inline int get_tx_head_mb (struct ti_hecc_priv *priv)
@@ -317,6 +320,13 @@ static int ti_hecc_set_btc(struct ti_hecc_priv *priv)return 0 ; } +static void ti_hecc_transceiver_switch (const struct ti_hecc_priv *priv, +int on) +{ +if (priv->transceiver_switch) + priv->transceiver_switch (on); +} +static void ti_hecc_reset (struct net_device *ndev) {u32 cnt;
@@ -816,10 +826,13 @@ static int ti_hecc_open(struct net_device *ndev)return err; } +ti_hecc_transceiver_switch (priv,1 ); +/* Open common can device */ err =open_candev (ndev);if (err) {dev_err (ndev->dev.parent,"open_candev() failed %d\n" , err); +ti_hecc_transceiver_switch (priv,0 );free_irq (ndev->irq, ndev);return err; }
@@ -840,6 +853,7 @@ static int ti_hecc_close(struct net_device *ndev)ti_hecc_stop (ndev);free_irq (ndev->irq, ndev);close_candev (ndev); +ti_hecc_transceiver_switch (priv,0 );return 0 ; }
@@ -901,6 +915,7 @@ static int ti_hecc_probe(struct platform_device *pdev) priv->hecc_ram_offset = pdata->hecc_ram_offset; priv->mbx_offset = pdata->mbx_offset; priv->int_line = pdata->int_line; + priv->transceiver_switch = pdata->transceiver_switch; priv->can.bittiming_const = &ti_hecc_bittiming_const; priv->can.do_set_mode = ti_hecc_do_set_mode;
include/linux/can/platform/ti_hecc.h +6 -2
@@ -1,3 +1,6 @@ +#ifndef __CAN_PLATFORM_TI_HECC_H__ +#define __CAN_PLATFORM_TI_HECC_H__ +/* * TI HECC (High End CAN Controller) driver platform header *
@@ -23,6 +26,7 @@* @mbx_offset: Mailbox RAM offset * @int_line: Interrupt line to use - 0 or 1 * @version: version for future use +* @transceiver_switch: platform specific callback fn for transceiver control * * Platform data structure to get all platform specific settings. * this structure also accounts the fact that the IP may have different
@@ -35,6 +39,6 @@ struct ti_hecc_platform_data {u32 mbx_offset;u32 int_line;u32 version; + void (*transceiver_switch) (int); }; - - +#endif
Signature · 1 line
1.6.2.4
A message that is not in the archive (sent off-list or not yet received): 1267190078-22328-1-git-send-email-srk-l0cyMroinI0@public.gmane.org
David Miller
AppliedFrom: Sriramakrishnan <[email protected]>
Date: Fri, 26 Feb 2010 18:44:38 +0530
Quoted 5 lines
CAN module on AM3517 requires programming of IO expander as part of init sequence - to enable CAN PHY. Added platform specific callback to handle phy control(switch on /off).
Signed-off-by Sriramakrishnan <[email protected]>
Applied, thanks.