Skip to content

Commit a51e4a1

Browse files
committed
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
2 parents 5c0b0c6 + 43bdcbd commit a51e4a1

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

arch/microblaze/boot/dts/system.dts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -347,12 +347,7 @@
347347
interrupts = < 3 2 >;
348348
reg = < 0x83c00000 0x10000 >;
349349
xlnx,count-width = <0x20>;
350-
xlnx,family = "virtex5";
351-
xlnx,gen0-assert = <0x1>;
352-
xlnx,gen1-assert = <0x1>;
353350
xlnx,one-timer-only = <0x0>;
354-
xlnx,trig0-assert = <0x1>;
355-
xlnx,trig1-assert = <0x1>;
356351
} ;
357352
} ;
358353
} ;

0 commit comments

Comments
 (0)