msm: clock: Use empty strings for devices names of unused clocks
NULL pointers in the place of device names act as wildcards that
can cause inadvertent clk_get() matches when multiple clocks in
the table have the same name. clk_get() first looks for a clock
with both a matching name and device. If none are found, it looks
for a clock where just the name matches and the device NULL.
Instead of using a NULL string in the tables for unused clocks,
specify an empty string. This will cause clk_get() to fail and
return an error if an exact match is found, rather than returning
a pointer to a wrong clock.
Change-Id: Ib3793cd52a71bb6b08b88b03dad615165596698b
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-pcom-lookup.c b/arch/arm/mach-msm/clock-pcom-lookup.c
index a98e7f1..200cbfe 100644
--- a/arch/arm/mach-msm/clock-pcom-lookup.c
+++ b/arch/arm/mach-msm/clock-pcom-lookup.c
@@ -149,7 +149,7 @@
CLK_LOOKUP("ebi2_clk", ebi2_clk.c, NULL),
CLK_LOOKUP("ecodec_clk", ecodec_clk.c, NULL),
CLK_LOOKUP("emdh_clk", emdh_clk.c, NULL),
- CLK_LOOKUP("core_clk", gp_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gp_clk.c, ""),
CLK_LOOKUP("core_clk", grp_3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("core_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("icodec_rx_clk", icodec_rx_clk.c, NULL),
@@ -201,7 +201,7 @@
CLK_LOOKUP("ebi1_clk", ebi1_clk.c, NULL),
CLK_LOOKUP("ebi2_clk", ebi2_clk.c, NULL),
CLK_LOOKUP("ecodec_clk", ecodec_clk.c, NULL),
- CLK_LOOKUP("core_clk", gp_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gp_clk.c, ""),
CLK_LOOKUP("core_clk", grp_3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("core_clk", grp_3d_clk.c, "footswitch-pcom.2"),
CLK_LOOKUP("iface_clk", grp_3d_p_clk.c, "kgsl-3d0.0"),
@@ -287,7 +287,7 @@
CLK_LOOKUP("ebi1_clk", ebi1_clk.c, NULL),
CLK_LOOKUP("ebi2_clk", ebi2_clk.c, NULL),
CLK_LOOKUP("ecodec_clk", ecodec_clk.c, NULL),
- CLK_LOOKUP("core_clk", gp_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gp_clk.c, ""),
CLK_LOOKUP("core_clk", grp_3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("core_clk", grp_3d_clk.c, "footswitch-pcom.2"),
CLK_LOOKUP("iface_clk", grp_3d_p_clk.c, "kgsl-3d0.0"),
@@ -354,7 +354,7 @@
CLK_LOOKUP("ebi2_clk", ebi2_clk.c, NULL),
CLK_LOOKUP("ecodec_clk", ecodec_clk.c, NULL),
CLK_LOOKUP("emdh_clk", emdh_clk.c, NULL),
- CLK_LOOKUP("core_clk", gp_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gp_clk.c, ""),
CLK_LOOKUP("core_clk", grp_3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("core_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("icodec_rx_clk", icodec_rx_clk.c, NULL),
@@ -397,8 +397,8 @@
CLK_LOOKUP("vfe_axi_clk", vfe_axi_clk.c, NULL),
CLK_LOOKUP("alt_core_clk", usb_hs2_clk.c, "msm_hsusb_host.0"),
CLK_LOOKUP("iface_clk", usb_hs2_p_clk.c, "msm_hsusb_host.0"),
- CLK_LOOKUP("alt_core_clk", usb_hs3_clk.c, NULL),
- CLK_LOOKUP("iface_clk", usb_hs3_p_clk.c, NULL),
+ CLK_LOOKUP("alt_core_clk", usb_hs3_clk.c, ""),
+ CLK_LOOKUP("iface_clk", usb_hs3_p_clk.c, ""),
CLK_LOOKUP("phy_clk", usb_phy_clk.c, "msm_otg"),
CLK_LOOKUP("ebi1_acpu_clk", ebi_acpu_clk.c, NULL),