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

This commit is contained in:
Tom Rini
2017-08-16 18:12:58 -04:00
9 changed files with 19 additions and 16 deletions

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 */

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>;
};
/*

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>;
};
/*

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>;
};
/*