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

Commit bd90f115 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'reset-for-4.3' of git://git.pengutronix.de/git/pza/linux into next/drivers 

Reset controller changes for v4.3

- moved the DT reset binding includes from
  include/dt-bindings/reset-controller to include/dt-bindings/reset
- new driver for LPC18xx Reset Generation Unit (RGU)
- of_device_id array in the STi driver changed to const.
- extend SoCFPGA reset driver to support Arria10
- new ath79 reset controller driver for AR71XX/AR9XXX
- new driver for Xilinx Zynq reset controller

* tag 'reset-for-4.3' of git://git.pengutronix.de/git/pza/linux

:
  reset: reset-zynq: Adding support for Xilinx Zynq reset controller.
  docs: dts: Added documentation for Xilinx Zynq Reset Controller bindings.
  MIPS: ath79: Add the reset controller to the AR9132 dtsi
  reset: Add a driver for the reset controller on the AR71XX/AR9XXX
  devicetree: Add bindings for the ATH79 reset controller
  reset: socfpga: Update reset-socfpga to read the altr,modrst-offset property
  doc: dt: add documentation for lpc1850-rgu reset driver
  reset: add driver for lpc18xx rgu
  reset: sti: constify of_device_id array
  ARM: STi: DT: Move reset controller constants into common location
  MAINTAINERS: add include/dt-bindings/reset path to reset controller entry

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a005bc6f 5d44595c

Documentation/devicetree/bindings/reset/ath79-reset.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Binding for Qualcomm Atheros AR7xxx/AR9XXX reset controller



Please also refer to reset.txt in this directory for common reset

controller binding usage.



Required Properties:

- compatible: has to be "qca,<soctype>-reset", "qca,ar7100-reset"

              as fallback

- reg: Base address and size of the controllers memory area

- #reset-cells : Specifies the number of cells needed to encode reset

                 line, should be 1



Example:



	reset-controller@1806001c {

		compatible = "qca,ar9132-reset", "qca,ar7100-reset";

		reg = <0x1806001c 0x4>;



		#reset-cells = <1>;

	};

Documentation/devicetree/bindings/reset/nxp,lpc1850-rgu.txt

0 → 100644
+84 −0
Original line number Diff line number Diff line 
NXP LPC1850  Reset Generation Unit (RGU)

========================================



Please also refer to reset.txt in this directory for common reset

controller binding usage.



Required properties:

- compatible: Should be "nxp,lpc1850-rgu"

- reg: register base and length

- clocks: phandle and clock specifier to RGU clocks

- clock-names: should contain "delay" and "reg"

- #reset-cells: should be 1



See table below for valid peripheral reset numbers. Numbers not

in the table below are either reserved or not applicable for

normal operation.



Reset	Peripheral

  9	System control unit (SCU)

 12	ARM Cortex-M0 subsystem core (LPC43xx only)

 13	CPU core

 16	LCD controller

 17	USB0

 18	USB1

 19	DMA

 20	SDIO

 21	External memory controller (EMC)

 22	Ethernet

 25	Flash bank A

 27	EEPROM

 28	GPIO

 29	Flash bank B

 32	Timer0

 33	Timer1

 34	Timer2

 35	Timer3

 36	Repetitive Interrupt timer (RIT)

 37	State Configurable Timer (SCT)

 38	Motor control PWM (MCPWM)

 39	QEI

 40	ADC0

 41	ADC1

 42	DAC

 44	USART0

 45	UART1

 46	USART2

 47	USART3

 48	I2C0

 49	I2C1

 50	SSP0

 51	SSP1

 52	I2S0 and I2S1

 53	Serial Flash Interface (SPIFI)

 54	C_CAN1

 55	C_CAN0

 56	ARM Cortex-M0 application core (LPC4370 only)

 57	SGPIO (LPC43xx only)

 58	SPI (LPC43xx only)

 60	ADCHS (12-bit ADC) (LPC4370 only)



Refer to NXP LPC18xx or LPC43xx user manual for more details about

the reset signals and the connected block/peripheral.



Reset provider example:

rgu: reset-controller@40053000 {

	compatible = "nxp,lpc1850-rgu";

	reg = <0x40053000 0x1000>;

	clocks = <&cgu BASE_SAFE_CLK>, <&ccu1 CLK_CPU_BUS>;

	clock-names = "delay", "reg";

	#reset-cells = <1>;

};



Reset consumer example:

mac: ethernet@40010000 {

	compatible = "nxp,lpc1850-dwmac", "snps,dwmac-3.611", "snps,dwmac";

	reg = <0x40010000 0x2000>;

	interrupts = <5>;

	interrupt-names = "macirq";

	clocks = <&ccu1 CLK_CPU_ETHERNET>;

	clock-names = "stmmaceth";

	resets = <&rgu 22>;

	reset-names = "stmmaceth";

	status = "disabled";

};

Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt

+1 −1
Original line number Diff line number Diff line
@@ -39,4 +39,4 @@ Example: 
	};



Macro definitions for the supported reset channels can be found in:

include/dt-bindings/reset-controller/stih407-resets.h
 
include/dt-bindings/reset/stih407-resets.h

Documentation/devicetree/bindings/reset/st,sti-powerdown.txt

+2 −2
Original line number Diff line number Diff line
@@ -43,5 +43,5 @@ example: 


Macro definitions for the supported reset channels can be found in:



include/dt-bindings/reset-controller/stih415-resets.h

include/dt-bindings/reset-controller/stih416-resets.h
 
include/dt-bindings/reset/stih415-resets.h

include/dt-bindings/reset/stih416-resets.h

Documentation/devicetree/bindings/reset/st,sti-softreset.txt

+2 −2
Original line number Diff line number Diff line
@@ -42,5 +42,5 @@ example: 


Macro definitions for the supported reset channels can be found in:



include/dt-bindings/reset-controller/stih415-resets.h

include/dt-bindings/reset-controller/stih416-resets.h
 
include/dt-bindings/reset/stih415-resets.h

include/dt-bindings/reset/stih416-resets.h