Skip to content

Commit

Permalink
Merge tag 'microblaze-v5.16' of git://git.monstr.eu/linux-2.6-microblaze
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed Nov 5, 2021
2 parents 5c0b0c6 + 43bdcbd commit a51e4a1
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions arch/microblaze/boot/dts/system.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
} ;
} ;
} ;

0 comments on commit a51e4a1

Please sign in to comment.