[src/trunk]: src/sys/arch/arm/omap Fix build break.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/980586743a52
branches:  trunk
changeset: 795247:980586743a52
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Apr 04 21:33:19 2014 +0000

description:
Fix build break.

diffstat:

 sys/arch/arm/omap/omap2_reg.h      |  13 +++----------
 sys/arch/arm/omap/omap5_ahcisata.c |  13 +++++++------
 2 files changed, 10 insertions(+), 16 deletions(-)

diffs (70 lines):

diff -r b5319253e63e -r 980586743a52 sys/arch/arm/omap/omap2_reg.h
--- a/sys/arch/arm/omap/omap2_reg.h     Fri Apr 04 21:19:35 2014 +0000
+++ b/sys/arch/arm/omap/omap2_reg.h     Fri Apr 04 21:33:19 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: omap2_reg.h,v 1.26 2014/04/03 17:11:10 matt Exp $ */
+/* $NetBSD: omap2_reg.h,v 1.27 2014/04/04 21:33:19 matt Exp $ */
 
 /*
  * Copyright (c) 2007 Microsoft
@@ -399,6 +399,8 @@
 #define         OMAP4_CM_L3INIT_USB_TLL_HS_CLKCTRL_USB_CH0_CLK         __BIT(8)
 #define        OMAP5_CM_L3INIT_SATA_CLKCTRL            0x0088
 #define         OMAP5_CM_L3INIT_SATA_CLKCTRL_OPTFCLKEN_REF_CLK         __BIT(8)
+#define         OMAP4_CM_L3INIT_SATA_CLKCTRL_MODULEMODE                __BITS(1,0)
+#define          OMAP4_CM_L3INIT_SATA_CLKCTRL_MODULEMODE_HW            2
 #define        OMAP5_CM_L3INIT_USB_OTG_SS_CLKCTRL      0x00F0
 #define         OMAP5_CM_L3INIT_USB_OTG_SS_CLKCTRL_OPTFCLKEN_REFCLK960M __BIT(8)
 #define         OMAP5_CM_L3INIT_USB_OTG_SS_CLKCTRL_MODULEMODE          __BITS(1,0)
@@ -878,15 +880,6 @@
 #define        OMAP5_CM_CTL_WKUP_MUXMODE1_GPIO_WK11            6
 #define        OMAP5_CM_CTL_WKUP_MUXMODE1_SAFE_MODE_WAKEUP12   7
 
-#define        OMAP5_CM_L3INIT_MMC1_CLKCTRL            0x4a009628
-#define        OMAP5_CM_L3INIT_MMC2_CLKCTRL            0x4a009630
-#define        OMAP5_CM_L3INIT_HSI_CLKCTRL             0x4a009638
-#define        OMAP5_CM_L3INIT_USB_HOST_HS_CLKCTRL     0x4a009658
-#define        OMAP5_CM_L3INIT_SATA_CLKCTRL            0x4a009688
-
-#define        OMAP5_CM_L3INIT_MODE                    __BITS(0,1)
-#define        OMAP5_CM_L3INIT_ENABLE                  2
-
 #ifdef TI_AM335X
 #define        TI_AM335X_CTLMOD_BASE           0x44e10000
 #define        CTLMOD_CONTROL_STATUS           0x40
diff -r b5319253e63e -r 980586743a52 sys/arch/arm/omap/omap5_ahcisata.c
--- a/sys/arch/arm/omap/omap5_ahcisata.c        Fri Apr 04 21:19:35 2014 +0000
+++ b/sys/arch/arm/omap/omap5_ahcisata.c        Fri Apr 04 21:33:19 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: omap5_ahcisata.c,v 1.2 2014/04/03 17:12:15 matt Exp $ */
+/* $NetBSD: omap5_ahcisata.c,v 1.3 2014/04/04 21:33:19 matt Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap5_ahcisata.c,v 1.2 2014/04/03 17:12:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap5_ahcisata.c,v 1.3 2014/04/04 21:33:19 matt Exp $");
 
 #include "locators.h"
 
@@ -86,12 +86,13 @@
 #ifdef OMAP5
        {
                bus_space_handle_t ioh;
-               rv = bus_space_map(obio->obio_iot,
-                   OMAP5_CM_L3INIT_SATA_CLKCTRL, 4, 0, &ioh);
+               rv = bus_space_map(obio->obio_iot, OMAP2_CM_BASE
+                   + OMAP5_CM_L3INIT_CORE + OMAP5_CM_L3INIT_SATA_CLKCTRL,
+                   4, 0, &ioh);
                KASSERT(rv == 0);
                uint32_t v = bus_space_read_4(obio->obio_iot, ioh, 0);
-               v &= ~OMAP5_CM_L3INIT_MODE;
-               v |= OMAP5_CM_L3INIT_ENABLE;
+               v &= ~OMAP4_CM_L3INIT_SATA_CLKCTRL_MODULEMODE;
+               v |= OMAP4_CM_L3INIT_SATA_CLKCTRL_MODULEMODE_HW;
                bus_space_write_4(obio->obio_iot, ioh, 0, v);
                bus_space_unmap(obio->obio_iot, ioh, 4);
        }