Merge branch 'clk-s905' into clk-next

a0fc8c4f · Michael Turquette · 334e125b · e16fb2e6 · a0fc8c4f · a0fc8c4f
Commit a0fc8c4f authored Jul 07, 2016 by Michael Turquette
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

drivers/clk/meson/gxbb.h drivers/clk/meson/gxbb.h +1 -1

include/dt-bindings/clock/gxbb-clkc.h include/dt-bindings/clock/gxbb-clkc.h +1 -0

No files found.
--- 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 */