svn commit: r266275 - in stable/10/sys/arm: samsung/exynos ti

[Ian Lepore]

Author: ian
Date: Fri May 16 23:49:40 2014
New Revision: 266275
URL: http://svnweb.freebsd.org/changeset/base/266275

Log:
  MFC 258211, 257775, 258096,
  
    Add mbox and pruss drivers to ti build.
  
    Use common bus_space-v6 instead of local copies.

Deleted:
  stable/10/sys/arm/samsung/exynos/bus_space.c
  stable/10/sys/arm/ti/bus_space.c
Modified:
  stable/10/sys/arm/samsung/exynos/exynos5_machdep.c
  stable/10/sys/arm/samsung/exynos/files.exynos5
  stable/10/sys/arm/ti/files.ti
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/samsung/exynos/exynos5_machdep.c
==============================================================================
--- stable/10/sys/arm/samsung/exynos/exynos5_machdep.c	Fri May 16 23:27:18 2014	(r266274)
+++ stable/10/sys/arm/samsung/exynos/exynos5_machdep.c	Fri May 16 23:49:40 2014	(r266275)
@@ -30,27 +30,25 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#define _ARM32_BUS_DMA_PRIVATE
+#define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 
 #include <vm/vm.h>
-#include <vm/pmap.h>
 
+#include <machine/armreg.h>
 #include <machine/bus.h>
 #include <machine/devmap.h>
 #include <machine/machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 
-#define	DEVMAP_BOOTSTRAP_MAP_START 0xF0000000
-
 vm_offset_t
 initarm_lastaddr(void)
 {
 
-	return (DEVMAP_BOOTSTRAP_MAP_START);
+	return (arm_devmap_lastaddr());
 }
 
 void
@@ -62,35 +60,22 @@ initarm_early_init(void)
 void
 initarm_gpio_init(void)
 {
+
 }
 
 void
 initarm_late_init(void)
 {
+
 }
 
-#define FDT_DEVMAP_MAX	(1 + 2 + 1 + 1)	/* FIXME */
-static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
-	{ 0, 0, 0, 0, 0, }
-};
-
-/*
- * Construct pmap_devmap[] with DT-derived config data.
- */
 int
 initarm_devmap_init(void)
 {
-	int i;
 
-	i = 0;
-	fdt_devmap[i].pd_va = 0xf2C00000;
-	fdt_devmap[i].pd_pa = 0x12C00000;
-	fdt_devmap[i].pd_size = 0x100000;
-	fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
-	fdt_devmap[i].pd_cache = PTE_NOCACHE;
-	i++;
+	/* UART */
+	arm_devmap_add_entry(0x12C00000, 0x100000);
 
-	arm_devmap_register_table(&fdt_devmap[0]);
 	return (0);
 }
 

Modified: stable/10/sys/arm/samsung/exynos/files.exynos5
==============================================================================
--- stable/10/sys/arm/samsung/exynos/files.exynos5	Fri May 16 23:27:18 2014	(r266274)
+++ stable/10/sys/arm/samsung/exynos/files.exynos5	Fri May 16 23:49:40 2014	(r266275)
@@ -10,12 +10,12 @@ arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 arm/arm/irq_dispatch.S				standard
 
+arm/arm/bus_space-v6.c				standard
 arm/arm/gic.c					standard
 arm/arm/generic_timer.c				standard
 
 arm/samsung/exynos/arch_timer.c			standard
 arm/samsung/exynos/exynos5_mp.c			optional	smp
-arm/samsung/exynos/bus_space.c			standard
 arm/samsung/exynos/common.c			standard
 arm/samsung/exynos/exynos5_machdep.c		standard
 arm/samsung/exynos/uart.c			optional	uart

Modified: stable/10/sys/arm/ti/files.ti
==============================================================================
--- stable/10/sys/arm/ti/files.ti	Fri May 16 23:27:18 2014	(r266274)
+++ stable/10/sys/arm/ti/files.ti	Fri May 16 23:49:40 2014	(r266275)
@@ -2,6 +2,7 @@
 
 kern/kern_clocksource.c				standard
 
+arm/arm/bus_space-v6.c				standard
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
 arm/arm/cpufunc_asm_armv5.S			standard
@@ -10,12 +11,14 @@ arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 arm/arm/irq_dispatch.S				standard
 
-arm/ti/bus_space.c				standard
 arm/ti/common.c					standard
 arm/ti/ti_cpuid.c				standard
 arm/ti/ti_machdep.c				standard
 arm/ti/ti_prcm.c				standard
 arm/ti/ti_scm.c					standard
+dev/mbox/mbox_if.m				standard
+arm/ti/ti_mbox.c				standard
+arm/ti/ti_pruss.c				standard
 
 arm/ti/ti_gpio.c				optional	gpio
 arm/ti/ti_i2c.c					optional	ti_i2c