diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-02 09:02:11 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-02 09:02:10 -0800 |
| commit | b08731c07cf6d87e2cc3817093203fd009176fef (patch) | |
| tree | e589d37bd7b05aaf3f55bddcc725a54ba4db6a93 | |
| parent | ef10f8e77db7e603ebd79b122a772c8f76f12d65 (diff) | |
| parent | 7511463229ae4a205db1444a0c28877429a28faf (diff) | |
Merge "ARM: dts: msm: Remove clocks associated with GDSC for MSMfalcon/Trition"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmfalcon.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmtriton.dtsi | 5 | ||||
| -rw-r--r-- | include/linux/clk/msm-clk-provider.h | 4 | ||||
| -rw-r--r-- | include/linux/clk/msm-clk.h | 7 |
4 files changed, 8 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/qcom/msmfalcon.dtsi b/arch/arm/boot/dts/qcom/msmfalcon.dtsi index 79cdc2b701e1..6ef443c4de11 100644 --- a/arch/arm/boot/dts/qcom/msmfalcon.dtsi +++ b/arch/arm/boot/dts/qcom/msmfalcon.dtsi @@ -1293,8 +1293,6 @@ #include "msm-gdsc-falcon.dtsi" &gdsc_usb30 { - clock-names = "core_clk"; - clocks = <&clock_gcc GCC_USB30_MASTER_CLK>; status = "ok"; }; @@ -1351,9 +1349,6 @@ }; &gdsc_mdss { - clock-names = "bus_clk", "rot_clk"; - clocks = <&clock_mmss MMSS_MDSS_AXI_CLK>, - <&clock_mmss MMSS_MDSS_ROT_CLK>; proxy-supply = <&gdsc_mdss>; qcom,proxy-consumer-enable; status = "ok"; diff --git a/arch/arm/boot/dts/qcom/msmtriton.dtsi b/arch/arm/boot/dts/qcom/msmtriton.dtsi index e7416ebb8f58..2a22772c8d1d 100644 --- a/arch/arm/boot/dts/qcom/msmtriton.dtsi +++ b/arch/arm/boot/dts/qcom/msmtriton.dtsi @@ -787,8 +787,6 @@ #include "msmfalcon-common.dtsi" &gdsc_usb30 { - clock-names = "core_clk"; - clocks = <&clock_gcc GCC_USB30_MASTER_CLK>; status = "ok"; }; @@ -837,9 +835,6 @@ }; &gdsc_mdss { - clock-names = "bus_clk", "rot_clk"; - clocks = <&clock_mmss MMSS_MDSS_AXI_CLK>, - <&clock_mmss MMSS_MDSS_ROT_CLK>; proxy-supply = <&gdsc_mdss>; qcom,proxy-consumer-enable; status = "ok"; diff --git a/include/linux/clk/msm-clk-provider.h b/include/linux/clk/msm-clk-provider.h index a09ce5c3b156..2fa8916ad356 100644 --- a/include/linux/clk/msm-clk-provider.h +++ b/include/linux/clk/msm-clk-provider.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2007 Google, Inc. - * Copyright (c) 2007-2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2007-2016, The Linux Foundation. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -29,6 +29,7 @@ #include <linux/seq_file.h> #include <linux/clk/msm-clk.h> +#if defined(CONFIG_COMMON_CLK_MSM) /* * Bit manipulation macros */ @@ -265,4 +266,5 @@ static inline const char *clk_name(struct clk *c) return "(null)"; return c->dbg_name; }; +#endif /* CONFIG_COMMON_CLK_MSM */ #endif diff --git a/include/linux/clk/msm-clk.h b/include/linux/clk/msm-clk.h index 964909d25021..8455fd776246 100644 --- a/include/linux/clk/msm-clk.h +++ b/include/linux/clk/msm-clk.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2012-2015 The Linux Foundation. All rights reserved. +/* Copyright (c) 2009, 2012-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -23,6 +23,9 @@ enum branch_mem_flags { CLKFLAG_PERIPH_OFF_SET, CLKFLAG_PERIPH_OFF_CLEAR, }; + +#include <linux/clk.h> + #elif defined(CONFIG_COMMON_CLK_MSM) #define CLKFLAG_INVERT 0x00000001 #define CLKFLAG_NOINVERT 0x00000002 @@ -42,7 +45,6 @@ enum branch_mem_flags { #define CLKFLAG_EPROBE_DEFER 0x00010000 #define CLKFLAG_PERIPH_OFF_SET 0x00020000 #define CLKFLAG_PERIPH_OFF_CLEAR 0x00040000 -#endif struct clk_lookup; struct clk; @@ -132,4 +134,5 @@ int msm_clk_notif_register(struct clk *clk, struct notifier_block *nb); int msm_clk_notif_unregister(struct clk *clk, struct notifier_block *nb); +#endif /* CONFIG_COMMON_CLK_MSM */ #endif |