Merge branch 'clk-s905' into clk-next

lucamilanesio · Jul 16, 2016 · 149f9e7 · 149f9e7
2 parents 4d252fd + ca1d2e2
commit 149f9e7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
-/* CLKID_MMC_PCLK */	       
+#define CLKID_MMC_PCLK		  66
 #define CLKID_DVIN		  67
 #define CLKID_UART2		  68
 #define CLKID_SANA		  69

diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h
@@ -8,6 +8,5 @@
 #define CLKID_CPUCLK		1
 #define CLKID_CLK81		12
 #define CLKID_ETH		36
-#define CLKID_MMC_PCLK		66
 
 #endif /* __GXBB_CLKC_H */