Skip to contentSkip to conversation

dt-bindings: qcom: Fix warning with duplicate dt define

PATCH New Stephen Boyd 2 participants 2 messages Jan 18, 2014 – Jan 27, 2014

Subsystems (4)
Device tree bindings Arm Qualcomm mailing list Common clk Qualcomm clock drivers
lore
Share & tools
lore

Stephen Boyd

author
#0 lore raw

PATCH 1/1 dt-bindings: qcom: Fix warning with duplicate dt define

arch/arm/boot/dts/include/dt-bindings/clock/qcom,mmcc-msm8974.h:60:0:
warning: "RBCPR_CLK_SRC" redefined

Rename this to MMSS_RBCPR_CLK_SRC to avoid conflicts with the RBCPR clock in the gcc header.

Reported-by Bjorn Andersson <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
---
 include/dt-bindings/clock/qcom,mmcc-msm8974.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/dt-bindings/clock/qcom,mmcc-msm8974.h +1 -1
index 04d318d1187a..032ed87ef0f3 100644
@@ -57,7 +57,7 @@
 #define EXTPCLK_CLK_SRC					40
 #define HDMI_CLK_SRC					41
 #define VSYNC_CLK_SRC					42
-#define RBCPR_CLK_SRC					43
+#define MMSS_RBCPR_CLK_SRC				43
 #define CAMSS_CCI_CCI_AHB_CLK				44
 #define CAMSS_CCI_CCI_CLK				45
 #define CAMSS_CSI0_AHB_CLK				46
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#1 lore raw

PATCH 1/1 dt-bindings: qcom: Fix warning with duplicate dt define

Quoting Stephen Boyd (2014-01-17 17:05:19)

Quoted 8 lines

arch/arm/boot/dts/include/dt-bindings/clock/qcom,mmcc-msm8974.h:60:0:
warning: "RBCPR_CLK_SRC" redefined

Rename this to MMSS_RBCPR_CLK_SRC to avoid conflicts with the RBCPR clock in the gcc header.

Reported-by Bjorn Andersson <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>

Thanks for the fix. I've pulled this into part 2 of my pull request.

Regards,
Mike

Quoted 21 lines
---
 include/dt-bindings/clock/qcom,mmcc-msm8974.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/dt-bindings/clock/qcom,mmcc-msm8974.h +1 -1
index 04d318d1187a..032ed87ef0f3 100644
@@ -57,7 +57,7 @@
 #define EXTPCLK_CLK_SRC                                        40
 #define HDMI_CLK_SRC                                   41
 #define VSYNC_CLK_SRC                                  42
-#define RBCPR_CLK_SRC                                  43
+#define MMSS_RBCPR_CLK_SRC                             43
 #define CAMSS_CCI_CCI_AHB_CLK                          44
 #define CAMSS_CCI_CCI_CLK                              45
 #define CAMSS_CSI0_AHB_CLK                             46
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation