tpm: Move the I2C TPM code into one file

[karo-tx-uboot.git] / common / cmd_dtt.c

diff --git a/common/cmd_dtt.c b/common/cmd_dtt.c
index edbd4a83cabcbf6f0d7df3e9c8118cfb2311c3a5..f2e750f2f1642f0fa71a6be1edac10eb48578f75 100644 (file)
--- a/common/cmd_dtt.c
+++ b/common/cmd_dtt.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2001
  * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -73,8 +57,13 @@ int dtt_i2c(void)
        /* Force a compilation error, if there are more then 32 sensors */
        BUILD_BUG_ON(sizeof(sensors) > 32);
        /* switch to correct I2C bus */
+#ifdef CONFIG_SYS_I2C
+       old_bus = i2c_get_bus_num();
+       i2c_set_bus_num(CONFIG_SYS_DTT_BUS_NUM);
+#else
        old_bus = I2C_GET_BUS();
        I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM);
+#endif
 
        _initialize_dtt();
 
@@ -86,7 +75,11 @@ int dtt_i2c(void)
                printf("DTT%d: %i C\n", i + 1, dtt_get_temp(sensors[i]));
 
        /* switch back to original I2C bus */
+#ifdef CONFIG_SYS_I2C
+       i2c_set_bus_num(old_bus);
+#else
        I2C_SET_BUS(old_bus);
+#endif
 #endif
 
        return 0;