Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge git://git.denx.de/u-boot-tegra

Browse source
This commit is contained in:
Tom Rini 2017-08-16 18:12:58 -04:00
commit 336aee50cf
9 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/dts/tegra124-apalis.dts
View file

@ -1610,17 +1610,13 @@
status = "okay";
};
hdmi_ddc: i2c@7000c400 {
clock-frequency = <100000>;
};
/*
* GEN1_I2C: I2C1_SDA/SCL on MXM3 pin 209/211 (e.g. RTC on carrier
* board)
*/
i2c@7000c000 {
status = "okay";
clock-frequency = <100000>;
clock-frequency = <400000>;
pcie-switch@58 {
compatible = "plx,pex8605";
@ -1639,7 +1635,7 @@
*/
hdmi_ddc: i2c@7000c400 {
status = "okay";
clock-frequency = <100000>;
clock-frequency = <10000>;
};
/*
@ -1648,7 +1644,7 @@
*/
i2c@7000c500 {
status = "okay";
clock-frequency = <100000>;
clock-frequency = <400000>;
};
/* I2C4 (DDC): unused */

4
arch/arm/dts/tegra20-colibri.dts
View file

@ -64,7 +64,7 @@
*/
i2c@7000c000 {
status = "okay";
clock-frequency = <100000>;
clock-frequency = <400000>;
};
/* GEN2_I2C: unused */
@ -72,7 +72,7 @@
/* DDC_CLOCK/DATA on X3 pin 15/16 (e.g. display EDID) */
i2c@7000c400 {
status = "okay";
clock-frequency = <100000>;
clock-frequency = <10000>;
};
/*

6
arch/arm/dts/tegra30-apalis.dts
View file

@ -65,7 +65,7 @@
*/
i2c@7000c000 {
status = "okay";
clock-frequency = <100000>;
clock-frequency = <400000>;
};
/* GEN2_I2C: unused */
@ -76,13 +76,13 @@
*/
i2c@7000c500 {
status = "okay";
clock-frequency = <100000>;
clock-frequency = <400000>;
};
/* DDC: I2C2_SDA/SCL on MXM3 pin 205/207 (e.g. display EDID) */
i2c@7000c700 {
status = "okay";
clock-frequency = <100000>;
clock-frequency = <10000>;
};
/*

4
arch/arm/dts/tegra30-colibri.dts
View file

@ -33,7 +33,7 @@
*/
i2c@7000c000 {
status = "okay";
clock-frequency = <100000>;
clock-frequency = <400000>;
};
/* GEN2_I2C: unused */
@ -43,7 +43,7 @@
/* DDC_CLOCK/DATA on X3 pin 15/16 (e.g. display EDID) */
i2c@7000c700 {
status = "okay";
clock-frequency = <100000>;
clock-frequency = <10000>;
};
/*

4
board/toradex/apalis_t30/pinmux-config-apalis_t30.h
View file

@ -94,8 +94,8 @@ static struct pmux_pingrp_config tegra3_pinmux_common[] = {
I2C_PINMUX(GEN1_I2C_SDA_PC5, I2C1, NORMAL, NORMAL, INPUT, DISABLE, ENABLE),
/* I2C2 pinmux */
I2C_PINMUX(GEN2_I2C_SCL_PT5, I2C2, NORMAL, NORMAL, INPUT, DISABLE, ENABLE),
I2C_PINMUX(GEN2_I2C_SDA_PT6, I2C2, NORMAL, NORMAL, INPUT, DISABLE, ENABLE),
I2C_PINMUX(GEN2_I2C_SCL_PT5, RSVD3, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE),
I2C_PINMUX(GEN2_I2C_SDA_PT6, RSVD3, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE),
/* I2C3 pinmux */
I2C_PINMUX(CAM_I2C_SCL_PBB1, I2C3, NORMAL, TRISTATE, INPUT, DISABLE, ENABLE),

4
configs/apalis-tk1_defconfig
View file

@ -24,6 +24,10 @@ CONFIG_CMD_USB=y
CONFIG_CMD_USB_MASS_STORAGE=y
# CONFIG_CMD_NFS is not set
CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y

1
configs/apalis_t30_defconfig
View file

@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y

1
configs/colibri_t20_defconfig
View file

@ -30,6 +30,7 @@ CONFIG_CMD_UBI=y
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y

1
configs/colibri_t30_defconfig
View file

@ -24,6 +24,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y