colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Browse Source
This commit is contained in:
Albert ARIBAUD
2013-06-28 17:51:13 +02:00
parent 9dc8fef258 d6c6d127c5
commit e6c7f86f03
22 changed files with 1776 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/arch-mx27/clock.h
View File

@@ -26,6 +26,7 @@
enum mxc_clock {
MXC_ARM_CLK,
MXC_I2C_CLK,
MXC_UART_CLK,
MXC_ESDHC_CLK,
MXC_FEC_CLK,

2
arch/arm/include/asm/arch-mx6/imx-regs.h
View File

@@ -364,7 +364,7 @@ struct iomuxc {
#define IOMUXC_GPR2_MODE_DISABLED 0
#define IOMUXC_GPR2_MODE_ENABLED_DI0 1
#define IOMUXC_GPR2_MODE_ENABLED_DI1 2
#define IOMUXC_GPR2_MODE_ENABLED_DI1 3
#define IOMUXC_GPR2_LVDS_CH1_MODE_OFFSET 2
#define IOMUXC_GPR2_LVDS_CH1_MODE_MASK (3<<IOMUXC_GPR2_LVDS_CH1_MODE_OFFSET)

1591
arch/arm/include/asm/arch-mx6/mx6dl_pins.h
View File

File diff suppressed because it is too large Load Diff