Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17bffc78 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'depends/clk' into next/soc 

From Mike Turquette:
* depends/clk:
  clk: Common clocks implementation for Versatile Express
  clk: Versatile Express clock generators ("osc") driver
  CLK: clk-twl6040: Initial clock driver for OMAP4+ McPDM fclk clock
  clk: fix return value check in sirfsoc_of_clk_init()
  clk: fix return value check in of_fixed_clk_setup()
  clk: ux500: Update sdmmc clock to 100MHz for u8500
  clk: ux500: Support prcmu ape opp voltage clock
  mfd: dbx500: Export prmcu_request_ape_opp_100_voltage
  clk: Don't return negative numbers for unsigned values with !clk
  clk: Fix documentation typos
  clk: Document .is_enabled op
  clk: SPEAr: Vco-pll: Fix compilation warning
parents f86804af bcd6f569

arch/arm/include/asm/hardware/sp810.h

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ 
#define SCCTRL_TIMEREN1SEL_REFCLK	(0 << 17)

#define SCCTRL_TIMEREN1SEL_TIMCLK	(1 << 17)



#define SCCTRL_TIMERENnSEL_SHIFT(n)	(15 + ((n) * 2))



static inline void sysctl_soft_reset(void __iomem *base)

{

	/* switch to slow mode */

drivers/clk/Kconfig

+13 −3
Original line number Diff line number Diff line
@@ -42,10 +42,12 @@ config COMMON_CLK_WM831X 


config COMMON_CLK_VERSATILE

	bool "Clock driver for ARM Reference designs"

	depends on ARCH_INTEGRATOR || ARCH_REALVIEW

	depends on ARCH_INTEGRATOR || ARCH_REALVIEW || ARCH_VEXPRESS

	---help---

          Supports clocking on ARM Reference designs Integrator/AP,

	  Integrator/CP, RealView PB1176, EB, PB11MP and PBX.

          Supports clocking on ARM Reference designs:

	  - Integrator/AP and Integrator/CP

	  - RealView PB1176, EB, PB11MP and PBX

	  - Versatile Express



config COMMON_CLK_MAX77686

	tristate "Clock driver for Maxim 77686 MFD"
@@ -53,4 +55,12 @@ config COMMON_CLK_MAX77686 
	---help---

	  This driver supports Maxim 77686 crystal oscillator clock. 



config CLK_TWL6040

	tristate "External McPDM functional clock from twl6040"

	depends on TWL6040_CORE

	---help---

	  Enable the external functional clock support on OMAP4+ platforms for

	  McPDM. McPDM module is using the external bit clock on the McPDM bus

	  as functional clock.



endmenu

drivers/clk/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -24,3 +24,4 @@ obj-$(CONFIG_ARCH_SUNXI) += clk-sunxi.o 
# Chip specific

obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o

obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o

obj-$(CONFIG_CLK_TWL6040)	+= clk-twl6040.o

drivers/clk/clk-fixed-rate.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ void __init of_fixed_clk_setup(struct device_node *node) 
	of_property_read_string(node, "clock-output-names", &clk_name);



	clk = clk_register_fixed_rate(NULL, clk_name, NULL, CLK_IS_ROOT, rate);

	if (clk)

	if (!IS_ERR(clk))

		of_clk_add_provider(node, of_clk_src_simple_get, clk);

}

EXPORT_SYMBOL_GPL(of_fixed_clk_setup);

drivers/clk/clk-prima2.c

+42 −42
Original line number Diff line number Diff line
@@ -1054,118 +1054,118 @@ void __init sirfsoc_of_clk_init(void) 
	/* These are always available (RTC and 26MHz OSC)*/

	clk = clk_register_fixed_rate(NULL, "rtc", NULL,

		CLK_IS_ROOT, 32768);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk = clk_register_fixed_rate(NULL, "osc", NULL,

		CLK_IS_ROOT, 26000000);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));



	clk = clk_register(NULL, &clk_pll1.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk = clk_register(NULL, &clk_pll2.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk = clk_register(NULL, &clk_pll3.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk = clk_register(NULL, &clk_mem.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk = clk_register(NULL, &clk_sys.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk = clk_register(NULL, &clk_security.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b8030000.security");

	clk = clk_register(NULL, &clk_dsp.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk = clk_register(NULL, &clk_gps.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "a8010000.gps");

	clk = clk_register(NULL, &clk_mf.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk = clk_register(NULL, &clk_io.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "io");

	clk = clk_register(NULL, &clk_cpu.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "cpu");

	clk = clk_register(NULL, &clk_uart0.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b0050000.uart");

	clk = clk_register(NULL, &clk_uart1.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b0060000.uart");

	clk = clk_register(NULL, &clk_uart2.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b0070000.uart");

	clk = clk_register(NULL, &clk_tsc.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b0110000.tsc");

	clk = clk_register(NULL, &clk_i2c0.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b00e0000.i2c");

	clk = clk_register(NULL, &clk_i2c1.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b00f0000.i2c");

	clk = clk_register(NULL, &clk_spi0.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b00d0000.spi");

	clk = clk_register(NULL, &clk_spi1.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b0170000.spi");

	clk = clk_register(NULL, &clk_pwmc.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b0130000.pwm");

	clk = clk_register(NULL, &clk_efuse.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b0140000.efusesys");

	clk = clk_register(NULL, &clk_pulse.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b0150000.pulsec");

	clk = clk_register(NULL, &clk_dmac0.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b00b0000.dma-controller");

	clk = clk_register(NULL, &clk_dmac1.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b0160000.dma-controller");

	clk = clk_register(NULL, &clk_nand.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b0030000.nand");

	clk = clk_register(NULL, &clk_audio.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b0040000.audio");

	clk = clk_register(NULL, &clk_usp0.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b0080000.usp");

	clk = clk_register(NULL, &clk_usp1.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b0090000.usp");

	clk = clk_register(NULL, &clk_usp2.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b00a0000.usp");

	clk = clk_register(NULL, &clk_vip.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b00c0000.vip");

	clk = clk_register(NULL, &clk_gfx.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "98000000.graphics");

	clk = clk_register(NULL, &clk_mm.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "a0000000.multimedia");

	clk = clk_register(NULL, &clk_lcd.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "90010000.display");

	clk = clk_register(NULL, &clk_vpp.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "90020000.vpp");

	clk = clk_register(NULL, &clk_mmc01.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk = clk_register(NULL, &clk_mmc23.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk = clk_register(NULL, &clk_mmc45.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk = clk_register(NULL, &usb_pll_clk_hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk = clk_register(NULL, &clk_usb0.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b00e0000.usb");

	clk = clk_register(NULL, &clk_usb1.hw);

	BUG_ON(!clk);

	BUG_ON(IS_ERR(clk));

	clk_register_clkdev(clk, NULL, "b00f0000.usb");

}