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

Commit 64640998 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for-v3.17/omap2-use-dt-clks' of... 

Merge branch 'for-v3.17/omap2-use-dt-clks' of http://github.com/t-kristo/linux-pm into omap-for-v3.17/dt
parents ae28ea88 6a194a6e

Documentation/devicetree/bindings/arm/omap/prcm.txt

0 → 100644
+65 −0
Original line number Diff line number Diff line 
OMAP PRCM bindings



Power Reset and Clock Manager lists the device clocks and clockdomains under

a DT hierarchy. Each TI SoC can have multiple PRCM entities listed for it,

each describing one module and the clock hierarchy under it. see [1] for

documentation about the individual clock/clockdomain nodes.



[1] Documentation/devicetree/bindings/clock/ti/*



Required properties:

- compatible:	Must be one of:

		"ti,am3-prcm"

		"ti,am3-scrm"

		"ti,am4-prcm"

		"ti,am4-scrm"

		"ti,omap2-prcm"

		"ti,omap2-scrm"

		"ti,omap3-prm"

		"ti,omap3-cm"

		"ti,omap3-scrm"

		"ti,omap4-cm1"

		"ti,omap4-prm"

		"ti,omap4-cm2"

		"ti,omap4-scrm"

		"ti,omap5-prm"

		"ti,omap5-cm-core-aon"

		"ti,omap5-scrm"

		"ti,omap5-cm-core"

		"ti,dra7-prm"

		"ti,dra7-cm-core-aon"

		"ti,dra7-cm-core"

- reg:		Contains PRCM module register address range

		(base address and length)

- clocks:	clocks for this module

- clockdomains:	clockdomains for this module



Example:



cm: cm@48004000 {

	compatible = "ti,omap3-cm";

	reg = <0x48004000 0x4000>;



	cm_clocks: clocks {

		#address-cells = <1>;

		#size-cells = <0>;

	};



	cm_clockdomains: clockdomains {

	};

}



&cm_clocks {

	omap2_32k_fck: omap_32k_fck {

		#clock-cells = <0>;

		compatible = "fixed-clock";

		clock-frequency = <32768>;

	};

};



&cm_clockdomains {

	core_l3_clkdm: core_l3_clkdm {

		compatible = "ti,clockdomain";

		clocks = <&sdrc_ick>;

	};

};

arch/arm/boot/dts/omap2420.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -182,3 +182,6 @@ 
&i2c2 {

	compatible = "ti,omap2420-i2c";

};



/include/ "omap24xx-clocks.dtsi"

/include/ "omap2420-clocks.dtsi"

arch/arm/boot/dts/omap2430.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -288,3 +288,6 @@ 
&i2c2 {

	compatible = "ti,omap2430-i2c";

};



/include/ "omap24xx-clocks.dtsi"

/include/ "omap2430-clocks.dtsi"

arch/arm/mach-omap2/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -174,13 +174,11 @@ obj-$(CONFIG_SOC_DRA7XX) += clockdomains7xx_data.o 


# Clock framework

obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_sys.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpllcore.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_virt_prcm_set.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_apll.o clkt2xxx_osc.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_apll.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpll.o clkt_iclk.o

obj-$(CONFIG_SOC_OMAP2420)		+= cclock2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o cclock2430_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o clkt34xx_dpll3m2.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o clock36xx.o

arch/arm/mach-omap2/cclock2420_data.c

deleted100644 → 0
+0 −1931

File deleted.

Preview size limit exceeded, changes collapsed.