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

Commit 047d378a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'zynq-dt-for-4.2' of https://github.com/Xilinx/linux-xlnx into next/dt 

Merge "arm: Xilinx Zynq dt patches for v4.2" from Michal Simek:

- Fix aliases and stdout properties
- Document current TTC binding
- Add Ceva to prefixes
- Use new compatible string for MACB

* tag 'zynq-dt-for-4.2' of https://github.com/Xilinx/linux-xlnx:
  ARM: zynq: DT: Use the zynq binding with macb
  of: Add vendor prefix for Ceva
  PCI: xilinx: Trivial fix in DT example
  devicetree: cadence_ttc: Document binding for timer width
  ARM: dts: zynq: Fix stdout-path and bootargs
  ARM: dts: zynq: Add missing alias node for zybo and parallella
parents db695b5e 4481b18b

Documentation/devicetree/bindings/pci/xilinx-pcie.txt

+1 −1
Original line number Diff line number Diff line
@@ -58,5 +58,5 @@ Example: 
			interrupt-controller;

			#address-cells = <0>;

			#interrupt-cells = <1>;

		}

		};

	};

Documentation/devicetree/bindings/timer/cadence,ttc-timer.txt

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ Required properties: 
- interrupts : A list of 3 interrupts; one per timer channel.

- clocks: phandle to the source clock



Optional properties:

- timer-width: Bit width of the timer, necessary if not 16.



Example:



ttc0: ttc0@f8001000 {
@@ -14,4 +17,5 @@ ttc0: ttc0@f8001000 { 
	compatible = "cdns,ttc";

	reg = <0xF8001000 0x1000>;

	clocks = <&cpu_clk 3>;

	timer-width = <32>;

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ calxeda Calxeda 
capella	Capella Microsystems, Inc

cavium	Cavium, Inc.

cdns	Cadence Design Systems Inc.

ceva	Ceva, Inc.

chipidea	Chipidea, Inc

chipone		ChipOne

chipspark	ChipSPARK

arch/arm/boot/dts/zynq-7000.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ 
		};



		gem0: ethernet@e000b000 {

			compatible = "cdns,gem";

			compatible = "cdns,zynq-gem", "cdns,gem";

			reg = <0xe000b000 0x1000>;

			status = "disabled";

			interrupts = <0 22 4>;
@@ -204,7 +204,7 @@ 
		};



		gem1: ethernet@e000c000 {

			compatible = "cdns,gem";

			compatible = "cdns,zynq-gem", "cdns,gem";

			reg = <0xe000c000 0x1000>;

			status = "disabled";

			interrupts = <0 45 4>;

arch/arm/boot/dts/zynq-parallella.dts

+7 −2
Original line number Diff line number Diff line
@@ -23,14 +23,19 @@ 
	model = "Adapteva Parallella Board";

	compatible = "adapteva,parallella", "xlnx,zynq-7000";



	aliases {

		ethernet0 = &gem0;

		serial0 = &uart1;

	};



	memory {

		device_type = "memory";

		reg = <0x0 0x40000000>;

	};



	chosen {

		bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait";

		linux,stdout-path = "/amba/serial@e0001000";

		bootargs = "earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait";

		stdout-path = "serial0:115200n8";

	};

};