From 2eb3e28b2c69261d274bc22321f688c193985e7b Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Thu, 13 Apr 2017 12:57:21 -0600 Subject: [PATCH] ARM: tegra: remove Whistler support Whistler is an ancient Tegra 2 reference board. I may have been the only person who ever used it with upstream software, and I've just recycled the board hardware. Hence, it makes sense to remove support from software. Signed-off-by: Stephen Warren Signed-off-by: Tom Warren --- arch/arm/dts/Makefile | 1 - arch/arm/dts/tegra20-whistler.dts | 77 --------------------------- arch/arm/mach-tegra/tegra20/Kconfig | 5 -- board/nvidia/whistler/Kconfig | 12 ----- board/nvidia/whistler/MAINTAINERS | 7 --- board/nvidia/whistler/Makefile | 8 --- board/nvidia/whistler/whistler.c | 80 ----------------------------- configs/whistler_defconfig | 29 ----------- include/configs/whistler.h | 49 ------------------ 9 files changed, 268 deletions(-) delete mode 100644 arch/arm/dts/tegra20-whistler.dts delete mode 100644 board/nvidia/whistler/Kconfig delete mode 100644 board/nvidia/whistler/MAINTAINERS delete mode 100644 board/nvidia/whistler/Makefile delete mode 100644 board/nvidia/whistler/whistler.c delete mode 100644 configs/whistler_defconfig delete mode 100644 include/configs/whistler.h diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 8b8f5e9e76..61a72186b1 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -60,7 +60,6 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ tegra20-tec.dtb \ tegra20-trimslice.dtb \ tegra20-ventana.dtb \ - tegra20-whistler.dtb \ tegra20-colibri.dtb \ tegra30-apalis.dtb \ tegra30-beaver.dtb \ diff --git a/arch/arm/dts/tegra20-whistler.dts b/arch/arm/dts/tegra20-whistler.dts deleted file mode 100644 index 447874674d..0000000000 --- a/arch/arm/dts/tegra20-whistler.dts +++ /dev/null @@ -1,77 +0,0 @@ -/dts-v1/; - -#include "tegra20.dtsi" - -/ { - model = "NVIDIA Tegra20 Whistler evaluation board"; - compatible = "nvidia,whistler", "nvidia,tegra20"; - - chosen { - stdout-path = &uarta; - }; - - aliases { - i2c0 = "/i2c@7000d000"; - usb0 = "/usb@c5008000"; - mmc0 = "/sdhci@c8000600"; - mmc1 = "/sdhci@c8000400"; - }; - - memory { - device_type = "memory"; - reg = < 0x00000000 0x20000000 >; - }; - - serial@70006000 { - clock-frequency = < 216000000 >; - }; - - i2c@7000d000 { - status = "okay"; - clock-frequency = <100000>; - - pmic@3c { - compatible = "maxim,max8907b"; - reg = <0x3c>; - - clk_32k: clock { - compatible = "fixed-clock"; - /* - * leave out for now due to CPP: - * #clock-cells = <0>; - */ - clock-frequency = <32768>; - }; - }; - }; - - usb@c5008000 { - status = "okay"; - }; - - sdhci@c8000400 { - status = "okay"; - wp-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_HIGH>; - bus-width = <8>; - }; - - sdhci@c8000600 { - status = "okay"; - bus-width = <8>; - non-removable; - }; - - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg=<0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; - }; - -}; diff --git a/arch/arm/mach-tegra/tegra20/Kconfig b/arch/arm/mach-tegra/tegra20/Kconfig index 99445a4f26..5c4d35b567 100644 --- a/arch/arm/mach-tegra/tegra20/Kconfig +++ b/arch/arm/mach-tegra/tegra20/Kconfig @@ -36,10 +36,6 @@ config TARGET_VENTANA bool "NVIDIA Tegra20 Ventana evaluation board" select BOARD_LATE_INIT -config TARGET_WHISTLER - bool "NVIDIA Tegra20 Whistler evaluation board" - select BOARD_LATE_INIT - config TARGET_COLIBRI_T20 bool "Toradex Colibri T20 board" select BOARD_LATE_INIT @@ -57,7 +53,6 @@ source "board/nvidia/seaboard/Kconfig" source "board/avionic-design/tec/Kconfig" source "board/compulab/trimslice/Kconfig" source "board/nvidia/ventana/Kconfig" -source "board/nvidia/whistler/Kconfig" source "board/toradex/colibri_t20/Kconfig" endif diff --git a/board/nvidia/whistler/Kconfig b/board/nvidia/whistler/Kconfig deleted file mode 100644 index 5febc07777..0000000000 --- a/board/nvidia/whistler/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_WHISTLER - -config SYS_BOARD - default "whistler" - -config SYS_VENDOR - default "nvidia" - -config SYS_CONFIG_NAME - default "whistler" - -endif diff --git a/board/nvidia/whistler/MAINTAINERS b/board/nvidia/whistler/MAINTAINERS deleted file mode 100644 index 66e2c8d082..0000000000 --- a/board/nvidia/whistler/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -WHISTLER BOARD -M: Tom Warren -M: Stephen Warren -S: Maintained -F: board/nvidia/whistler/ -F: include/configs/whistler.h -F: configs/whistler_defconfig diff --git a/board/nvidia/whistler/Makefile b/board/nvidia/whistler/Makefile deleted file mode 100644 index b54c5fd338..0000000000 --- a/board/nvidia/whistler/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2010-2012 -# NVIDIA Corporation -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y := whistler.o diff --git a/board/nvidia/whistler/whistler.c b/board/nvidia/whistler/whistler.c deleted file mode 100644 index db48978061..0000000000 --- a/board/nvidia/whistler/whistler.c +++ /dev/null @@ -1,80 +0,0 @@ -/* - * (C) Copyright 2010-2012 - * NVIDIA Corporation - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef CONFIG_MMC_SDHCI_TEGRA -/* - * Routine: pin_mux_mmc - * Description: setup the pin muxes/tristate values for the SDMMC(s) - */ -void pin_mux_mmc(void) -{ - struct udevice *dev; - uchar val; - int ret; - - /* Turn on MAX8907B LDO12 to 2.8V for J40 power */ - ret = i2c_get_chip_for_busnum(0, 0x3c, 1, &dev); - if (ret) { - printf("%s: Cannot find MAX8907B I2C chip\n", __func__); - return; - } - val = 0x29; - ret = dm_i2c_write(dev, 0x46, &val, 1); - if (ret) - printf("i2c_write 0 0x3c 0x46 failed: %d\n", ret); - val = 0x00; - ret = dm_i2c_write(dev, 0x45, &val, 1); - if (ret) - printf("i2c_write 0 0x3c 0x45 failed: %d\n", ret); - val = 0x1f; - ret = dm_i2c_write(dev, 0x44, &val, 1); - if (ret) - printf("i2c_write 0 0x3c 0x44 failed: %d\n", ret); - - funcmux_select(PERIPH_ID_SDMMC3, FUNCMUX_SDMMC3_SDB_SLXA_8BIT); - funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATC_ATD_8BIT); -} -#endif - -/* this is a weak define that we are overriding */ -void pin_mux_usb(void) -{ - struct udevice *dev; - uchar val; - int ret; - - /* - * This is a hack. This should be represented in DT using the - * vbus-gpio property. However, U-Boot's DT support doesn't - * support any GPIO controller other than the Tegra's yet. - */ - - /* Turn on TAC6416's GPIO 0+1 for USB1/3's VBUS */ - ret = i2c_get_chip_for_busnum(0, 0x20, 1, &dev); - if (ret) { - printf("%s: Cannot find TAC6416 I2C chip\n", __func__); - return; - } - val = 0x03; - ret = dm_i2c_write(dev, 2, &val, 1); - if (ret) - printf("i2c_write 0 0x20 2 failed: %d\n", ret); - val = 0xfc; - ret = dm_i2c_write(dev, 6, &val, 1); - if (ret) - printf("i2c_write 0 0x20 6 failed: %d\n", ret); -} diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig deleted file mode 100644 index 9d605092fc..0000000000 --- a/configs/whistler_defconfig +++ /dev/null @@ -1,29 +0,0 @@ -CONFIG_ARM=y -CONFIG_TEGRA=y -CONFIG_TEGRA20=y -CONFIG_TARGET_WHISTLER=y -CONFIG_DEFAULT_DEVICE_TREE="tegra20-whistler" -CONFIG_OF_SYSTEM_SETUP=y -CONFIG_CONSOLE_MUX=y -CONFIG_SYS_STDIO_DEREGISTER=y -CONFIG_SYS_PROMPT="Tegra20 (Whistler) # " -# CONFIG_CMD_IMI is not set -# CONFIG_CMD_IMLS is not set -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_I2C=y -CONFIG_CMD_USB=y -# CONFIG_CMD_FPGA is not set -CONFIG_CMD_GPIO=y -# CONFIG_CMD_SETEXPR is not set -# 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_SPL_DM=y -CONFIG_SYS_NS16550=y -CONFIG_USB=y -CONFIG_DM_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_STORAGE=y diff --git a/include/configs/whistler.h b/include/configs/whistler.h deleted file mode 100644 index 9f350d556a..0000000000 --- a/include/configs/whistler.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * (C) Copyright 2010-2012 - * NVIDIA Corporation - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include -#include "tegra20-common.h" - -/* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Whistler" - -/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA -#define CONFIG_TEGRA_UARTA_UAA_UAB -#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE - -#define CONFIG_MACH_TYPE MACH_TYPE_WHISTLER - -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - -/* - * Environment in eMMC, at the end of 2nd "boot sector". Note: This assumes - * the user plugged the standard 8GB MoviNAND card into J29/HSMMC/POP. If - * they didn't, the boot sector layout may be different. However, use of that - * particular card is standard practice as far as I know. - */ -#define CONFIG_ENV_IS_IN_MMC -#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2 - -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - -/* USB networking support */ -#define CONFIG_USB_HOST_ETHER -#define CONFIG_USB_ETHER_ASIX - -/* General networking support */ - -#include "tegra-common-post.h" - -#endif /* __CONFIG_H */ -- 2.25.1