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

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

Pull ARM SoC driver updates from Olof Johansson:
 "These are changes for drivers that are intimately tied to some SoC and
  for some reason could not get merged through the respective subsystem
  maintainer tree.

  This time around, much of this is for at91, with the bulk of it being
  syscon and udc drivers.

  Also, there's:
   - coupled cpuidle support for Samsung Exynos4210
   - Renesas 73A0 common-clk work
   - of/platform changes to tear down DMA mappings on device destruction
   - a few updates to the TI Keystone knav code"

* tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (26 commits)
  cpuidle: exynos: add coupled cpuidle support for exynos4210
  ARM: EXYNOS: apply S5P_CENTRAL_SEQ_OPTION fix only when necessary
  soc: ti: knav_qmss_queue: change knav_range_setup_acc_irq to static
  soc: ti: knav_qmss_queue: makefile tweak to build as dynamic module
  pcmcia: at91_cf: depend on !ARCH_MULTIPLATFORM
  soc: ti: knav_qmss_queue: export API calls for use by user driver
  of/platform: teardown DMA mappings on device destruction
  usb: gadget: at91_udc: Allocate udc instance
  usb: gadget: at91_udc: Update DT binding documentation
  usb: gadget: at91_udc: Rework for multi-platform kernel support
  usb: gadget: at91_udc: Simplify probe and remove functions
  usb: gadget: at91_udc: Remove non-DT handling code
  usb: gadget: at91_udc: Document DT clocks and clock-names property
  usb: gadget: at91_udc: Drop uclk clock
  usb: gadget: at91_udc: Fix clock names
  mfd: syscon: Add Atmel SMC binding doc
  mfd: syscon: Add atmel-smc registers definition
  mfd: syscon: Add Atmel Matrix bus DT binding documentation
  mfd: syscon: Add atmel-matrix registers definition
  clk: shmobile: fix sparse NULL pointer warning
  ...
parents a233bb74 6f4554bd

Documentation/devicetree/bindings/clock/renesas,sh73a0-cpg-clocks.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
These bindings should be considered EXPERIMENTAL for now.



* Renesas SH73A0 Clock Pulse Generator (CPG)



The CPG generates core clocks for the SH73A0 SoC. It includes four PLLs

and several fixed ratio dividers.



Required Properties:



  - compatible: Must be "renesas,sh73a0-cpg-clocks"



  - reg: Base address and length of the memory resource used by the CPG



  - clocks: Reference to the parent clocks ("extal1" and "extal2")



  - #clock-cells: Must be 1



  - clock-output-names: The names of the clocks. Supported clocks are "main",

    "pll0", "pll1", "pll2", "pll3", "dsi0phy", "dsi1phy", "zg", "m3", "b",

    "m1", "m2", "z", "zx", and "hp".





Example

-------



        cpg_clocks: cpg_clocks@e6150000 {

                compatible = "renesas,sh73a0-cpg-clocks";

                reg = <0 0xe6150000 0 0x10000>;

                clocks = <&extal1_clk>, <&extal2_clk>;

                #clock-cells = <1>;

                clock-output-names = "main", "pll0", "pll1", "pll2",

                                     "pll3", "dsi0phy", "dsi1phy",

                                     "zg", "m3", "b", "m1", "m2",

                                     "z", "zx", "hp";

        };

Documentation/devicetree/bindings/mfd/atmel-matrix.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
* Device tree bindings for Atmel Bus Matrix



The Bus Matrix registers are used to configure Atmel SoCs internal bus

behavior (master/slave priorities, undefined burst length type, ...)



Required properties:

- compatible:		Should be one of the following

			"atmel,at91sam9260-matrix", "syscon"

			"atmel,at91sam9261-matrix", "syscon"

			"atmel,at91sam9263-matrix", "syscon"

			"atmel,at91sam9rl-matrix", "syscon"

			"atmel,at91sam9g45-matrix", "syscon"

			"atmel,at91sam9n12-matrix", "syscon"

			"atmel,at91sam9x5-matrix", "syscon"

			"atmel,sama5d3-matrix", "syscon"

- reg:			Contains offset/length value of the Bus Matrix

			memory region.



Example:



matrix: matrix@ffffec00 {

	compatible = "atmel,sama5d3-matrix", "syscon";

	reg = <0xffffec00 0x200>;

};

Documentation/devicetree/bindings/mfd/atmel-smc.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* Device tree bindings for Atmel SMC (Static Memory Controller)



The SMC registers are used to configure Atmel EBI (External Bus Interface)

to interface with standard memory devices (NAND, NOR, SRAM or specialized

devices like FPGAs).



Required properties:

- compatible:		Should be one of the following

			"atmel,at91sam9260-smc", "syscon"

			"atmel,sama5d3-smc", "syscon"

- reg:			Contains offset/length value of the SMC memory

			region.



Example:



smc: smc@ffffc000 {

	compatible = "atmel,sama5d3-smc", "syscon";

	reg = <0xffffc000 0x1000>;

};

Documentation/devicetree/bindings/usb/atmel-usb.txt

+9 −1
Original line number Diff line number Diff line
@@ -33,9 +33,17 @@ usb1: ehci@00800000 { 
AT91 USB device controller



Required properties:

 - compatible: Should be "atmel,at91rm9200-udc"

 - compatible: Should be one of the following

	       "atmel,at91rm9200-udc"

	       "atmel,at91sam9260-udc"

	       "atmel,at91sam9261-udc"

	       "atmel,at91sam9263-udc"

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

 - interrupts: Should contain macb interrupt

 - clocks: Should reference the peripheral and the AHB clocks

 - clock-names: Should contains two strings

		"pclk" for the peripheral clock

		"hclk" for the AHB clock



Optional properties:

 - atmel,vbus-gpio: If present, specifies a gpio that needs to be

arch/arm/boot/dts/sh73a0-kzm9g-reference.dts

+4 −0
Original line number Diff line number Diff line
@@ -182,6 +182,10 @@ 
	status = "okay";

};



&extal2_clk {

	clock-frequency = <48000000>;

};



&i2c0 {

	status = "okay";

	as3711@40 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE