The first method sounds the easiest, if you know about procedure. The second sounds easier if you can find the reset button.
This is from the service manual:
*1 Resetting method of the motor for jam protection.
HINT: When cutting the motor away from the regulator or racing the motor, make sure to rest the motor.
This is the operation to set limit switch at ”OFF”.
(1) Connect the motor to the vehicle side harness.
(2) Rotate the motor to the rising direction for 4 − 5 secs..
HINT: Rotating the motor for 4 − 5 secs. sets the limit switch at ”OFF”. (Top dead center of the door glass.)
*2 Resetting method of the motor for jam protection.
(1) Move the window to the fully closed position. (perform this by manual operation.)
(2) Using the bar with ø 2mm, press the reset switch.
(3) With the reset switch pressed, move the window to the fully opened position with the master switch. (Perform this by manual operation)
(4) Remove the bar from the reset switch, move the window to the fully closed position.
The manual does not say if the small reset switch is on the motor, or the switch assembly.
Most of the time these service notes make the most sense when you have the parts in front of you, but that may just be me.
Good luck.