I had been using the xcomm_zynq kernel branch, according to the information on the wiki (http://wiki.analog.com/resources/tools-software/linux-drivers/platforms/zynq).
Using the xcomm_zynq_new_pcore_regmap branch for the kernel and device tree works.
Thanks!