Merge branch 'master' of git://git.denx.de/u-boot-i2c
The sandburst-specific i2c drivers have been deleted, conflict was just
over the SPDX conversion.
Conflicts:
board/sandburst/common/ppc440gx_i2c.c
board/sandburst/common/ppc440gx_i2c.h
Signed-off-by:
Tom Rini <trini@ti.com>
No related branches found
No related tags found
Showing
- README 111 additions, 64 deletionsREADME
- arch/arm/cpu/armv7/vf610/generic.c 7 additions, 0 deletionsarch/arm/cpu/armv7/vf610/generic.c
- arch/arm/include/asm/arch-kirkwood/config.h 1 addition, 1 deletionarch/arm/include/asm/arch-kirkwood/config.h
- arch/arm/include/asm/arch-vf610/clock.h 1 addition, 0 deletionsarch/arm/include/asm/arch-vf610/clock.h
- arch/arm/include/asm/arch-vf610/crm_regs.h 1 addition, 0 deletionsarch/arm/include/asm/arch-vf610/crm_regs.h
- arch/arm/include/asm/arch-vf610/imx-regs.h 1 addition, 0 deletionsarch/arm/include/asm/arch-vf610/imx-regs.h
- arch/arm/include/asm/arch-vf610/iomux-vf610.h 4 additions, 0 deletionsarch/arm/include/asm/arch-vf610/iomux-vf610.h
- arch/arm/lib/board.c 7 additions, 3 deletionsarch/arm/lib/board.c
- arch/blackfin/lib/board.c 7 additions, 0 deletionsarch/blackfin/lib/board.c
- arch/m68k/cpu/mcf5227x/cpu_init.c 1 addition, 1 deletionarch/m68k/cpu/mcf5227x/cpu_init.c
- arch/m68k/cpu/mcf5227x/speed.c 1 addition, 1 deletionarch/m68k/cpu/mcf5227x/speed.c
- arch/m68k/cpu/mcf523x/cpu_init.c 1 addition, 1 deletionarch/m68k/cpu/mcf523x/cpu_init.c
- arch/m68k/cpu/mcf523x/speed.c 1 addition, 1 deletionarch/m68k/cpu/mcf523x/speed.c
- arch/m68k/cpu/mcf52x2/cpu_init.c 2 additions, 2 deletionsarch/m68k/cpu/mcf52x2/cpu_init.c
- arch/m68k/cpu/mcf52x2/speed.c 2 additions, 2 deletionsarch/m68k/cpu/mcf52x2/speed.c
- arch/m68k/cpu/mcf532x/cpu_init.c 2 additions, 2 deletionsarch/m68k/cpu/mcf532x/cpu_init.c
- arch/m68k/cpu/mcf532x/speed.c 1 addition, 1 deletionarch/m68k/cpu/mcf532x/speed.c
- arch/m68k/cpu/mcf5445x/cpu_init.c 1 addition, 1 deletionarch/m68k/cpu/mcf5445x/cpu_init.c
- arch/m68k/cpu/mcf5445x/speed.c 2 additions, 2 deletionsarch/m68k/cpu/mcf5445x/speed.c
- arch/m68k/cpu/mcf547x_8x/cpu_init.c 1 addition, 1 deletionarch/m68k/cpu/mcf547x_8x/cpu_init.c
Loading
Please register or sign in to comment