freedog: fix issue on GPIO22 to enable uart
Merge remote branch 'upstream/master'

Conflicts:
	.config