Universal quantum computing with spin and valley states