Commit 309d673e authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'aspeed-5.5-clk' of...

Merge tag 'aspeed-5.5-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into clk-aspeed

Pull ASPEED clk dt binding updates from Joel Stanley

* tag 'aspeed-5.5-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  dt-bindings: clock: Add AST2600 RMII RCLK gate definitions
  dt-bindings: clock: Add AST2500 RMII RCLK definitions
parents 54ecb8f7 d8d9ad83
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@
#define ASPEED_CLK_BCLK			33
#define ASPEED_CLK_MPLL			34
#define ASPEED_CLK_24M			35
#define ASPEED_CLK_MAC1RCLK		36
#define ASPEED_CLK_MAC2RCLK		37

#define ASPEED_RESET_XDMA		0
#define ASPEED_RESET_MCTP		1
+4 −0
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@
#define ASPEED_CLK_MAC12		64
#define ASPEED_CLK_MAC34		65
#define ASPEED_CLK_USBPHY_40M		66
#define ASPEED_CLK_MAC1RCLK		67
#define ASPEED_CLK_MAC2RCLK		68
#define ASPEED_CLK_MAC3RCLK		69
#define ASPEED_CLK_MAC4RCLK		70

/* Only list resets here that are not part of a gate */
#define ASPEED_RESET_ADC		55