• S
    Merge branches 'heads/pinmux' and 'heads/soc' into phy-rcar-usb-base · ae8b378f
    Simon Horman 提交于
    This branch acts as a base for adding USB support to
    r8A7778/BOCK-W and r8A7779/Marzen.
    
    It includes the soc branch to provide dependencies in
    the r8A7778 clock code.
    
    It includes pinmux to provide pinmux initialisation for Bock-W
    which is a dependency.
    
    Conflicts:
    	arch/arm/mach-shmobile/Kconfig
    	arch/arm/mach-shmobile/include/mach/r8a7778.h
    	arch/arm/mach-shmobile/setup-r8a7778.c
    ae8b378f
r8a7778.h 1.4 KB