summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/zynq-7000.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-12-07 12:38:43 -0800
committerOlof Johansson <olof@lixom.net>2016-12-07 12:38:43 -0800
commit8237c0b9570c09d513296ef0fde26ce0784e5179 (patch)
tree83035bd77c920c9051a0e3fe9370604a4d3bdde6 /arch/arm/boot/dts/zynq-7000.dtsi
parentdd1551b65023dbe98d1bc77e36000e7aa795e8c7 (diff)
parentdf2f3c48b9cd51e2612a1598342769d09d849f39 (diff)
downloadblackbird-op-linux-8237c0b9570c09d513296ef0fde26ce0784e5179.tar.gz
blackbird-op-linux-8237c0b9570c09d513296ef0fde26ce0784e5179.zip
Merge tag 'zynq-dt-for-4.10' of https://github.com/Xilinx/linux-xlnx into next/dt
arm: Xilinx Zynq dt patches for v4.10 - Remove skeleton.dtsi - Fix DTC warnings - Coding style changes - Microzed support * tag 'zynq-dt-for-4.10' of https://github.com/Xilinx/linux-xlnx: arm: dts: zynq: Add MicroZed board support ARM: zynq: Fix pmu register description coding style ARM: zynq: Fix W=1 dtc 1.4 warnings ARM: zynq: Remove skeleton.dtsi Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/zynq-7000.dtsi')
-rw-r--r--arch/arm/boot/dts/zynq-7000.dtsi10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index f283ff08381c..f3ac9bfe580e 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -10,9 +10,10 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-/include/ "skeleton.dtsi"
/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
compatible = "xlnx,zynq-7000";
cpus {
@@ -41,14 +42,15 @@
};
};
- pmu {
+ pmu@f8891000 {
compatible = "arm,cortex-a9-pmu";
interrupts = <0 5 4>, <0 6 4>;
interrupt-parent = <&intc>;
- reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >;
+ reg = <0xf8891000 0x1000>,
+ <0xf8893000 0x1000>;
};
- regulator_vccpint: fixedregulator@0 {
+ regulator_vccpint: fixedregulator {
compatible = "regulator-fixed";
regulator-name = "VCCPINT";
regulator-min-microvolt = <1000000>;
OpenPOWER on IntegriCloud