Patch from John Lenz

Update collie machine to use the new scoop driver written
by Richard Purdie.

Signed-off-by: John Lenz
Signed-off-by: Russell King