diff options
| author |   Olof Johansson <olof@lixom.net> | 2015-12-22 11:26:28 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 11:26:28 -0800 |
| commit | 69c8e667ff1a5702d7908db430ac091bd14a1cdb (patch) | |
| tree | 49be8322778846e8e62ae5ae0f2991cb9b4c7225 | |
| parent | Merge tag 'samsung-dt-syscon-restart-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt (diff) | |
| parent | ARM: dt: zynq: Add labels to cpu nodes to allow overriding OPPs. (diff) | |
| download | wireguard-linux-69c8e667ff1a5702d7908db430ac091bd14a1cdb.tar.xz wireguard-linux-69c8e667ff1a5702d7908db430ac091bd14a1cdb.zip | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/boot/dts/zynq-7000.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/zynq-zc702.dts | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index 1a5220e05109..f283ff08381c 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -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 { diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index 5df8f81f4217..cb64209bca08 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -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; }; }; |