Commit c21e18a5 authored by David S. Miller's avatar David S. Miller

Merge branch 'Macb-power-management-support-for-ZynqMP'

Harini Katakam says:

====================
Macb power management support for ZynqMP

This series adds support for macb suspend/resume with system power down.
In relation to the above, this series also updates mdio_read/write
function for PM and adds tsu clock management.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 41bc0ddb de991c58
...@@ -715,6 +715,8 @@ ...@@ -715,6 +715,8 @@
__v; \ __v; \
}) })
#define MACB_READ_NSR(bp) macb_readl(bp, NSR)
/* struct macb_dma_desc - Hardware DMA descriptor /* struct macb_dma_desc - Hardware DMA descriptor
* @addr: DMA address of data buffer * @addr: DMA address of data buffer
* @ctrl: Control and status bits * @ctrl: Control and status bits
...@@ -1083,7 +1085,7 @@ struct macb_config { ...@@ -1083,7 +1085,7 @@ struct macb_config {
unsigned int dma_burst_length; unsigned int dma_burst_length;
int (*clk_init)(struct platform_device *pdev, struct clk **pclk, int (*clk_init)(struct platform_device *pdev, struct clk **pclk,
struct clk **hclk, struct clk **tx_clk, struct clk **hclk, struct clk **tx_clk,
struct clk **rx_clk); struct clk **rx_clk, struct clk **tsu_clk);
int (*init)(struct platform_device *pdev); int (*init)(struct platform_device *pdev);
int jumbo_max_len; int jumbo_max_len;
}; };
...@@ -1163,6 +1165,7 @@ struct macb { ...@@ -1163,6 +1165,7 @@ struct macb {
struct clk *hclk; struct clk *hclk;
struct clk *tx_clk; struct clk *tx_clk;
struct clk *rx_clk; struct clk *rx_clk;
struct clk *tsu_clk;
struct net_device *dev; struct net_device *dev;
union { union {
struct macb_stats macb; struct macb_stats macb;
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment