openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

clk: bcm281xx: change some symbol names 

As I developed the bcm281xx clock code I understood there were
restrictions on device tree "compatible" strings names, and as a
result "bcm11351" was used in places despite the part family being
more properly called "bcm281xx".  This can be a little confusing.

In some cases I went to far and things using "bcm11351" when that
was not necessary.

This patch remedies this.  It renames the symbol used to define the
"compatible" string (but not its value) so it uses "BCM281XX".
Similarly, the name names provided to the CLK_OF_DECLARE() macro
are changed, hoping to minimize the number of places that the
confusing "11351" string is used.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
This commit is contained in:
Alex Elder 2014-04-21 16:11:39 -05:00 committed by Mike Turquette
parent e756325206
commit 9d3d87c750
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/clk/bcm/clk-bcm281xx.c
View File

@ -15,12 +15,17 @@
#include "clk-kona.h" #include "clk-kona.h"
#include "dt-bindings/clock/bcm281xx.h" #include "dt-bindings/clock/bcm281xx.h"
/* bcm11351 CCU device tree "compatible" strings */ /*
#define BCM11351_DT_ROOT_CCU_COMPAT "brcm,bcm11351-root-ccu" * These are the bcm281xx CCU device tree "compatible" strings.
#define BCM11351_DT_AON_CCU_COMPAT "brcm,bcm11351-aon-ccu" * We're stuck with using "bcm11351" in the string because wild
#define BCM11351_DT_HUB_CCU_COMPAT "brcm,bcm11351-hub-ccu" * cards aren't allowed, and that name was the first one defined
#define BCM11351_DT_MASTER_CCU_COMPAT "brcm,bcm11351-master-ccu" * in this family of devices.
#define BCM11351_DT_SLAVE_CCU_COMPAT "brcm,bcm11351-slave-ccu" */
#define BCM281XX_DT_ROOT_CCU_COMPAT "brcm,bcm11351-root-ccu"
#define BCM281XX_DT_AON_CCU_COMPAT "brcm,bcm11351-aon-ccu"
#define BCM281XX_DT_HUB_CCU_COMPAT "brcm,bcm11351-hub-ccu"
#define BCM281XX_DT_MASTER_CCU_COMPAT "brcm,bcm11351-master-ccu"
#define BCM281XX_DT_SLAVE_CCU_COMPAT "brcm,bcm11351-slave-ccu"
/* Root CCU clocks */ /* Root CCU clocks */
@ -404,13 +409,13 @@ static void __init kona_dt_slave_ccu_setup(struct device_node *node)
kona_dt_ccu_setup(node, bcm281xx_slave_ccu_clks_setup); kona_dt_ccu_setup(node, bcm281xx_slave_ccu_clks_setup);
} }
CLK_OF_DECLARE(bcm11351_root_ccu, BCM11351_DT_ROOT_CCU_COMPAT, CLK_OF_DECLARE(bcm281xx_root_ccu, BCM281XX_DT_ROOT_CCU_COMPAT,
kona_dt_root_ccu_setup); kona_dt_root_ccu_setup);
CLK_OF_DECLARE(bcm11351_aon_ccu, BCM11351_DT_AON_CCU_COMPAT, CLK_OF_DECLARE(bcm281xx_aon_ccu, BCM281XX_DT_AON_CCU_COMPAT,
kona_dt_aon_ccu_setup); kona_dt_aon_ccu_setup);
CLK_OF_DECLARE(bcm11351_hub_ccu, BCM11351_DT_HUB_CCU_COMPAT, CLK_OF_DECLARE(bcm281xx_hub_ccu, BCM281XX_DT_HUB_CCU_COMPAT,
kona_dt_hub_ccu_setup); kona_dt_hub_ccu_setup);
CLK_OF_DECLARE(bcm11351_master_ccu, BCM11351_DT_MASTER_CCU_COMPAT, CLK_OF_DECLARE(bcm281xx_master_ccu, BCM281XX_DT_MASTER_CCU_COMPAT,
kona_dt_master_ccu_setup); kona_dt_master_ccu_setup);
CLK_OF_DECLARE(bcm11351_slave_ccu, BCM11351_DT_SLAVE_CCU_COMPAT, CLK_OF_DECLARE(bcm281xx_slave_ccu, BCM281XX_DT_SLAVE_CCU_COMPAT,
kona_dt_slave_ccu_setup); kona_dt_slave_ccu_setup);