merged tx6dl-devel into denx master branch

[karo-tx-uboot.git] / arch / arm / include / asm / arch-mx6 / mx6q_pins.h

diff --git a/arch/arm/include/asm/arch-mx6/mx6q_pins.h b/arch/arm/include/asm/arch-mx6/mx6q_pins.h
index 02a40d4f5c6cca27e6b0729ead032a70e23a9cd2..a23fb3364c9b15e6e77fe2fc12436e365b497adc 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/mx6q_pins.h
+++ b/arch/arm/include/asm/arch-mx6/mx6q_pins.h
@@ -1,22 +1,9 @@
 /*
  * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
  *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier:    GPL-2.0+
  *
  * Auto Generate file, please don't edit it
- *
  */
 
 #ifndef __ASM_ARCH_MX6_MX6Q_PINS_H__
@@ -1068,7 +1055,7 @@ enum {
        MX6_PAD_GPIO_8__USBOH3_OTG_PWRCTL_WAK   = IOMUX_PAD(0x0614, 0x0244, 7, 0x0000, 0, 0),
        MX6_PAD_GPIO_16__ESAI1_TX3_RX2          = IOMUX_PAD(0x0618, 0x0248, 0, 0x0880, 1, 0),
        MX6_PAD_GPIO_16__ENET_1588_EVENT2_IN    = IOMUX_PAD(0x0618, 0x0248, 1, 0x0000, 0, 0),
-       MX6_PAD_GPIO_16__ENET_ETHERNET_REF_OUT = IOMUX_PAD(0x0618, 0x0248, 2, 0x083C, 1, 0),
+       MX6_PAD_GPIO_16__ENET_ANATOP_ETHERNET_REF_OUT = IOMUX_PAD(0x0618, 0x0248, 2 | IOMUX_CONFIG_SION, 0x083C, 1, 0),
        MX6_PAD_GPIO_16__USDHC1_LCTL            = IOMUX_PAD(0x0618, 0x0248, 3, 0x0000, 0, 0),
        MX6_PAD_GPIO_16__SPDIF_IN1              = IOMUX_PAD(0x0618, 0x0248, 4, 0x0914, 3, 0),
        MX6_PAD_GPIO_16__GPIO_7_11              = IOMUX_PAD(0x0618, 0x0248, 5, 0x0000, 0, 0),