svn commit: r308525 - in head/sys/arm: altera/socfpga freescale/vybrid rockchip samsung/exynos xilinx

Andrew Turner andrew at FreeBSD.org
Fri Nov 11 14:22:36 UTC 2016


Author: andrew
Date: Fri Nov 11 14:22:35 2016
New Revision: 308525
URL: https://svnweb.freebsd.org/changeset/base/308525

Log:
  Remove more unneeded users of the fdt_pic_decode_t table.
  
  Sponsored by:	ABT Systems Ltd

Deleted:
  head/sys/arm/rockchip/rk30xx_common.c
Modified:
  head/sys/arm/altera/socfpga/socfpga_common.c
  head/sys/arm/freescale/vybrid/vf_common.c
  head/sys/arm/rockchip/files.rk30xx
  head/sys/arm/samsung/exynos/exynos5_common.c
  head/sys/arm/xilinx/zy7_machdep.c

Modified: head/sys/arm/altera/socfpga/socfpga_common.c
==============================================================================
--- head/sys/arm/altera/socfpga/socfpga_common.c	Fri Nov 11 14:19:12 2016	(r308524)
+++ head/sys/arm/altera/socfpga/socfpga_common.c	Fri Nov 11 14:22:35 2016	(r308525)
@@ -69,24 +69,3 @@ cpu_reset(void)
 end:
 	while (1);
 }
-
-#ifndef INTRNG
-static int
-fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
-    int *pol)
-{
-
-	if (!fdt_is_compatible(node, "arm,gic"))
-		return (ENXIO);
-
-	*interrupt = fdt32_to_cpu(intr[0]);
-	*trig = INTR_TRIGGER_CONFORM;
-	*pol = INTR_POLARITY_CONFORM;
-	return (0);
-}
-
-fdt_pic_decode_t fdt_pic_table[] = {
-	&fdt_pic_decode_ic,
-	NULL
-};
-#endif

Modified: head/sys/arm/freescale/vybrid/vf_common.c
==============================================================================
--- head/sys/arm/freescale/vybrid/vf_common.c	Fri Nov 11 14:19:12 2016	(r308524)
+++ head/sys/arm/freescale/vybrid/vf_common.c	Fri Nov 11 14:22:35 2016	(r308525)
@@ -61,24 +61,3 @@ cpu_reset(void)
 end:
 	while (1);
 }
-
-#ifndef INTRNG
-static int
-fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
-    int *pol)
-{
-
-	if (!fdt_is_compatible(node, "arm,gic"))
-		return (ENXIO);
-
-	*interrupt = fdt32_to_cpu(intr[0]);
-	*trig = INTR_TRIGGER_CONFORM;
-	*pol = INTR_POLARITY_CONFORM;
-	return (0);
-}
-
-fdt_pic_decode_t fdt_pic_table[] = {
-	&fdt_pic_decode_ic,
-	NULL
-};
-#endif

Modified: head/sys/arm/rockchip/files.rk30xx
==============================================================================
--- head/sys/arm/rockchip/files.rk30xx	Fri Nov 11 14:19:12 2016	(r308524)
+++ head/sys/arm/rockchip/files.rk30xx	Fri Nov 11 14:22:35 2016	(r308525)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 kern/kern_clocksource.c			standard
 
-arm/rockchip/rk30xx_common.c		standard
 arm/rockchip/rk30xx_machdep.c		standard
 arm/rockchip/rk30xx_pmu.c		standard
 arm/rockchip/rk30xx_grf.c		standard

Modified: head/sys/arm/samsung/exynos/exynos5_common.c
==============================================================================
--- head/sys/arm/samsung/exynos/exynos5_common.c	Fri Nov 11 14:19:12 2016	(r308524)
+++ head/sys/arm/samsung/exynos/exynos5_common.c	Fri Nov 11 14:22:35 2016	(r308525)
@@ -48,24 +48,3 @@ cpu_reset(void)
 
 	while (1);
 }
-
-#ifndef INTRNG
-static int
-fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
-    int *pol)
-{
-
-	if (!fdt_is_compatible(node, "arm,gic"))
-		return (ENXIO);
-
-	*interrupt = fdt32_to_cpu(intr[0]);
-	*trig = INTR_TRIGGER_CONFORM;
-	*pol = INTR_POLARITY_CONFORM;
-	return (0);
-}
-
-fdt_pic_decode_t fdt_pic_table[] = {
-	&fdt_pic_decode_ic,
-	NULL
-};
-#endif

Modified: head/sys/arm/xilinx/zy7_machdep.c
==============================================================================
--- head/sys/arm/xilinx/zy7_machdep.c	Fri Nov 11 14:19:12 2016	(r308524)
+++ head/sys/arm/xilinx/zy7_machdep.c	Fri Nov 11 14:22:35 2016	(r308525)
@@ -92,29 +92,6 @@ platform_devmap_init(void)
 	return (0);
 }
 
-
-#ifndef INTRNG
-static int
-fdt_gic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
-    int *pol)
-{
-
-	if (!fdt_is_compatible(node, "arm,gic"))
-		return (ENXIO);
-
-	*interrupt = fdt32_to_cpu(intr[0]);
-	*trig = INTR_TRIGGER_CONFORM;
-	*pol = INTR_POLARITY_CONFORM;
-
-	return (0);
-}
-
-fdt_pic_decode_t fdt_pic_table[] = {
-	&fdt_gic_decode_ic,
-	NULL
-};
-#endif
-
 void
 cpu_reset()
 {


More information about the svn-src-all mailing list