From 6e70feeabbce4649c5e089e83a1a94d7fa06e91a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 30 Sep 2011 14:28:33 -0700 Subject: tegra: Make i2c driver common The T20 and T30 i2c peripherals can use the same driver. This renames the driver and puts the header file into the common arch-tegra directory. BUG=chromium-os:19004 TEST=build and boot on seaboard Change-Id: Iec76bb27340db037fdc67b3509fd35f7b5aaeb34 Reviewed-on: http://gerrit.chromium.org/gerrit/8643 Reviewed-by: Simon Glass Tested-by: Simon Glass --- board/nvidia/common/Makefile | 3 +-- board/nvidia/common/board.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'board') diff --git a/board/nvidia/common/Makefile b/board/nvidia/common/Makefile index 44888a535fb..50d48f95e0b 100644 --- a/board/nvidia/common/Makefile +++ b/board/nvidia/common/Makefile @@ -29,8 +29,7 @@ COBJS-y += board.o COBJS-$(CONFIG_USB_EHCI_TEGRA) += usb.o COBJS-$(CONFIG_SPI_UART_SWITCH) += uart-spi-fix.o COBJS-$(CONFIG_TEGRA2_KEYBOARD) += generic_kbc.o -COBJS-$(CONFIG_TEGRA2_I2C) += pmu.o -COBJS-$(CONFIG_TEGRA2_I2C) += emc.o +COBJS-$(CONFIG_TEGRA_I2C) += emc.o pmu.o COBJS-$(CONFIG_TEGRA2_LP0) += crypto/aes_ref.o COBJS-$(CONFIG_TEGRA2_LP0) += crypto/crypto.o COBJS-$(CONFIG_TEGRA2_NAND) += tegra2_nand.o diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index b6040ce9349..539a51d925f 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -49,7 +49,7 @@ #ifdef CONFIG_TEGRA2_SPI #include #endif -#ifdef CONFIG_TEGRA2_I2C +#ifdef CONFIG_TEGRA_I2C #include #endif #include "board.h" @@ -251,7 +251,7 @@ int board_init(void) #endif power_det_init(); -#ifdef CONFIG_TEGRA2_I2C +#ifdef CONFIG_TEGRA_I2C /* Ramp up the core voltage, then change to full CPU speed */ i2c_init_board(); @@ -268,7 +268,7 @@ int board_init(void) gd->bd->bi_arch_number = CONFIG_MACH_TYPE; #endif -#ifdef CONFIG_TEGRA2_I2C +#ifdef CONFIG_TEGRA_I2C board_emc_init(); #endif -- cgit v1.2.3