Commit a51e4a1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5c0b0c67 43bdcbd5

arch/microblaze/boot/dts/system.dts

+0 −5
Original line number Diff line number Diff line
@@ -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>;

		} ;

	} ;

}  ;