gpio_matrix: fix callisto build errors

Change-Id: I7a48394584c8f7d45f3a35b8b0d6bb68f0eef84b
gp2a: fix build errors on 3.0 kernel

Change-Id: Ic4bc8cfaeeced4f05de489954d97a75608c919d2