t6: update keypad

Change-Id: I624fa6b6fe493a6db8d56d2361701a51074419a9
cleanup