commit a0fc8c4f4ca744432765dabc76ef642a19e197de
author Michael Turquette <mturquette@baylibre.com> Thu Jul 07 20:06:30 2016 -0700
committer Michael Turquette <mturquette@baylibre.com> Thu Jul 07 20:06:30 2016 -0700
tree 699888c363d2ab323c599e04250318402c420568
parent 334e125b4e136739c4a22818eac6e3b50a48f767
parent e16fb2e6355c1c1b41623af9e01ada196e2af098

Merge branch 'clk-s905' into clk-next

drivers/clk/meson/gxbb.h

diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h
index a2adf34..8355ecd 100644
--- 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

include/dt-bindings/clock/gxbb-clkc.h

diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h
index f889d80..5eb69ec 100644
--- 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 */