Merge branch 'clk-meson-gxbb' into clk-next

2016-09-02 18:13:40 -07:00
parent 54fe0791fa 19a2a85d71
commit e918a18d2e
8 changed files with 503 additions and 118 deletions
--- a/include/dt-bindings/clock/gxbb-clkc.h
+++ b/include/dt-bindings/clock/gxbb-clkc.h
@@ -6,7 +6,10 @@
 #define __GXBB_CLKC_H

 #define CLKID_CPUCLK		1
+#define CLKID_HDMI_PLL		2
 #define CLKID_FCLK_DIV2		4
+#define CLKID_FCLK_DIV3		5
+#define CLKID_FCLK_DIV4		6
 #define CLKID_CLK81		12
 #define CLKID_ETH		36
 #define CLKID_SD_EMMC_A		94
--- a/include/dt-bindings/clock/meson8b-clkc.h
+++ b/include/dt-bindings/clock/meson8b-clkc.h
@@ -22,6 +22,4 @@
 #define CLKID_MPEG_SEL		14
 #define CLKID_MPEG_DIV		15

-#define CLK_NR_CLKS		(CLKID_MPEG_DIV + 1)
-
 #endif /* __MESON8B_CLKC_H */