Skip to content

Commit c21e18a

Browse files
committed
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: David S. Miller <[email protected]>
2 parents 41bc0dd + de991c5 commit c21e18a

File tree

2 files changed

+188
-32
lines changed

2 files changed

+188
-32
lines changed

drivers/net/ethernet/cadence/macb.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,8 @@
715715
__v; \
716716
})
717717

718+
#define MACB_READ_NSR(bp) macb_readl(bp, NSR)
719+
718720
/* struct macb_dma_desc - Hardware DMA descriptor
719721
* @addr: DMA address of data buffer
720722
* @ctrl: Control and status bits
@@ -1083,7 +1085,7 @@ struct macb_config {
10831085
unsigned int dma_burst_length;
10841086
int (*clk_init)(struct platform_device *pdev, struct clk **pclk,
10851087
struct clk **hclk, struct clk **tx_clk,
1086-
struct clk **rx_clk);
1088+
struct clk **rx_clk, struct clk **tsu_clk);
10871089
int (*init)(struct platform_device *pdev);
10881090
int jumbo_max_len;
10891091
};
@@ -1163,6 +1165,7 @@ struct macb {
11631165
struct clk *hclk;
11641166
struct clk *tx_clk;
11651167
struct clk *rx_clk;
1168+
struct clk *tsu_clk;
11661169
struct net_device *dev;
11671170
union {
11681171
struct macb_stats macb;

0 commit comments

Comments
 (0)