Is this correct?

Should be

#ifndef _ALLWINNER_MACHDEP_H_
#define<tab>_ALLWINNER_MACHDEP_H_

All .c files should have included this before including this file

Have you hit this? We would expect the devicetree to be correct for the hardware.

Yes this is the original licence from a10_machdep.c

Yes, upstream a20 DTS also have the sun4i-a10-timer node

I don't see anything in this file that would require us to keep this notice, it looks like you've written everything other than the standard license.

Ok, move this change to the update fdt review as it's also includes a compatibility string change.

I think this also depends on the dts change. If so move it to that change & move timer.c back to files.allwinner

And what about gic and ARM_INTRNG ?
Should I also move them to the fdt change ? Or do another review that handle timer and gic ?

If generic_timer relies on a change in the dts move it to the fdt change.

What gic change do you mean? The only related changes I see are to enable ARM_INTRNG. I don't see how this would be an issue.

Yes you're right, I thought gic wasn't include in the original A20 file ... it's been a while.
For generic_timer is doesn't make sense right now are the our custom dts doesn't include the node.