Merge branch 'clk-s905' into clk-next

2016-07-07 20:06:30 -07:00 · 2016-07-07 20:06:30 -07:00 · a0fc8c4f4c
--- a/drivers/clk/meson/gxbb.h
+++ b/drivers/clk/meson/gxbb.h
@ -234,7 +234,7 @@
 #define CLKID_HDMI_PCLK		  63
 #define CLKID_USB1_DDR_BRIDGE	  64
 #define CLKID_USB0_DDR_BRIDGE	  65
-#define CLKID_MMC_PCLK		  66
+/* CLKID_MMC_PCLK */	       
 #define CLKID_DVIN		  67
 #define CLKID_UART2		  68
 #define CLKID_SANA		  69
--- a/include/dt-bindings/clock/gxbb-clkc.h
+++ b/include/dt-bindings/clock/gxbb-clkc.h
@ -8,5 +8,6 @@
 #define CLKID_CPUCLK		1
 #define CLKID_CLK81		12
 #define CLKID_ETH		36
+#define CLKID_MMC_PCLK		66

 #endif /* __GXBB_CLKC_H */