HSD #15013478346: arm: configs: enable clocksource for a10 (#73)

commit 74e356385f8917b5a972a6499bd65ca6431102b3 from
https://github.com/altera-opensource/linux-socfpga.git socfpga-6.1.55-lts.

Enable clocksource for a10 in kernel confing and fix merging issue.

Add CONFIG_HAVE_ARM_ARCH_TIMER=y in socfpga_defconfig, and
resolve merge conflict error.

fixes: 9cf4d06 ("net: ethernet: altera: add DMA support for Intel FPGA QSE driver").

Signed-off-by: Swee, Leong Ching <leong.ching.swee@intel.com>
Signed-off-by: Liwei Song <liwei.song@windriver.com>