openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm: Xilinx Zynq dt patches for v4.5 

- Various small DT changes, GPIO, slcr, cpu label
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZusi0ACgkQykllyylKDCFCDgCfQ0mCK4O38NMUHwG9wA4THD/e
 54MAoJtiu6VVch3iJ7aMX7rcDPhQPQW9
 =XrJB
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2015-12-22 11:26:28 -08:00
parent 3a8659772c 400b6a0cbe
commit 69c8e667ff
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/zynq-7000.dtsi
View File

@ -19,7 +19,7 @@ cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
cpu@0 { cpu0: cpu@0 {
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
device_type = "cpu"; device_type = "cpu";
reg = <0>; reg = <0>;
@ -33,7 +33,7 @@ cpu@0 {
>; >;
}; };
cpu@1 { cpu1: cpu@1 {
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
device_type = "cpu"; device_type = "cpu";
reg = <1>; reg = <1>;
@ -101,6 +101,8 @@ gpio0: gpio@e000a000 {
#gpio-cells = <2>; #gpio-cells = <2>;
clocks = <&clkc 42>; clocks = <&clkc 42>;
gpio-controller; gpio-controller;
interrupt-controller;
#interrupt-cells = <2>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
interrupts = <0 20 4>; interrupts = <0 20 4>;
reg = <0xe000a000 0x1000>; reg = <0xe000a000 0x1000>;
@ -238,7 +240,7 @@ sdhci1: sdhci@e0101000 {
slcr: slcr@f8000000 { slcr: slcr@f8000000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "xlnx,zynq-slcr", "syscon", "simple-bus"; compatible = "xlnx,zynq-slcr", "syscon", "simple-mfd";
reg = <0xF8000000 0x1000>; reg = <0xF8000000 0x1000>;
ranges; ranges;
clkc: clkc@100 { clkc: clkc@100 {

4
arch/arm/boot/dts/zynq-zc702.dts
View File

@ -43,14 +43,14 @@ sw14 {
label = "sw14"; label = "sw14";
gpios = <&gpio0 12 0>; gpios = <&gpio0 12 0>;
linux,code = <108>; /* down */ linux,code = <108>; /* down */
gpio-key,wakeup; wakeup-source;
autorepeat; autorepeat;
}; };
sw13 { sw13 {
label = "sw13"; label = "sw13";
gpios = <&gpio0 14 0>; gpios = <&gpio0 14 0>;
linux,code = <103>; /* up */ linux,code = <103>; /* up */
gpio-key,wakeup; wakeup-source;
autorepeat; autorepeat;
}; };
}; };