diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-03-23 22:15:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-23 22:15:07 -0700 |
| commit | 9970de8b013a81908eb78aa6409c0e0495d3eb30 (patch) | |
| tree | 273aafc7abc57a6958f91f508cd633fef6bec68c /drivers/net/dsa/sja1105/sja1105_static_config.c | |
| parent | net: typhoon: Add required whitespace after keywords (diff) | |
| parent | net: dsa: sja1105: configure the PTP_CLK pin as EXT_TS or PER_OUT (diff) | |
| download | wireguard-linux-9970de8b013a81908eb78aa6409c0e0495d3eb30.tar.xz wireguard-linux-9970de8b013a81908eb78aa6409c0e0495d3eb30.zip | |
Merge branch 'PTP_CLK-pin-configuration-for-SJA1105-DSA-driver'
Vladimir Oltean says:
====================
PTP_CLK pin configuration for SJA1105 DSA driver
This series adds support for the PTP_CLK pin on SJA1105 to be configured
via the PTP subsystem, in the "periodic output" and "external timestamp
input" modes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/sja1105/sja1105_static_config.c')
| -rw-r--r-- | drivers/net/dsa/sja1105/sja1105_static_config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/dsa/sja1105/sja1105_static_config.c b/drivers/net/dsa/sja1105/sja1105_static_config.c index 63d2311817c4..bbfe034910a0 100644 --- a/drivers/net/dsa/sja1105/sja1105_static_config.c +++ b/drivers/net/dsa/sja1105/sja1105_static_config.c @@ -102,12 +102,13 @@ static size_t sja1105et_avb_params_entry_packing(void *buf, void *entry_ptr, return size; } -static size_t sja1105pqrs_avb_params_entry_packing(void *buf, void *entry_ptr, - enum packing_op op) +size_t sja1105pqrs_avb_params_entry_packing(void *buf, void *entry_ptr, + enum packing_op op) { const size_t size = SJA1105PQRS_SIZE_AVB_PARAMS_ENTRY; struct sja1105_avb_params_entry *entry = entry_ptr; + sja1105_packing(buf, &entry->cas_master, 126, 126, size, op); sja1105_packing(buf, &entry->destmeta, 125, 78, size, op); sja1105_packing(buf, &entry->srcmeta, 77, 30, size, op); return size; |