diff options
author | Michael Turquette <mturquette@baylibre.com> | 2016-07-15 22:15:40 -0400 |
---|---|---|
committer | Michael Turquette <mturquette@baylibre.com> | 2016-07-15 22:15:40 -0400 |
commit | 149f9e734f8d61d9ae2eb120ec83ed8131846003 (patch) | |
tree | 4f7f2a95fe91d2c17653fa0e412965470cda41a0 | |
parent | 4d252fd5719bd047a178668aa09ee8bc9de85c7c (diff) | |
parent | ca1d2e269f593b318a75f3ffb9befc1ec8b6f2fd (diff) |
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, 1 insertions, 2 deletions
diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h index 8355ecd27b81..a2adf3448b59 100644 --- a/drivers/clk/meson/gxbb.h +++ b/drivers/clk/meson/gxbb.h | |||
@@ -234,7 +234,7 @@ | |||
234 | #define CLKID_HDMI_PCLK 63 | 234 | #define CLKID_HDMI_PCLK 63 |
235 | #define CLKID_USB1_DDR_BRIDGE 64 | 235 | #define CLKID_USB1_DDR_BRIDGE 64 |
236 | #define CLKID_USB0_DDR_BRIDGE 65 | 236 | #define CLKID_USB0_DDR_BRIDGE 65 |
237 | /* CLKID_MMC_PCLK */ | 237 | #define CLKID_MMC_PCLK 66 |
238 | #define CLKID_DVIN 67 | 238 | #define CLKID_DVIN 67 |
239 | #define CLKID_UART2 68 | 239 | #define CLKID_UART2 68 |
240 | #define CLKID_SANA 69 | 240 | #define CLKID_SANA 69 |
diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h index 5eb69ec74f6b..f889d80246cb 100644 --- a/include/dt-bindings/clock/gxbb-clkc.h +++ b/include/dt-bindings/clock/gxbb-clkc.h | |||
@@ -8,6 +8,5 @@ | |||
8 | #define CLKID_CPUCLK 1 | 8 | #define CLKID_CPUCLK 1 |
9 | #define CLKID_CLK81 12 | 9 | #define CLKID_CLK81 12 |
10 | #define CLKID_ETH 36 | 10 | #define CLKID_ETH 36 |
11 | #define CLKID_MMC_PCLK 66 | ||
12 | 11 | ||
13 | #endif /* __GXBB_CLKC_H */ | 12 | #endif /* __GXBB_CLKC_H */ |