Commit 69c8e667 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

arm: Xilinx Zynq dt patches for v4.5

- Various small DT changes, GPIO, slcr, cpu label

* tag 'zynq-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx

:
  ARM: dt: zynq: Add labels to cpu nodes to allow overriding OPPs.
  ARM: dts: zynq: describe SLCR as simple-mfd rather than simple-bus
  ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source property
  ARM: zynq: DT: Add interrupt-controller property to GPIO

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3a865977 400b6a0c

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

+5 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

		cpu0: cpu@0 {

			compatible = "arm,cortex-a9";

			device_type = "cpu";

			reg = <0>;
@@ -33,7 +33,7 @@ 
			>;

		};



		cpu@1 {

		cpu1: cpu@1 {

			compatible = "arm,cortex-a9";

			device_type = "cpu";

			reg = <1>;
@@ -101,6 +101,8 @@ 
			#gpio-cells = <2>;

			clocks = <&clkc 42>;

			gpio-controller;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupt-parent = <&intc>;

			interrupts = <0 20 4>;

			reg = <0xe000a000 0x1000>;
@@ -238,7 +240,7 @@ 
		slcr: slcr@f8000000 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "xlnx,zynq-slcr", "syscon", "simple-bus";

			compatible = "xlnx,zynq-slcr", "syscon", "simple-mfd";

			reg = <0xF8000000 0x1000>;

			ranges;

			clkc: clkc@100 {

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

+2 −2
Original line number Diff line number Diff line
@@ -43,14 +43,14 @@ 
			label = "sw14";

			gpios = <&gpio0 12 0>;

			linux,code = <108>; /* down */

			gpio-key,wakeup;

			wakeup-source;

			autorepeat;

		};

		sw13 {

			label = "sw13";

			gpios = <&gpio0 14 0>;

			linux,code = <103>; /* up */

			gpio-key,wakeup;

			wakeup-source;

			autorepeat;

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE