Merge branches 'clk-bulk-optional', 'clk-kirkwood', 'clk-socfpga' and 'clk-docs' into clk-next
- Add a clk_bulk_get_optional() API (with devm too) - Support for Marvell 98DX1135 SoCs * clk-bulk-optional: clk: Document some devm_clk_bulk*() APIs clk: Add devm_clk_bulk_get_optional() function clk: Add clk_bulk_get_optional() function * clk-kirkwood: clk: kirkwood: Add support for MV98DX1135 dt-bindings: clock: mvebu: Add compatible string for 98dx1135 core clock * clk-socfpga: clk: socfpga: stratix10: fix divider entry for the emac clocks clk: socfpga: stratix10: add additional clocks needed for the NAND IP * clk-docs: clk: Grammar missing "and", Spelling s/statisfied/satisfied/
This commit is contained in:
@@ -79,6 +79,8 @@
|
||||
#define STRATIX10_USB_CLK 59
|
||||
#define STRATIX10_SPI_M_CLK 60
|
||||
#define STRATIX10_NAND_CLK 61
|
||||
#define STRATIX10_NUM_CLKS 62
|
||||
#define STRATIX10_NAND_X_CLK 62
|
||||
#define STRATIX10_NAND_ECC_CLK 63
|
||||
#define STRATIX10_NUM_CLKS 64
|
||||
|
||||
#endif /* __STRATIX10_CLOCK_H */
|
||||
|
Reference in New Issue
Block a user