Module Name: src
Committed By: matt
Date: Fri Apr 4 21:33:19 UTC 2014
Modified Files:
src/sys/arch/arm/omap: omap2_reg.h omap5_ahcisata.c
Log Message:
Fix build break.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/omap/omap2_reg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/omap5_ahcisata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/omap/omap2_reg.h
diff -u src/sys/arch/arm/omap/omap2_reg.h:1.26 src/sys/arch/arm/omap/omap2_reg.h:1.27
--- src/sys/arch/arm/omap/omap2_reg.h:1.26 Thu Apr 3 17:11:10 2014
+++ src/sys/arch/arm/omap/omap2_reg.h Fri Apr 4 21:33:19 2014
@@ -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
Index: src/sys/arch/arm/omap/omap5_ahcisata.c
diff -u src/sys/arch/arm/omap/omap5_ahcisata.c:1.2 src/sys/arch/arm/omap/omap5_ahcisata.c:1.3
--- src/sys/arch/arm/omap/omap5_ahcisata.c:1.2 Thu Apr 3 17:12:15 2014
+++ src/sys/arch/arm/omap/omap5_ahcisata.c Fri Apr 4 21:33:19 2014
@@ -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 @@ omap5_ahcisata_attach(device_t parent, d
#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);
}
