diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/cros5250-common.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4412-odroidx.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4412-trats2.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5250.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5420.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/include/asm/clkdev.h | 2 | ||||
-rw-r--r-- | arch/blackfin/include/asm/clkdev.h | 2 | ||||
-rw-r--r-- | arch/mips/include/asm/clkdev.h | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/clkdev.h | 2 |
9 files changed, 16 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi index 9b186ac06c8b..0c30ca2dd152 100644 --- a/arch/arm/boot/dts/cros5250-common.dtsi +++ b/arch/arm/boot/dts/cros5250-common.dtsi | |||
@@ -48,6 +48,7 @@ | |||
48 | pinctrl-0 = <&max77686_irq>; | 48 | pinctrl-0 = <&max77686_irq>; |
49 | wakeup-source; | 49 | wakeup-source; |
50 | reg = <0x09>; | 50 | reg = <0x09>; |
51 | #clock-cells = <1>; | ||
51 | 52 | ||
52 | voltage-regulators { | 53 | voltage-regulators { |
53 | ldo1_reg: LDO1 { | 54 | ldo1_reg: LDO1 { |
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts index 46c678ee119c..8d337cc8f4e6 100644 --- a/arch/arm/boot/dts/exynos4412-odroidx.dts +++ b/arch/arm/boot/dts/exynos4412-odroidx.dts | |||
@@ -119,6 +119,7 @@ | |||
119 | max77686: pmic@09 { | 119 | max77686: pmic@09 { |
120 | compatible = "maxim,max77686"; | 120 | compatible = "maxim,max77686"; |
121 | reg = <0x09>; | 121 | reg = <0x09>; |
122 | #clock-cells = <1>; | ||
122 | 123 | ||
123 | voltage-regulators { | 124 | voltage-regulators { |
124 | ldo1_reg: LDO1 { | 125 | ldo1_reg: LDO1 { |
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts index fb7b9ae5f399..c21a8b916bf1 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts | |||
@@ -139,6 +139,7 @@ | |||
139 | interrupt-parent = <&gpx0>; | 139 | interrupt-parent = <&gpx0>; |
140 | interrupts = <7 0>; | 140 | interrupts = <7 0>; |
141 | reg = <0x09>; | 141 | reg = <0x09>; |
142 | #clock-cells = <1>; | ||
142 | 143 | ||
143 | voltage-regulators { | 144 | voltage-regulators { |
144 | ldo1_reg: ldo1 { | 145 | ldo1_reg: ldo1 { |
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 9db5047812f3..c70843fe1e28 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi | |||
@@ -88,6 +88,8 @@ | |||
88 | compatible = "samsung,exynos5250-audss-clock"; | 88 | compatible = "samsung,exynos5250-audss-clock"; |
89 | reg = <0x03810000 0x0C>; | 89 | reg = <0x03810000 0x0C>; |
90 | #clock-cells = <1>; | 90 | #clock-cells = <1>; |
91 | clocks = <&clock 1>, <&clock 7>, <&clock 138>, <&clock 160>; | ||
92 | clock-names = "pll_ref", "pll_in", "sclk_audio", "sclk_pcm_in"; | ||
91 | }; | 93 | }; |
92 | 94 | ||
93 | timer { | 95 | timer { |
@@ -559,7 +561,7 @@ | |||
559 | compatible = "arm,pl330", "arm,primecell"; | 561 | compatible = "arm,pl330", "arm,primecell"; |
560 | reg = <0x10800000 0x1000>; | 562 | reg = <0x10800000 0x1000>; |
561 | interrupts = <0 33 0>; | 563 | interrupts = <0 33 0>; |
562 | clocks = <&clock 271>; | 564 | clocks = <&clock 346>; |
563 | clock-names = "apb_pclk"; | 565 | clock-names = "apb_pclk"; |
564 | #dma-cells = <1>; | 566 | #dma-cells = <1>; |
565 | #dma-channels = <8>; | 567 | #dma-channels = <8>; |
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 09aa06cb3d3a..25a1120d88a5 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi | |||
@@ -76,8 +76,8 @@ | |||
76 | compatible = "samsung,exynos5420-audss-clock"; | 76 | compatible = "samsung,exynos5420-audss-clock"; |
77 | reg = <0x03810000 0x0C>; | 77 | reg = <0x03810000 0x0C>; |
78 | #clock-cells = <1>; | 78 | #clock-cells = <1>; |
79 | clocks = <&clock 148>; | 79 | clocks = <&clock 1>, <&clock 5>, <&clock 148>, <&clock 149>; |
80 | clock-names = "sclk_audio"; | 80 | clock-names = "pll_ref", "pll_in", "sclk_audio", "sclk_pcm_in"; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | codec@11000000 { | 83 | codec@11000000 { |
diff --git a/arch/arm/include/asm/clkdev.h b/arch/arm/include/asm/clkdev.h index 80751c15c300..4e8a4b27d7c7 100644 --- a/arch/arm/include/asm/clkdev.h +++ b/arch/arm/include/asm/clkdev.h | |||
@@ -14,12 +14,14 @@ | |||
14 | 14 | ||
15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
16 | 16 | ||
17 | #ifndef CONFIG_COMMON_CLK | ||
17 | #ifdef CONFIG_HAVE_MACH_CLKDEV | 18 | #ifdef CONFIG_HAVE_MACH_CLKDEV |
18 | #include <mach/clkdev.h> | 19 | #include <mach/clkdev.h> |
19 | #else | 20 | #else |
20 | #define __clk_get(clk) ({ 1; }) | 21 | #define __clk_get(clk) ({ 1; }) |
21 | #define __clk_put(clk) do { } while (0) | 22 | #define __clk_put(clk) do { } while (0) |
22 | #endif | 23 | #endif |
24 | #endif | ||
23 | 25 | ||
24 | static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) | 26 | static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) |
25 | { | 27 | { |
diff --git a/arch/blackfin/include/asm/clkdev.h b/arch/blackfin/include/asm/clkdev.h index 9053beda8c50..7ac2436856a5 100644 --- a/arch/blackfin/include/asm/clkdev.h +++ b/arch/blackfin/include/asm/clkdev.h | |||
@@ -8,7 +8,9 @@ static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) | |||
8 | return kzalloc(size, GFP_KERNEL); | 8 | return kzalloc(size, GFP_KERNEL); |
9 | } | 9 | } |
10 | 10 | ||
11 | #ifndef CONFIG_COMMON_CLK | ||
11 | #define __clk_put(clk) | 12 | #define __clk_put(clk) |
12 | #define __clk_get(clk) ({ 1; }) | 13 | #define __clk_get(clk) ({ 1; }) |
14 | #endif | ||
13 | 15 | ||
14 | #endif | 16 | #endif |
diff --git a/arch/mips/include/asm/clkdev.h b/arch/mips/include/asm/clkdev.h index 262475414e5f..1b3ad7b09dc1 100644 --- a/arch/mips/include/asm/clkdev.h +++ b/arch/mips/include/asm/clkdev.h | |||
@@ -14,8 +14,10 @@ | |||
14 | 14 | ||
15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
16 | 16 | ||
17 | #ifndef CONFIG_COMMON_CLK | ||
17 | #define __clk_get(clk) ({ 1; }) | 18 | #define __clk_get(clk) ({ 1; }) |
18 | #define __clk_put(clk) do { } while (0) | 19 | #define __clk_put(clk) do { } while (0) |
20 | #endif | ||
19 | 21 | ||
20 | static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) | 22 | static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) |
21 | { | 23 | { |
diff --git a/arch/sh/include/asm/clkdev.h b/arch/sh/include/asm/clkdev.h index 6ba91868201c..c41901465fb0 100644 --- a/arch/sh/include/asm/clkdev.h +++ b/arch/sh/include/asm/clkdev.h | |||
@@ -25,7 +25,9 @@ static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) | |||
25 | return kzalloc(size, GFP_KERNEL); | 25 | return kzalloc(size, GFP_KERNEL); |
26 | } | 26 | } |
27 | 27 | ||
28 | #ifndef CONFIG_COMMON_CLK | ||
28 | #define __clk_put(clk) | 29 | #define __clk_put(clk) |
29 | #define __clk_get(clk) ({ 1; }) | 30 | #define __clk_get(clk) ({ 1; }) |
31 | #endif | ||
30 | 32 | ||
31 | #endif /* __CLKDEV_H__ */ | 33 | #endif /* __CLKDEV_H__ */ |