aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-05 16:44:27 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-05 16:44:27 -0400
commit9f800363bb0ea459e15bef0928a72c88d374e489 (patch)
tree13a6b4165d3e2ba18e88e5103437f74e84e0838d /drivers/clk
parent2d1eb87ae1e6f3999e77989fd2f831b134270787 (diff)
parentcb46a256a78225817945cd52068d61d5126c236e (diff)
Merge tag 'fixes-non-critical-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC non-critical bug fixes from Arnd Bergmann: "Lots of isolated bug fixes that were not found to be important enough to be submitted before the merge window or backported into stable kernels. The vast majority of these came out of Arnd's randconfig testing and just prevents running into build-time bugs in configurations that we do not care about in practice" * tag 'fixes-non-critical-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (75 commits) ARM: at91: fix a typo ARM: moxart: fix CPU selection ARM: tegra: fix board DT pinmux setup ARM: nspire: Fix compiler warning IXP4xx: Fix DMA masks. Revert "ARM: ixp4xx: Make dma_set_coherent_mask common, correct implementation" IXP4xx: Fix Goramo Multilink GPIO conversion. Revert "ARM: ixp4xx: fix gpio rework" ARM: tegra: make debug_ll code build for ARMv6 ARM: sunxi: fix build for THUMB2_KERNEL ARM: exynos: add missing include of linux/module.h ARM: exynos: fix l2x0 saved regs handling ARM: samsung: select CRC32 for SAMSUNG_PM_CHECK ARM: samsung: select ATAGS where necessary ARM: samsung: fix SAMSUNG_PM_DEBUG Kconfig logic ARM: samsung: allow serial driver to be disabled ARM: s5pv210: enable IDE support in MACH_TORBRECK ARM: s5p64x0: fix building with only one soc type ARM: s3c64xx: select power domains only when used ARM: s3c64xx: MACH_SMDK6400 needs HSMMC1 ...
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/ti/clk-44xx.c1
-rw-r--r--drivers/clk/ti/clk-54xx.c1
-rw-r--r--drivers/clk/ti/clk-7xx.c1
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/clk/ti/clk-44xx.c b/drivers/clk/ti/clk-44xx.c
index ae00218b5da3..02517a8206bd 100644
--- a/drivers/clk/ti/clk-44xx.c
+++ b/drivers/clk/ti/clk-44xx.c
@@ -222,7 +222,6 @@ static struct ti_dt_clk omap44xx_clks[] = {
222 DT_CLK(NULL, "auxclk5_src_ck", "auxclk5_src_ck"), 222 DT_CLK(NULL, "auxclk5_src_ck", "auxclk5_src_ck"),
223 DT_CLK(NULL, "auxclk5_ck", "auxclk5_ck"), 223 DT_CLK(NULL, "auxclk5_ck", "auxclk5_ck"),
224 DT_CLK(NULL, "auxclkreq5_ck", "auxclkreq5_ck"), 224 DT_CLK(NULL, "auxclkreq5_ck", "auxclkreq5_ck"),
225 DT_CLK("50000000.gpmc", "fck", "dummy_ck"),
226 DT_CLK("omap_i2c.1", "ick", "dummy_ck"), 225 DT_CLK("omap_i2c.1", "ick", "dummy_ck"),
227 DT_CLK("omap_i2c.2", "ick", "dummy_ck"), 226 DT_CLK("omap_i2c.2", "ick", "dummy_ck"),
228 DT_CLK("omap_i2c.3", "ick", "dummy_ck"), 227 DT_CLK("omap_i2c.3", "ick", "dummy_ck"),
diff --git a/drivers/clk/ti/clk-54xx.c b/drivers/clk/ti/clk-54xx.c
index 0ef9f581286b..08f3d1b915b3 100644
--- a/drivers/clk/ti/clk-54xx.c
+++ b/drivers/clk/ti/clk-54xx.c
@@ -182,7 +182,6 @@ static struct ti_dt_clk omap54xx_clks[] = {
182 DT_CLK(NULL, "auxclk3_src_ck", "auxclk3_src_ck"), 182 DT_CLK(NULL, "auxclk3_src_ck", "auxclk3_src_ck"),
183 DT_CLK(NULL, "auxclk3_ck", "auxclk3_ck"), 183 DT_CLK(NULL, "auxclk3_ck", "auxclk3_ck"),
184 DT_CLK(NULL, "auxclkreq3_ck", "auxclkreq3_ck"), 184 DT_CLK(NULL, "auxclkreq3_ck", "auxclkreq3_ck"),
185 DT_CLK(NULL, "gpmc_ck", "dummy_ck"),
186 DT_CLK("omap_i2c.1", "ick", "dummy_ck"), 185 DT_CLK("omap_i2c.1", "ick", "dummy_ck"),
187 DT_CLK("omap_i2c.2", "ick", "dummy_ck"), 186 DT_CLK("omap_i2c.2", "ick", "dummy_ck"),
188 DT_CLK("omap_i2c.3", "ick", "dummy_ck"), 187 DT_CLK("omap_i2c.3", "ick", "dummy_ck"),
diff --git a/drivers/clk/ti/clk-7xx.c b/drivers/clk/ti/clk-7xx.c
index 9977653f2d63..f7e40734c819 100644
--- a/drivers/clk/ti/clk-7xx.c
+++ b/drivers/clk/ti/clk-7xx.c
@@ -262,7 +262,6 @@ static struct ti_dt_clk dra7xx_clks[] = {
262 DT_CLK(NULL, "vip1_gclk_mux", "vip1_gclk_mux"), 262 DT_CLK(NULL, "vip1_gclk_mux", "vip1_gclk_mux"),
263 DT_CLK(NULL, "vip2_gclk_mux", "vip2_gclk_mux"), 263 DT_CLK(NULL, "vip2_gclk_mux", "vip2_gclk_mux"),
264 DT_CLK(NULL, "vip3_gclk_mux", "vip3_gclk_mux"), 264 DT_CLK(NULL, "vip3_gclk_mux", "vip3_gclk_mux"),
265 DT_CLK(NULL, "gpmc_ck", "dummy_ck"),
266 DT_CLK("omap_i2c.1", "ick", "dummy_ck"), 265 DT_CLK("omap_i2c.1", "ick", "dummy_ck"),
267 DT_CLK("omap_i2c.2", "ick", "dummy_ck"), 266 DT_CLK("omap_i2c.2", "ick", "dummy_ck"),
268 DT_CLK("omap_i2c.3", "ick", "dummy_ck"), 267 DT_CLK("omap_i2c.3", "ick", "dummy_ck"),