There is also this to consider: http://onlinelibrary.wiley.com/doi/10.1111/j.1469-8749.2010.03627.x/pdf

Stereotypic movement disorder (SMD) and its differentiation from tics and autistic stereotypies and even ADHD. It's nothing pathological and is very often misdiagnosed and misunderstood.