In fact, the macros added as part of implementing eMMC support already
were based on v5.1 of the eMMC specification. However, some have been
shortened on purpose in order to make it easier for keeping resulting
code within 80 columns.
Apparently, Linux chose to do the same and as you say, still as of today
uses e. g. EXT_CSD_CARD_TYPE and EXT_CSD_PART_CONFIG. Thus,
it seems backwards to change such macros to something Linux doesn't
use either.
Moreover, with 49 chars EXT_CSD_NUMBER_OF_FW_SECTORS_CORRECTLY_PROGRAMMED
is ridiculously long and Linux apparently doesn't have a macro for that
register at all.
Thus, overall, I'd prefer to stick to the convention of shortening macro
names where it makes sense (also for additional ones being added), and to
just add alias macros to linuxkpi when needed.
Generally, your patch also mixes the addition of new macros for mostly
SPI mode with changing existing ones, which should be separate changes,
if at all.

PORTVERSION bump and style changes suggested by jrm@, added RC_IMPLIES=SPLIT

In D41355#942246, @adrian wrote:

lets hold off on removing the /HAL/ support just right now. If we start stripping this stuff out then i'll make it harder to sync this code up with what I'm slowly hacking up in netbsd...

Bah, even more AH_SUPPORT_AR9130 code to be removed from the FreeBSD HAL.

The removed AH_SUPPORT_x has some counterparts in the FreeBSD HAL which this version now also removes.

Thanks!

QCA9565 in ath_hal.4 restored

Well, the bus abstraction as such deliberately is left in place, build-wise the PCI bus front-end just is coupled with the core support again (but as for the kernel, also only if has PCI support in the first place as usual). Generally, we consider PCI default enough that there are no seperate modules and devices for PCI bus front-ends even if support for additional busses exists. Currently, ath(4) and ath_pci(4) respectively are one of the very few odd ones out in this regard (I think virtio_pci(4) is the only other offender). Also, with all support for the very resource constraint platforms already gone, even if code for said USB chips would be added today, I believe the few bytes for the bus glue won't matter. The ARMv7 if_ath_pci.o currently is 25 KB and ARMv6 support also already on its way out ...