Add s2w, d2w, w2w and p2w

Conflicts:
	drivers/input/misc/pmic8xxx-pwrkey.c
	drivers/input/touchscreen/synaptics_i2c_rmi.c

Conflicts:
	arch/arm/mach-msm/board-8064-display.c
	drivers/input/misc/pmic8xxx-pwrkey.c
	drivers/input/touchscreen/synaptics_i2c_rmi.c
	drivers/leds/leds-an30259a.c
	drivers/sensorhub/ssp_i2c.c