diff options
author | Alex Elder <elder@linaro.org> | 2014-04-21 17:26:23 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2014-04-30 14:51:39 -0400 |
commit | 0bdab78ba69f057c99e72b9887a997888e7fce15 (patch) | |
tree | f9c4c7dad1cd3ec0375712eab87acc8802a3973c | |
parent | dc613840a625bfad38141d2d8bbdb0c7bc3d45eb (diff) |
clk: bcm281xx: move compatible string definitions
The Broadcom 281xx clock code uses a #define for the compatible
string for it's clock control units (CCUs). Rather than defining
those in the C source file, define them in the header file that's
shared by both the code and the device tree source file (along with
all the clock ids).
Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
-rw-r--r-- | drivers/clk/bcm/clk-bcm281xx.c | 12 | ||||
-rw-r--r-- | include/dt-bindings/clock/bcm281xx.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/clk/bcm/clk-bcm281xx.c b/drivers/clk/bcm/clk-bcm281xx.c index 71a65a49f1a4..502a487d62c5 100644 --- a/drivers/clk/bcm/clk-bcm281xx.c +++ b/drivers/clk/bcm/clk-bcm281xx.c | |||
@@ -18,18 +18,6 @@ | |||
18 | #define BCM281XX_CCU_COMMON(_name, _ucase_name) \ | 18 | #define BCM281XX_CCU_COMMON(_name, _ucase_name) \ |
19 | KONA_CCU_COMMON(BCM281XX, _name, _ucase_name) | 19 | KONA_CCU_COMMON(BCM281XX, _name, _ucase_name) |
20 | 20 | ||
21 | /* | ||
22 | * These are the bcm281xx CCU device tree "compatible" strings. | ||
23 | * We're stuck with using "bcm11351" in the string because wild | ||
24 | * cards aren't allowed, and that name was the first one defined | ||
25 | * in this family of devices. | ||
26 | */ | ||
27 | #define BCM281XX_DT_ROOT_CCU_COMPAT "brcm,bcm11351-root-ccu" | ||
28 | #define BCM281XX_DT_AON_CCU_COMPAT "brcm,bcm11351-aon-ccu" | ||
29 | #define BCM281XX_DT_HUB_CCU_COMPAT "brcm,bcm11351-hub-ccu" | ||
30 | #define BCM281XX_DT_MASTER_CCU_COMPAT "brcm,bcm11351-master-ccu" | ||
31 | #define BCM281XX_DT_SLAVE_CCU_COMPAT "brcm,bcm11351-slave-ccu" | ||
32 | |||
33 | /* Root CCU */ | 21 | /* Root CCU */ |
34 | 22 | ||
35 | static struct peri_clk_data frac_1m_data = { | 23 | static struct peri_clk_data frac_1m_data = { |
diff --git a/include/dt-bindings/clock/bcm281xx.h b/include/dt-bindings/clock/bcm281xx.h index e0096940886d..a763460cf1af 100644 --- a/include/dt-bindings/clock/bcm281xx.h +++ b/include/dt-bindings/clock/bcm281xx.h | |||
@@ -20,6 +20,18 @@ | |||
20 | * the clock control units (CCUs) on Broadcom BCM281XX family SoCs. | 20 | * the clock control units (CCUs) on Broadcom BCM281XX family SoCs. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | /* | ||
24 | * These are the bcm281xx CCU device tree "compatible" strings. | ||
25 | * We're stuck with using "bcm11351" in the string because wild | ||
26 | * cards aren't allowed, and that name was the first one defined | ||
27 | * in this family of devices. | ||
28 | */ | ||
29 | #define BCM281XX_DT_ROOT_CCU_COMPAT "brcm,bcm11351-root-ccu" | ||
30 | #define BCM281XX_DT_AON_CCU_COMPAT "brcm,bcm11351-aon-ccu" | ||
31 | #define BCM281XX_DT_HUB_CCU_COMPAT "brcm,bcm11351-hub-ccu" | ||
32 | #define BCM281XX_DT_MASTER_CCU_COMPAT "brcm,bcm11351-master-ccu" | ||
33 | #define BCM281XX_DT_SLAVE_CCU_COMPAT "brcm,bcm11351-slave-ccu" | ||
34 | |||
23 | /* root CCU clock ids */ | 35 | /* root CCU clock ids */ |
24 | 36 | ||
25 | #define BCM281XX_ROOT_CCU_FRAC_1M 0 | 37 | #define BCM281XX_ROOT_CCU_FRAC_1M 0 |