diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2016-07-08 06:06:30 +0300 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2016-07-08 06:06:30 +0300 |
| commit | a0fc8c4f4ca744432765dabc76ef642a19e197de (patch) | |
| tree | 699888c363d2ab323c599e04250318402c420568 | |
| parent | 334e125b4e136739c4a22818eac6e3b50a48f767 (diff) | |
| parent | e16fb2e6355c1c1b41623af9e01ada196e2af098 (diff) | |
| download | linux-a0fc8c4f4ca744432765dabc76ef642a19e197de.tar.xz | |
Merge branch 'clk-s905' into clk-next
| -rw-r--r-- | drivers/clk/meson/gxbb.h | 2 | ||||
| -rw-r--r-- | include/dt-bindings/clock/gxbb-clkc.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h index a2adf3448b59..8355ecd27b81 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 diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h index f889d80246cb..5eb69ec74f6b 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 */ |