summaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-11-05 08:19:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-11-05 08:19:56 -0700
commita51e4a1acb5fa4ce0b0f0bd3606463a09e6fa1b0 (patch)
tree4a142fa6fa3c8aabe654fa57fd53f2eac8655ffc /arch/microblaze
parent5c0b0c676ac2d84f69568715af91e45b610fe17a (diff)
parent43bdcbd5004393faad06b65c1539d3c9b9d5f6b2 (diff)
downloadlinux-a51e4a1acb5fa4ce0b0f0bd3606463a09e6fa1b0.tar.bz2
Merge tag 'microblaze-v5.16' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek: "Remove unused devicetree properties. Sean is pushing one pwm driver and these ancient properties are going against agreed DT binding" * tag 'microblaze-v5.16' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: timer: Remove unused properties
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/boot/dts/system.dts5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/microblaze/boot/dts/system.dts b/arch/microblaze/boot/dts/system.dts
index b7ee1056779e..22252451ec09 100644
--- a/arch/microblaze/boot/dts/system.dts
+++ b/arch/microblaze/boot/dts/system.dts
@@ -347,12 +347,7 @@
interrupts = < 3 2 >;
reg = < 0x83c00000 0x10000 >;
xlnx,count-width = <0x20>;
- xlnx,family = "virtex5";
- xlnx,gen0-assert = <0x1>;
- xlnx,gen1-assert = <0x1>;
xlnx,one-timer-only = <0x0>;
- xlnx,trig0-assert = <0x1>;
- xlnx,trig1-assert = <0x1>;
} ;
} ;
} ;