Set mdp as device 1.
msm: clock-8x60: update clock names

Conflicts:
	arch/arm/mach-msm/clock-8x60.c