Commit 660b94e0 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'ti-clk-for-5.6' of... 

Merge tag 'ti-clk-for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux into clk-ti

Pull TI clk driver updates from Tero Kristo:

 - cam, vpe and sgx clock support for dra7
 - fix gmac main clock for dra7
 - aess clock support for omap5
 - move dra7-atl clock header to correct location
 - fix hidden node name dependency on clkctrl clocks

* tag 'ti-clk-for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux:
  clk: ti: clkctrl: Fix hidden dependency to node name
  clk: ti: add clkctrl data dra7 sgx
  clk: ti: omap5: Add missing AESS clock
  clk: ti: dra7: fix parent for gmac_clkctrl
  clk: ti: dra7: add vpe clkctrl data
  clk: ti: dra7: add cam clkctrl data
  dt-bindings: clock: Move ti-dra7-atl.h to dt-bindings/clock
parents e42617b8 6c309052

Documentation/devicetree/bindings/clock/ti-clkctrl.txt

+8 −3
Original line number Diff line number Diff line
@@ -16,18 +16,23 @@ For more information, please see the Linux clock framework binding at 
Documentation/devicetree/bindings/clock/clock-bindings.txt.



Required properties :

- compatible : shall be "ti,clkctrl"

- compatible : shall be "ti,clkctrl" or a clock domain specific name:

	       "ti,clkctrl-l4-cfg"

	       "ti,clkctrl-l4-per"

	       "ti,clkctrl-l4-secure"

	       "ti,clkctrl-l4-wkup"

- #clock-cells : shall contain 2 with the first entry being the instance

		 offset from the clock domain base and the second being the

		 clock index

- reg : clock registers



Example: Clock controller node on omap 4430:



&cm2 {

	l4per: cm@1400 {

		cm_l4per@0 {

			cm_l4per_clkctrl: clk@20 {

				compatible = "ti,clkctrl";

			cm_l4per_clkctrl: clock@20 {

				compatible = "ti,clkctrl-l4-per", "ti,clkctrl";

				reg = <0x20 0x1b0>;

				#clock-cells = <2>;

			};

Documentation/devicetree/bindings/clock/ti/dra7-atl.txt

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Configuration of ATL instances: 
	- aws : Audio word select signal selection

};



For valid word select signals, see the dt-bindings/clk/ti-dra7-atl.h include

For valid word select signals, see the dt-bindings/clock/ti-dra7-atl.h include

file.



Examples:
@@ -83,7 +83,7 @@ atl: atl@4843c000 { 
	clock-names = "fck";

};



#include <dt-bindings/clk/ti-dra7-atl.h>

#include <dt-bindings/clock/ti-dra7-atl.h>



&atl {

arch/arm/boot/dts/dra7-evm-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 */



#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clk/ti-dra7-atl.h>

#include <dt-bindings/clock/ti-dra7-atl.h>

#include <dt-bindings/input/input.h>



/ {

arch/arm/boot/dts/dra72-evm-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


#include "dra72x.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clk/ti-dra7-atl.h>

#include <dt-bindings/clock/ti-dra7-atl.h>



/ {

	compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7";

arch/arm/boot/dts/dra7xx-clocks.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -1734,6 +1734,20 @@ 
		};

	};



	gpu_cm: gpu-cm@1200 {

		compatible = "ti,omap4-cm";

		reg = <0x1200 0x100>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0x1200 0x100>;



		gpu_clkctrl: gpu-clkctrl@20 {

			compatible = "ti,clkctrl";

			reg = <0x20 0x4>;

			#clock-cells = <2>;

		};

	};



	l3init_cm: l3init-cm@1300 {

		compatible = "ti,omap4-cm";

		reg = <0x1300 0x100>;