Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[karo-tx-uboot.git] / arch / arm / include / asm / arch-davinci / davinci_misc.h

diff --git a/arch/arm/include/asm/arch-davinci/davinci_misc.h b/arch/arm/include/asm/arch-davinci/davinci_misc.h
index 347aa89e3904c89f92888c34752953d8a8a614aa..03be3882f886323ea2fd5ff72da749e271d11eb1 100644 (file)
--- a/arch/arm/include/asm/arch-davinci/davinci_misc.h
+++ b/arch/arm/include/asm/arch-davinci/davinci_misc.h
@@ -1,22 +1,7 @@
 /*
  * Copyright (C) 2008 Lyrtech <www.lyrtech.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __MISC_H
@@ -45,9 +30,6 @@ struct pinmux_resource {
                                .n_pins = ARRAY_SIZE(item) \
                          }
 
-#define HAWKBOARD_KICK0_UNLOCK          0x83e70b13
-#define HAWKBOARD_KICK1_UNLOCK          0x95a4f1e0
-
 struct lpsc_resource {
        const int       lpsc_no;
 };
@@ -57,7 +39,7 @@ void davinci_sync_env_enetaddr(uint8_t *rom_enetaddr);
 int davinci_configure_pin_mux(const struct pinmux_config *pins, int n_pins);
 int davinci_configure_pin_mux_items(const struct pinmux_resource *item,
                                    int n_items);
-#if defined(CONFIG_DRIVER_TI_EMAC) && defined(CONFIG_MACH_DAVINCI_DA850_EVM)
+#if defined(CONFIG_DRIVER_TI_EMAC) && defined(CONFIG_SOC_DA8XX)
 void davinci_emac_mii_mode_sel(int mode_sel);
 #endif
 #if defined(CONFIG_SOC_DA8XX)