summaryrefslogtreecommitdiffstats
path: root/arch/arm64/boot
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2015-07-27 11:09:30 +0200
committerMichal Simek <michal.simek@xilinx.com>2015-07-31 10:46:25 +0200
commitb72b44b617d21e01d3f73069a908e75c4e91c5bd (patch)
tree718b98bc3141ff079dd823f88091b78330259eae /arch/arm64/boot
parentdevicetree: xilinx: zynqmp: add sata node (diff)
downloadlinux-b72b44b617d21e01d3f73069a908e75c4e91c5bd.tar.xz
linux-b72b44b617d21e01d3f73069a908e75c4e91c5bd.zip
ARM64: zynqmp: Use zynqmp specific compatible string for gpio
The patch: "gpio: Added support to Zynq Ultrascale+ MPSoC" (sha1: bdf7a4ae371894b4dc10b5820006b0a82d484929) added zynqmp specific features. This patch is switching the driver to use the zynqmp compatible string. Also enable the driver for ep108 platform. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/arm64/boot')
-rw-r--r--arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts4
-rw-r--r--arch/arm64/boot/dts/xilinx/zynqmp.dtsi2
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
index 981e594f16b4..53a9e5baa5b8 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
@@ -42,6 +42,10 @@
};
};
+&gpio {
+ status = "okay";
+};
+
&sata {
status = "okay";
ceva,broken-gen2;
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 72a37479026b..104f50c2f823 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -163,7 +163,7 @@
};
gpio: gpio@ff0a0000 {
- compatible = "xlnx,zynq-gpio-1.0";
+ compatible = "xlnx,zynqmp-gpio-1.0";
status = "disabled";
#gpio-cells = <0x2>;
clocks = <&misc_clk>;