Merge branch 'clk-s905' into clk-next

149f9e73 · Michael Turquette · 4d252fd5 · ca1d2e26 · 149f9e73 · 149f9e73
Commit 149f9e73 authored Jul 15, 2016 by Michael Turquette
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

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 +0 -1

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
-/* CLKID_MMC_PCLK */	       
+#define CLKID_MMC_PCLK		  66
 #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,6 +8,5 @@
 #define CLKID_CPUCLK		1
 #define CLKID_CLK81		12
 #define CLKID_ETH		36
-#define CLKID_MMC_PCLK		66

 #endif /* __GXBB_CLKC_H */