Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[u-boot] / arch / arm / cpu / armv7 / omap4 / prcm-regs.c

diff --git a/arch/arm/cpu/armv7/omap4/prcm-regs.c b/arch/arm/cpu/armv7/omap4/prcm-regs.c
index c58ce8d6fb85b0043b5215c159945b25492fd7ed..1ed146b44538c57ab57d569cc0215853a4761bf1 100644 (file)
--- a/arch/arm/cpu/armv7/omap4/prcm-regs.c
+++ b/arch/arm/cpu/armv7/omap4/prcm-regs.c
@@ -7,23 +7,7 @@
  *
  * Sricharan R <r.sricharan@ti.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 <asm/omap_common.h>
@@ -153,7 +137,7 @@ struct prcm_regs const omap4_prcm = {
        .cm_l3_2_clkstctrl = 0x4a008800,
        .cm_l3_2_dynamicdep = 0x4a008808,
        .cm_l3_2_l3_2_clkctrl = 0x4a008820,
-       .cm_l3_2_gpmc_clkctrl = 0x4a008828,
+       .cm_l3_gpmc_clkctrl = 0x4a008828,
        .cm_l3_2_ocmc_ram_clkctrl = 0x4a008830,
        .cm_mpu_m3_clkstctrl = 0x4a008900,
        .cm_mpu_m3_staticdep = 0x4a008904,
@@ -301,6 +285,8 @@ struct omap_sys_ctrl_regs const omap4_ctrl = {
        .control_ldosram_iva_voltage_ctrl       = 0x4A002320,
        .control_ldosram_mpu_voltage_ctrl       = 0x4A002324,
        .control_ldosram_core_voltage_ctrl      = 0x4A002328,
+       .control_usbotghs_ctrl                  = 0x4A00233C,
+       .control_padconf_core_base              = 0x4A100000,
        .control_pbiaslite                      = 0x4A100600,
        .control_lpddr2io1_0                    = 0x4A100638,
        .control_lpddr2io1_1                    = 0x4A10063C,
@@ -312,4 +298,5 @@ struct omap_sys_ctrl_regs const omap4_ctrl = {
        .control_lpddr2io2_3                    = 0x4A100654,
        .control_efuse_1                        = 0x4A100700,
        .control_efuse_2                        = 0x4A100704,
+       .control_padconf_wkup_base              = 0x4A31E000,
 };