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

Commit 56e9e0f3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'socfpga/dt' into next/dt 



SoCFPGA DT changes from Dinh Nguyen.

* socfpga/dt:
  dts: Rename DW APB timer compatible strings
  dts: Deprecate ALTR as a vendor prefix
  of: add vendor prefix for Altera Corp.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 103c6a71 620f5e1c

Documentation/devicetree/bindings/rtc/dw-apb.txt

+11 −23
Original line number Diff line number Diff line 
* Designware APB timer



Required properties:

- compatible: "snps,dw-apb-timer-sp" or "snps,dw-apb-timer-osc"

- compatible: One of:

 	"snps,dw-apb-timer"

	"snps,dw-apb-timer-sp" <DEPRECATED>

	"snps,dw-apb-timer-osc" <DEPRECATED>

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: IRQ line for the timer.
@@ -20,23 +23,8 @@ systems may use one. 




Example:



		timer1: timer@ffc09000 {

				compatible = "snps,dw-apb-timer-sp";

				interrupts = <0 168 4>;

				clock-frequency = <200000000>;

				reg = <0xffc09000 0x1000>;

			};



		timer2: timer@ffd00000 {

				compatible = "snps,dw-apb-timer-osc";

				interrupts = <0 169 4>;

				clock-frequency = <200000000>;

				reg = <0xffd00000 0x1000>;

			};



		timer3: timer@ffe00000 {

				compatible = "snps,dw-apb-timer-osc";

	timer@ffe00000 {

		compatible = "snps,dw-apb-timer";

		interrupts = <0 170 4>;

		reg = <0xffe00000 0x1000>;

		clocks = <&timer_clk>, <&timer_pclk>;

Documentation/devicetree/bindings/serial/altera_jtaguart.txt

+2 −1
Original line number Diff line number Diff line 
Altera JTAG UART



Required properties:

- compatible : should be "ALTR,juart-1.0"
 
- compatible : should be "ALTR,juart-1.0" <DEPRECATED>

- compatible : should be "altr,juart-1.0"

Documentation/devicetree/bindings/serial/altera_uart.txt

+2 −1
Original line number Diff line number Diff line 
Altera UART



Required properties:

- compatible : should be "ALTR,uart-1.0"

- compatible : should be "ALTR,uart-1.0" <DEPRECATED>

- compatible : should be "altr,uart-1.0"



Optional properties:

- clock-frequency : frequency of the clock input to the UART

Documentation/devicetree/bindings/serio/altera_ps2.txt

+2 −1
Original line number Diff line number Diff line 
Altera UP PS/2 controller



Required properties:

- compatible : should be "ALTR,ps2-1.0".
 
- compatible : should be "ALTR,ps2-1.0". <DEPRECATED>

- compatible : should be "altr,ps2-1.0".

Documentation/devicetree/bindings/spi/spi_altera.txt

+2 −1
Original line number Diff line number Diff line 
Altera SPI



Required properties:

- compatible : should be "ALTR,spi-1.0".
 
- compatible : should be "ALTR,spi-1.0". <DEPRECATED>

- compatible : should be "altr,spi-1.0".