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

Commit 05f46409 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'am437x' 



George Cherian says:

====================
The series adds CPTS support for AM4372.

Patch 1 - DT changes w.r.t clock changes for AM33xx.
Patch 2 - CPTS clock name harcoding in the driver is removed.
	  Easier to pass the clock name from dt rather than hardcoding in driver.
	  Also in prepration for DRA7x CPTS support.
Patch 3 - Enable the CPTS support for both DRA7x and AM4372 in the driver.
Patch 4 - Enable the Annexe F for L2 PTP for AM437x and DRA7x.
Patch 5 - Change the default clocksource to dpll_core_m5
Patch 6 - DT changes for AM4372.

v1 -> v2
	Patch 1 and 2 Re-ordering.
	Seperate TS_BITS define for Hw version V2 and V3
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 56bfa7ee de21b26e

arch/arm/boot/dts/am33xx.dtsi

+2 −0
Original line number Original line Diff line number Diff line
@@ -665,6 +665,8 @@ 
		mac: ethernet@4a100000 {

		mac: ethernet@4a100000 {

			compatible = "ti,cpsw";

			compatible = "ti,cpsw";

			ti,hwmods = "cpgmac0";

			ti,hwmods = "cpgmac0";

			clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>;

			clock-names = "fck", "cpts";

			cpdma_channels = <8>;

			cpdma_channels = <8>;

			ale_entries = <1024>;

			ale_entries = <1024>;

			bd_ram_size = <0x2000>;

			bd_ram_size = <0x2000>;

arch/arm/boot/dts/am4372.dtsi

+2 −0
Original line number Original line Diff line number Diff line
@@ -489,6 +489,8 @@ 
			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <1>;

			#size-cells = <1>;

			ti,hwmods = "cpgmac0";

			ti,hwmods = "cpgmac0";

			clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>;

			clock-names = "fck", "cpts";

			status = "disabled";

			status = "disabled";

			cpdma_channels = <8>;

			cpdma_channels = <8>;

			ale_entries = <1024>;

			ale_entries = <1024>;

drivers/clk/ti/clk-43xx.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -110,9 +110,25 @@ static struct ti_dt_clk am43xx_clks[] = { 




int __init am43xx_dt_clk_init(void)

int __init am43xx_dt_clk_init(void)

{

{

	struct clk *clk1, *clk2;



	ti_dt_clocks_register(am43xx_clks);

	ti_dt_clocks_register(am43xx_clks);





	omap2_clk_disable_autoidle_all();

	omap2_clk_disable_autoidle_all();





	/*

	 * cpsw_cpts_rft_clk  has got the choice of 3 clocksources

	 * dpll_core_m4_ck, dpll_core_m5_ck and dpll_disp_m2_ck.

	 * By default dpll_core_m4_ck is selected, witn this as clock

	 * source the CPTS doesnot work properly. It gives clockcheck errors

	 * while running PTP.

	 * clockcheck: clock jumped backward or running slower than expected!

	 * By selecting dpll_core_m5_ck as the clocksource fixes this issue.

	 * In AM335x dpll_core_m5_ck is the default clocksource.

	 */

	clk1 = clk_get_sys(NULL, "cpsw_cpts_rft_clk");

	clk2 = clk_get_sys(NULL, "dpll_core_m5_ck");

	clk_set_parent(clk1, clk2);



	return 0;

	return 0;

}
 
}

drivers/net/ethernet/ti/cpsw.c

+42 −14
Original line number Original line Diff line number Diff line
@@ -248,20 +248,31 @@ struct cpsw_ss_regs { 
#define TS_131              (1<<11) /* Time Sync Dest IP Addr 131 enable */

#define TS_131              (1<<11) /* Time Sync Dest IP Addr 131 enable */

#define TS_130              (1<<10) /* Time Sync Dest IP Addr 130 enable */

#define TS_130              (1<<10) /* Time Sync Dest IP Addr 130 enable */

#define TS_129              (1<<9)  /* Time Sync Dest IP Addr 129 enable */

#define TS_129              (1<<9)  /* Time Sync Dest IP Addr 129 enable */

#define TS_BIT8             (1<<8)  /* ts_ttl_nonzero? */

#define TS_TTL_NONZERO      (1<<8)  /* Time Sync Time To Live Non-zero enable */

#define TS_ANNEX_F_EN       (1<<6)  /* Time Sync Annex F enable */

#define TS_ANNEX_D_EN       (1<<4)  /* Time Sync Annex D enable */

#define TS_ANNEX_D_EN       (1<<4)  /* Time Sync Annex D enable */

#define TS_LTYPE2_EN        (1<<3)  /* Time Sync LTYPE 2 enable */

#define TS_LTYPE2_EN        (1<<3)  /* Time Sync LTYPE 2 enable */

#define TS_LTYPE1_EN        (1<<2)  /* Time Sync LTYPE 1 enable */

#define TS_LTYPE1_EN        (1<<2)  /* Time Sync LTYPE 1 enable */

#define TS_TX_EN            (1<<1)  /* Time Sync Transmit Enable */

#define TS_TX_EN            (1<<1)  /* Time Sync Transmit Enable */

#define TS_RX_EN            (1<<0)  /* Time Sync Receive Enable */

#define TS_RX_EN            (1<<0)  /* Time Sync Receive Enable */





#define CTRL_TS_BITS \

#define CTRL_V2_TS_BITS \

	(TS_320 | TS_319 | TS_132 | TS_131 | TS_130 | TS_129 | TS_BIT8 | \

	(TS_320 | TS_319 | TS_132 | TS_131 | TS_130 | TS_129 |\

	 TS_ANNEX_D_EN | TS_LTYPE1_EN)

	 TS_TTL_NONZERO  | TS_ANNEX_D_EN | TS_LTYPE1_EN)





#define CTRL_ALL_TS_MASK (CTRL_TS_BITS | TS_TX_EN | TS_RX_EN)

#define CTRL_V2_ALL_TS_MASK (CTRL_V2_TS_BITS | TS_TX_EN | TS_RX_EN)

#define CTRL_TX_TS_BITS  (CTRL_TS_BITS | TS_TX_EN)

#define CTRL_V2_TX_TS_BITS  (CTRL_V2_TS_BITS | TS_TX_EN)

#define CTRL_RX_TS_BITS  (CTRL_TS_BITS | TS_RX_EN)

#define CTRL_V2_RX_TS_BITS  (CTRL_V2_TS_BITS | TS_RX_EN)





#define CTRL_V3_TS_BITS \

	(TS_320 | TS_319 | TS_132 | TS_131 | TS_130 | TS_129 |\

	 TS_TTL_NONZERO | TS_ANNEX_F_EN | TS_ANNEX_D_EN |\

	 TS_LTYPE1_EN)



#define CTRL_V3_ALL_TS_MASK (CTRL_V3_TS_BITS | TS_TX_EN | TS_RX_EN)

#define CTRL_V3_TX_TS_BITS  (CTRL_V3_TS_BITS | TS_TX_EN)

#define CTRL_V3_RX_TS_BITS  (CTRL_V3_TS_BITS | TS_RX_EN)





/* Bit definitions for the CPSW2_TS_SEQ_MTYPE register */

/* Bit definitions for the CPSW2_TS_SEQ_MTYPE register */

#define TS_SEQ_ID_OFFSET_SHIFT   (16)    /* Time Sync Sequence ID Offset */

#define TS_SEQ_ID_OFFSET_SHIFT   (16)    /* Time Sync Sequence ID Offset */
@@ -1376,13 +1387,27 @@ static void cpsw_hwtstamp_v2(struct cpsw_priv *priv) 
		slave = &priv->slaves[priv->data.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;

	switch (priv->version) {

	case CPSW_VERSION_2:

		ctrl &= ~CTRL_V2_ALL_TS_MASK;





		if (priv->cpts->tx_enable)

		if (priv->cpts->tx_enable)

		ctrl |= CTRL_TX_TS_BITS;

			ctrl |= CTRL_V2_TX_TS_BITS;





		if (priv->cpts->rx_enable)

		if (priv->cpts->rx_enable)

		ctrl |= CTRL_RX_TS_BITS;

			ctrl |= CTRL_V2_RX_TS_BITS;

	break;

	case CPSW_VERSION_3:

	default:

		ctrl &= ~CTRL_V3_ALL_TS_MASK;



		if (priv->cpts->tx_enable)

			ctrl |= CTRL_V3_TX_TS_BITS;



		if (priv->cpts->rx_enable)

			ctrl |= CTRL_V3_RX_TS_BITS;

	break;

	}





	mtype = (30 << TS_SEQ_ID_OFFSET_SHIFT) | EVENT_MSG_BITS;

	mtype = (30 << TS_SEQ_ID_OFFSET_SHIFT) | EVENT_MSG_BITS;
@@ -1398,7 +1423,8 @@ static int cpsw_hwtstamp_set(struct net_device *dev, struct ifreq *ifr) 
	struct hwtstamp_config cfg;

	struct hwtstamp_config cfg;





	if (priv->version != CPSW_VERSION_1 &&

	if (priv->version != CPSW_VERSION_1 &&

	    priv->version != CPSW_VERSION_2)

	    priv->version != CPSW_VERSION_2 &&

	    priv->version != CPSW_VERSION_3)

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;





	if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg)))

	if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg)))
@@ -1443,6 +1469,7 @@ static int cpsw_hwtstamp_set(struct net_device *dev, struct ifreq *ifr) 
		cpsw_hwtstamp_v1(priv);

		cpsw_hwtstamp_v1(priv);

		break;

		break;

	case CPSW_VERSION_2:

	case CPSW_VERSION_2:

	case CPSW_VERSION_3:

		cpsw_hwtstamp_v2(priv);

		cpsw_hwtstamp_v2(priv);

		break;

		break;

	default:

	default:
@@ -1459,7 +1486,8 @@ static int cpsw_hwtstamp_get(struct net_device *dev, struct ifreq *ifr) 
	struct hwtstamp_config cfg;

	struct hwtstamp_config cfg;





	if (priv->version != CPSW_VERSION_1 &&

	if (priv->version != CPSW_VERSION_1 &&

	    priv->version != CPSW_VERSION_2)

	    priv->version != CPSW_VERSION_2 &&

	    priv->version != CPSW_VERSION_3)

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;





	cfg.flags = 0;

	cfg.flags = 0;

drivers/net/ethernet/ti/cpts.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -236,13 +236,11 @@ static void cpts_overflow_check(struct work_struct *work) 
	schedule_delayed_work(&cpts->overflow_work, CPTS_OVERFLOW_PERIOD);

	schedule_delayed_work(&cpts->overflow_work, CPTS_OVERFLOW_PERIOD);

}

}





#define CPTS_REF_CLOCK_NAME "cpsw_cpts_rft_clk"

static void cpts_clk_init(struct device *dev, struct cpts *cpts)



static void cpts_clk_init(struct cpts *cpts)

{

{

	cpts->refclk = clk_get(NULL, CPTS_REF_CLOCK_NAME);

	cpts->refclk = devm_clk_get(dev, "cpts");

	if (IS_ERR(cpts->refclk)) {

	if (IS_ERR(cpts->refclk)) {

		pr_err("Failed to clk_get %s\n", CPTS_REF_CLOCK_NAME);

		dev_err(dev, "Failed to get cpts refclk\n");

		cpts->refclk = NULL;

		cpts->refclk = NULL;

		return;

		return;

	}

	}
@@ -252,7 +250,6 @@ static void cpts_clk_init(struct cpts *cpts) 
static void cpts_clk_release(struct cpts *cpts)

static void cpts_clk_release(struct cpts *cpts)

{

{

	clk_disable(cpts->refclk);

	clk_disable(cpts->refclk);

	clk_put(cpts->refclk);

}

}





static int cpts_match(struct sk_buff *skb, unsigned int ptp_class,

static int cpts_match(struct sk_buff *skb, unsigned int ptp_class,
@@ -390,7 +387,7 @@ int cpts_register(struct device *dev, struct cpts *cpts, 
	for (i = 0; i < CPTS_MAX_EVENTS; i++)

	for (i = 0; i < CPTS_MAX_EVENTS; i++)

		list_add(&cpts->pool_data[i].list, &cpts->pool);

		list_add(&cpts->pool_data[i].list, &cpts->pool);





	cpts_clk_init(cpts);

	cpts_clk_init(dev, cpts);

	cpts_write32(cpts, CPTS_EN, control);

	cpts_write32(cpts, CPTS_EN, control);

	cpts_write32(cpts, TS_PEND_EN, int_enable);

	cpts_write32(cpts, TS_PEND_EN, int_enable);