Commit f2c73464 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC cleanups from Olof Johansson:
 "This is the branch where we usually queue up cleanup efforts, moving
  drivers out of the architecture directory, header file restructuring,
  etc.  Sometimes they tangle with new development so it's hard to keep
  it strictly to cleanups.

  Some of the things included in this branch are:

   * Atmel SAMA5 conversion to common clock
   * Reset framework conversion for tegra platforms
    - Some of this depends on tegra clock driver reworks that are shared
      with Mike Turquette's clk tree.
   * Tegra DMA refactoring, which are shared branches with the DMA tree.
   * Removal of some header files on exynos to prepare for
     multiplatform"

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (169 commits)
  ARM: mvebu: move Armada 370/XP specific definitions to armada-370-xp.h
  ARM: mvebu: remove prototypes of non-existing functions from common.h
  ARM: mvebu: move ARMADA_XP_MAX_CPUS to armada-370-xp.h
  serial: sh-sci: Rework baud rate calculation
  serial: sh-sci: Compute overrun_bit without using baud rate algo
  serial: sh-sci: Remove unused GPIO request code
  serial: sh-sci: Move overrun_bit and error_mask fields out of pdata
  serial: sh-sci: Support resources passed through platform resources
  serial: sh-sci: Don't check IRQ in verify port operation
  serial: sh-sci: Set the UPF_FIXED_PORT flag
  serial: sh-sci: Remove duplicate interrupt check in verify port op
  serial: sh-sci: Simplify baud rate calculation algorithms
  serial: sh-sci: Remove baud rate calculation algorithm 5
  serial: sh-sci: Sort headers alphabetically
  ARM: EXYNOS: Kill exynos_pm_late_initcall()
  ARM: EXYNOS: Consolidate selection of PM_GENERIC_DOMAINS for Exynos4
  ARM: at91: switch Calao QIL-A9260 board to DT
  clk: at91: fix pmc_clk_ids data type attriubte
  PM / devfreq: use inclusion <mach/map.h> instead of <plat/map-s5p.h>
  ARM: EXYNOS: remove <mach/regs-clock.h> for exynos
  ...
parents 93abdb77 273c2279

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
- compatible : Should contain "nvidia,tegra<chip>-pmc".

- reg : Offset and length of the register set for the device

- clocks : Must contain an entry for each entry in clock-names.

  See ../clocks/clock-bindings.txt for details.

- clock-names : Must include the following entries:

  "pclk" (The Tegra clock of that name),

  "clk32k_in" (The 32KHz clock input to Tegra).

Documentation/devicetree/bindings/clock/at91-clock.txt

0 → 100644
+339 −0
Original line number Diff line number Diff line 
Device Tree Clock bindings for arch-at91



This binding uses the common clock binding[1].



[1] Documentation/devicetree/bindings/clock/clock-bindings.txt



Required properties:

- compatible : shall be one of the following:

	"atmel,at91rm9200-pmc" or

	"atmel,at91sam9g45-pmc" or

	"atmel,at91sam9n12-pmc" or

	"atmel,at91sam9x5-pmc" or

	"atmel,sama5d3-pmc":

		at91 PMC (Power Management Controller)

		All at91 specific clocks (clocks defined below) must be child

		node of the PMC node.



	"atmel,at91rm9200-clk-main":

		at91 main oscillator



	"atmel,at91rm9200-clk-master" or

	"atmel,at91sam9x5-clk-master":

		at91 master clock



	"atmel,at91sam9x5-clk-peripheral" or

	"atmel,at91rm9200-clk-peripheral":

		at91 peripheral clocks



	"atmel,at91rm9200-clk-pll" or

	"atmel,at91sam9g45-clk-pll" or

	"atmel,at91sam9g20-clk-pllb" or

	"atmel,sama5d3-clk-pll":

		at91 pll clocks



	"atmel,at91sam9x5-clk-plldiv":

		at91 plla divisor



	"atmel,at91rm9200-clk-programmable" or

	"atmel,at91sam9g45-clk-programmable" or

	"atmel,at91sam9x5-clk-programmable":

		at91 programmable clocks



	"atmel,at91sam9x5-clk-smd":

		at91 SMD (Soft Modem) clock



	"atmel,at91rm9200-clk-system":

		at91 system clocks



	"atmel,at91rm9200-clk-usb" or

	"atmel,at91sam9x5-clk-usb" or

	"atmel,at91sam9n12-clk-usb":

		at91 usb clock



	"atmel,at91sam9x5-clk-utmi":

		at91 utmi clock



Required properties for PMC node:

- reg : defines the IO memory reserved for the PMC.

- #size-cells : shall be 0 (reg is used to encode clk id).

- #address-cells : shall be 1 (reg is used to encode clk id).

- interrupts : shall be set to PMC interrupt line.

- interrupt-controller : tell that the PMC is an interrupt controller.

- #interrupt-cells : must be set to 1. The first cell encodes the interrupt id,

	and reflect the bit position in the PMC_ER/DR/SR registers.

	You can use the dt macros defined in dt-bindings/clk/at91.h.

	0 (AT91_PMC_MOSCS) -> main oscillator ready

	1 (AT91_PMC_LOCKA) -> PLL A ready

	2 (AT91_PMC_LOCKB) -> PLL B ready

	3 (AT91_PMC_MCKRDY) -> master clock ready

	6 (AT91_PMC_LOCKU) -> UTMI PLL clock ready

	8 .. 15 (AT91_PMC_PCKRDY(id)) -> programmable clock ready

	16 (AT91_PMC_MOSCSELS) -> main oscillator selected

	17 (AT91_PMC_MOSCRCS) -> RC main oscillator stabilized

	18 (AT91_PMC_CFDEV) -> clock failure detected



For example:

	pmc: pmc@fffffc00 {

		compatible = "atmel,sama5d3-pmc";

		interrupts = <1 4 7>;

		interrupt-controller;

		#interrupt-cells = <2>;

		#size-cells = <0>;

		#address-cells = <1>;



		/* put at91 clocks here */

	};



Required properties for main clock:

- interrupt-parent : must reference the PMC node.

- interrupts : shall be set to "<0>".

- #clock-cells : from common clock binding; shall be set to 0.

- clocks (optional if clock-frequency is provided) : shall be the slow clock

	phandle. This clock is used to calculate the main clock rate if

	"clock-frequency" is not provided.

- clock-frequency : the main oscillator frequency.Prefer the use of

	"clock-frequency" over automatic clock rate calculation.



For example:

	main: mainck {

		compatible = "atmel,at91rm9200-clk-main";

		interrupt-parent = <&pmc>;

		interrupts = <0>;

		#clock-cells = <0>;

		clocks = <&ck32k>;

		clock-frequency = <18432000>;

	};



Required properties for master clock:

- interrupt-parent : must reference the PMC node.

- interrupts : shall be set to "<3>".

- #clock-cells : from common clock binding; shall be set to 0.

- clocks : shall be the master clock sources (see atmel datasheet) phandles.

	e.g. "<&ck32k>, <&main>, <&plla>, <&pllb>".

- atmel,clk-output-range : minimum and maximum clock frequency (two u32

			   fields).

	   e.g. output = <0 133000000>; <=> 0 to 133MHz.

- atmel,clk-divisors : master clock divisors table (four u32 fields).

		0 <=> reserved value.

		e.g. divisors = <1 2 4 6>;

- atmel,master-clk-have-div3-pres : some SoC use the reserved value 7 in the

				    PRES field as CLOCK_DIV3 (e.g sam9x5).



For example:

	mck: mck {

		compatible = "atmel,at91rm9200-clk-master";

		interrupt-parent = <&pmc>;

		interrupts = <3>;

		#clock-cells = <0>;

		atmel,clk-output-range = <0 133000000>;

		atmel,clk-divisors = <1 2 4 0>;

	};



Required properties for peripheral clocks:

- #size-cells : shall be 0 (reg is used to encode clk id).

- #address-cells : shall be 1 (reg is used to encode clk id).

- clocks : shall be the master clock phandle.

	e.g. clocks = <&mck>;

- name: device tree node describing a specific system clock.

	* #clock-cells : from common clock binding; shall be set to 0.

	* reg: peripheral id. See Atmel's datasheets to get a full

	  list of peripheral ids.

	* atmel,clk-output-range : minimum and maximum clock frequency

	  (two u32 fields). Only valid on at91sam9x5-clk-peripheral

	  compatible IPs.



For example:

	periph: periphck {

		compatible = "atmel,at91sam9x5-clk-peripheral";

		#size-cells = <0>;

		#address-cells = <1>;

		clocks = <&mck>;



		ssc0_clk {

			#clock-cells = <0>;

			reg = <2>;

			atmel,clk-output-range = <0 133000000>;

		};



		usart0_clk {

			#clock-cells = <0>;

			reg = <3>;

			atmel,clk-output-range = <0 66000000>;

		};

	};





Required properties for pll clocks:

- interrupt-parent : must reference the PMC node.

- interrupts : shall be set to "<1>".

- #clock-cells : from common clock binding; shall be set to 0.

- clocks : shall be the main clock phandle.

- reg : pll id.

	0 -> PLL A

	1 -> PLL B

- atmel,clk-input-range : minimum and maximum source clock frequency (two u32

			  fields).

	  e.g. input = <1 32000000>; <=> 1 to 32MHz.

- #atmel,pll-clk-output-range-cells : number of cells reserved for pll output

				      range description. Sould be set to 2, 3

				      or 4.

	* 1st and 2nd cells represent the frequency range (min-max).

	* 3rd cell is optional and represents the OUT field value for the given

	  range.

	* 4th cell is optional and represents the ICPLL field (PLLICPR

	  register)

- atmel,pll-clk-output-ranges : pll output frequency ranges + optional parameter

				depending on #atmel,pll-output-range-cells

				property value.



For example:

	plla: pllack {

		compatible = "atmel,at91sam9g45-clk-pll";

		interrupt-parent = <&pmc>;

		interrupts = <1>;

		#clock-cells = <0>;

		clocks = <&main>;

		reg = <0>;

		atmel,clk-input-range = <2000000 32000000>;

		#atmel,pll-clk-output-range-cells = <4>;

		atmel,pll-clk-output-ranges = <74500000 800000000 0 0

					       69500000 750000000 1 0

					       64500000 700000000 2 0

					       59500000 650000000 3 0

					       54500000 600000000 0 1

					       49500000 550000000 1 1

					       44500000 500000000 2 1

					       40000000 450000000 3 1>;

	};



Required properties for plldiv clocks (plldiv = pll / 2):

- #clock-cells : from common clock binding; shall be set to 0.

- clocks : shall be the plla clock phandle.



The pll divisor is equal to 2 and cannot be changed.



For example:

	plladiv: plladivck {

		compatible = "atmel,at91sam9x5-clk-plldiv";

		#clock-cells = <0>;

		clocks = <&plla>;

	};



Required properties for programmable clocks:

- interrupt-parent : must reference the PMC node.

- #size-cells : shall be 0 (reg is used to encode clk id).

- #address-cells : shall be 1 (reg is used to encode clk id).

- clocks : shall be the programmable clock source phandles.

	e.g. clocks = <&clk32k>, <&main>, <&plla>, <&pllb>;

- name: device tree node describing a specific prog clock.

	* #clock-cells : from common clock binding; shall be set to 0.

	* reg : programmable clock id (register offset from  PCKx

			 register).

	* interrupts : shall be set to "<(8 + id)>".



For example:

	prog: progck {

		compatible = "atmel,at91sam9g45-clk-programmable";

		#size-cells = <0>;

		#address-cells = <1>;

		interrupt-parent = <&pmc>;

		clocks = <&clk32k>, <&main>, <&plladiv>, <&utmi>, <&mck>;



		prog0 {

			#clock-cells = <0>;

			reg = <0>;

			interrupts = <8>;

		};



		prog1 {

			#clock-cells = <0>;

			reg = <1>;

			interrupts = <9>;

		};

	};





Required properties for smd clock:

- #clock-cells : from common clock binding; shall be set to 0.

- clocks : shall be the smd clock source phandles.

	e.g. clocks = <&plladiv>, <&utmi>;



For example:

	smd: smdck {

		compatible = "atmel,at91sam9x5-clk-smd";

		#clock-cells = <0>;

		clocks = <&plladiv>, <&utmi>;

	};



Required properties for system clocks:

- #size-cells : shall be 0 (reg is used to encode clk id).

- #address-cells : shall be 1 (reg is used to encode clk id).

- name: device tree node describing a specific system clock.

	* #clock-cells : from common clock binding; shall be set to 0.

	* reg: system clock id (bit position in SCER/SCDR/SCSR registers).

	      See Atmel's datasheet to get a full list of system clock ids.



For example:

	system: systemck {

		compatible = "atmel,at91rm9200-clk-system";

		#address-cells = <1>;

		#size-cells = <0>;



		ddrck {

			#clock-cells = <0>;

			reg = <2>;

			clocks = <&mck>;

		};



		uhpck {

			#clock-cells = <0>;

			reg = <6>;

			clocks = <&usb>;

		};



		udpck {

			#clock-cells = <0>;

			reg = <7>;

			clocks = <&usb>;

		};

	};





Required properties for usb clock:

- #clock-cells : from common clock binding; shall be set to 0.

- clocks : shall be the smd clock source phandles.

	e.g. clocks = <&pllb>;

- atmel,clk-divisors (only available for "atmel,at91rm9200-clk-usb"):

	usb clock divisor table.

	e.g. divisors = <1 2 4 0>;



For example:

	usb: usbck {

		compatible = "atmel,at91sam9x5-clk-usb";

		#clock-cells = <0>;

		clocks = <&plladiv>, <&utmi>;

	};



	usb: usbck {

		compatible = "atmel,at91rm9200-clk-usb";

		#clock-cells = <0>;

		clocks = <&pllb>;

		atmel,clk-divisors = <1 2 4 0>;

	};





Required properties for utmi clock:

- interrupt-parent : must reference the PMC node.

- interrupts : shall be set to "<AT91_PMC_LOCKU IRQ_TYPE_LEVEL_HIGH>".

- #clock-cells : from common clock binding; shall be set to 0.

- clocks : shall be the main clock source phandle.



For example:

	utmi: utmick {

		compatible = "atmel,at91sam9x5-clk-utmi";

		interrupt-parent = <&pmc>;

		interrupts = <AT91_PMC_LOCKU IRQ_TYPE_LEVEL_HIGH>;

		#clock-cells = <0>;

		clocks = <&main>;

	};

Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ Required properties : 
  In clock consumers, this cell represents the clock ID exposed by the

  CAR. The assignments may be found in header file

  <dt-bindings/clock/tegra114-car.h>.

- #reset-cells : Should be 1.

  In clock consumers, this cell represents the bit number in the CAR's

  array of CLK_RST_CONTROLLER_RST_DEVICES_* registers.



Example SoC include file:
@@ -23,6 +26,7 @@ Example SoC include file: 
		compatible = "nvidia,tegra114-car";

		reg = <0x60006000 0x1000>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	usb@c5004000 {

Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt

0 → 100644
+63 −0
Original line number Diff line number Diff line 
NVIDIA Tegra124 Clock And Reset Controller



This binding uses the common clock binding:

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



The CAR (Clock And Reset) Controller on Tegra is the HW module responsible

for muxing and gating Tegra's clocks, and setting their rates.



Required properties :

- compatible : Should be "nvidia,tegra124-car"

- reg : Should contain CAR registers location and length

- clocks : Should contain phandle and clock specifiers for two clocks:

  the 32 KHz "32k_in", and the board-specific oscillator "osc".

- #clock-cells : Should be 1.

  In clock consumers, this cell represents the clock ID exposed by the

  CAR. The assignments may be found in header file

  <dt-bindings/clock/tegra124-car.h>.

- #reset-cells : Should be 1.

  In clock consumers, this cell represents the bit number in the CAR's

  array of CLK_RST_CONTROLLER_RST_DEVICES_* registers.



Example SoC include file:



/ {

	tegra_car: clock {

		compatible = "nvidia,tegra124-car";

		reg = <0x60006000 0x1000>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	usb@c5004000 {

		clocks = <&tegra_car TEGRA124_CLK_USB2>;

	};

};



Example board file:



/ {

	clocks {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		osc: clock@0 {

			compatible = "fixed-clock";

			reg = <0>;

			#clock-cells = <0>;

			clock-frequency = <112400000>;

		};



		clk_32k: clock@1 {

			compatible = "fixed-clock";

			reg = <1>;

			#clock-cells = <0>;

			clock-frequency = <32768>;

		};

	};



	&tegra_car {

		clocks = <&clk_32k> <&osc>;

	};

};

Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ Required properties : 
  In clock consumers, this cell represents the clock ID exposed by the

  CAR. The assignments may be found in header file

  <dt-bindings/clock/tegra20-car.h>.

- #reset-cells : Should be 1.

  In clock consumers, this cell represents the bit number in the CAR's

  array of CLK_RST_CONTROLLER_RST_DEVICES_* registers.



Example SoC include file:
@@ -23,6 +26,7 @@ Example SoC include file: 
		compatible = "nvidia,tegra20-car";

		reg = <0x60006000 0x1000>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	usb@c5004000 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE