Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e86ac13b authored by Mugunthan V N's avatar Mugunthan V N Committed by David S. Miller
Browse files

drivers: net: ethernet: cpsw: change cpts_active_slave to active_slave 



Change cpts_active_slave to active_slave so that the same DT property
can be used to ethtool and SIOCGMIIPHY.

CC: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarMugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 470d1474

Documentation/devicetree/bindings/net/cpsw.txt

+4 −3
Original line number Original line Diff line number Diff line
@@ -15,7 +15,8 @@ Required properties: 
- mac_control		: Specifies Default MAC control register content

- mac_control		: Specifies Default MAC control register content

			  for the specific platform

			  for the specific platform

- slaves		: Specifies number for slaves

- slaves		: Specifies number for slaves

- cpts_active_slave	: Specifies the slave to use for time stamping

- active_slave		: Specifies the slave to use for time stamping,

			  ethtool and SIOCGMIIPHY

- cpts_clock_mult	: Numerator to convert input clock ticks into nanoseconds

- cpts_clock_mult	: Numerator to convert input clock ticks into nanoseconds

- cpts_clock_shift	: Denominator to convert input clock ticks into nanoseconds

- cpts_clock_shift	: Denominator to convert input clock ticks into nanoseconds
@@ -52,7 +53,7 @@ Examples: 
		rx_descs = <64>;

		rx_descs = <64>;

		mac_control = <0x20>;

		mac_control = <0x20>;

		slaves = <2>;

		slaves = <2>;

		cpts_active_slave = <0>;

		active_slave = <0>;

		cpts_clock_mult = <0x80000000>;

		cpts_clock_mult = <0x80000000>;

		cpts_clock_shift = <29>;

		cpts_clock_shift = <29>;

		cpsw_emac0: slave@0 {

		cpsw_emac0: slave@0 {
@@ -78,7 +79,7 @@ Examples: 
		rx_descs = <64>;

		rx_descs = <64>;

		mac_control = <0x20>;

		mac_control = <0x20>;

		slaves = <2>;

		slaves = <2>;

		cpts_active_slave = <0>;

		active_slave = <0>;

		cpts_clock_mult = <0x80000000>;

		cpts_clock_mult = <0x80000000>;

		cpts_clock_shift = <29>;

		cpts_clock_shift = <29>;

		cpsw_emac0: slave@0 {

		cpsw_emac0: slave@0 {

arch/arm/boot/dts/am33xx.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -349,7 +349,7 @@ 
			rx_descs = <64>;

			rx_descs = <64>;

			mac_control = <0x20>;

			mac_control = <0x20>;

			slaves = <2>;

			slaves = <2>;

			cpts_active_slave = <0>;

			active_slave = <0>;

			cpts_clock_mult = <0x80000000>;

			cpts_clock_mult = <0x80000000>;

			cpts_clock_shift = <29>;

			cpts_clock_shift = <29>;

			reg = <0x4a100000 0x800

			reg = <0x4a100000 0x800

drivers/net/ethernet/ti/cpsw.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -942,7 +942,7 @@ static void cpsw_ndo_change_rx_flags(struct net_device *ndev, int flags) 




static void cpsw_hwtstamp_v1(struct cpsw_priv *priv)

static void cpsw_hwtstamp_v1(struct cpsw_priv *priv)

{

{

	struct cpsw_slave *slave = &priv->slaves[priv->data.cpts_active_slave];

	struct cpsw_slave *slave = &priv->slaves[priv->data.active_slave];

	u32 ts_en, seq_id;

	u32 ts_en, seq_id;





	if (!priv->cpts->tx_enable && !priv->cpts->rx_enable) {

	if (!priv->cpts->tx_enable && !priv->cpts->rx_enable) {
@@ -971,7 +971,7 @@ static void cpsw_hwtstamp_v2(struct cpsw_priv *priv) 
	if (priv->data.dual_emac)

	if (priv->data.dual_emac)

		slave = &priv->slaves[priv->emac_port];

		slave = &priv->slaves[priv->emac_port];

	else

	else

		slave = &priv->slaves[priv->data.cpts_active_slave];

		slave = &priv->slaves[priv->data.active_slave];





	ctrl = slave_read(slave, CPSW2_CONTROL);

	ctrl = slave_read(slave, CPSW2_CONTROL);

	ctrl &= ~CTRL_ALL_TS_MASK;

	ctrl &= ~CTRL_ALL_TS_MASK;
@@ -1282,12 +1282,12 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, 
	}

	}

	data->slaves = prop;

	data->slaves = prop;





	if (of_property_read_u32(node, "cpts_active_slave", &prop)) {

	if (of_property_read_u32(node, "active_slave", &prop)) {

		pr_err("Missing cpts_active_slave property in the DT.\n");

		pr_err("Missing active_slave property in the DT.\n");

		ret = -EINVAL;

		ret = -EINVAL;

		goto error_ret;

		goto error_ret;

	}

	}

	data->cpts_active_slave = prop;

	data->active_slave = prop;





	if (of_property_read_u32(node, "cpts_clock_mult", &prop)) {

	if (of_property_read_u32(node, "cpts_clock_mult", &prop)) {

		pr_err("Missing cpts_clock_mult property in the DT.\n");

		pr_err("Missing cpts_clock_mult property in the DT.\n");

include/linux/platform_data/cpsw.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ struct cpsw_platform_data { 
	u32	channels;	/* number of cpdma channels (symmetric) */

	u32	channels;	/* number of cpdma channels (symmetric) */

	u32	slaves;		/* number of slave cpgmac ports */

	u32	slaves;		/* number of slave cpgmac ports */

	struct cpsw_slave_data	*slave_data;

	struct cpsw_slave_data	*slave_data;

	u32	cpts_active_slave; /* time stamping slave */

	u32	active_slave; /* time stamping, ethtool and SIOCGMIIPHY slave */

	u32	cpts_clock_mult;  /* convert input clock ticks to nanoseconds */

	u32	cpts_clock_mult;  /* convert input clock ticks to nanoseconds */

	u32	cpts_clock_shift; /* convert input clock ticks to nanoseconds */

	u32	cpts_clock_shift; /* convert input clock ticks to nanoseconds */

	u32	ale_entries;	/* ale table size */

	u32	ale_entries;	/* ale table size */