From owner-p4-projects@FreeBSD.ORG Sat Jan 12 16:03:51 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7AFA296; Sat, 12 Jan 2013 16:03:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 83240294 for ; Sat, 12 Jan 2013 16:03:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7340FE57 for ; Sat, 12 Jan 2013 16:03:51 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id r0CG3paY007840 for ; Sat, 12 Jan 2013 16:03:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id r0CG3ouq007836 for perforce@freebsd.org; Sat, 12 Jan 2013 16:03:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 12 Jan 2013 16:03:50 GMT Message-Id: <201301121603.r0CG3ouq007836@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219962 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2013 16:03:52 -0000 http://p4web.freebsd.org/@@219962?ac=10 Change 219962 by rwatson@rwatson_cinnamon on 2013/01/12 16:03:36 Use the OFW compatible string "mips,mips4k" rather than "mips4k,cp0" for interrupt control using MIPS4k CP0. Suggested by: thompsa Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beri-sim.dts#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#12 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-tpad.dts#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/fdt_mips.c#3 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beri-sim.dts#3 (text+ko) ==== @@ -58,10 +58,10 @@ #interrupt-cells = <1>; /* - * Declare mips4k,cp0 since BERI doesn't (yet) have a PIC, so + * Declare mips,mips4k since BERI doesn't (yet) have a PIC, so * we use mips4k coprocessor 0 interrupt management directly. */ - compatible = "simple-bus", "mips4k,cp0"; + compatible = "simple-bus", "mips,mips4k"; ranges = <>; memory { ==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#12 (text+ko) ==== @@ -58,10 +58,10 @@ #interrupt-cells = <1>; /* - * Declare mips4k,cp0 since BERI doesn't (yet) have a PIC, so + * Declare mips,mips4k since BERI doesn't (yet) have a PIC, so * we use mips4k coprocessor 0 interrupt management directly. */ - compatible = "simple-bus", "mips4k,cp0"; + compatible = "simple-bus", "mips,mips4k"; ranges = <>; memory { ==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-tpad.dts#3 (text+ko) ==== @@ -58,10 +58,10 @@ #interrupt-cells = <1>; /* - * Declare mips4k,cp0 since BERI doesn't (yet) have a PIC, so + * Declare mips,mips4k since BERI doesn't (yet) have a PIC, so * we use mips4k coprocessor 0 interrupt management directly. */ - compatible = "simple-bus", "mips4k,cp0"; + compatible = "simple-bus", "mips,mips4k"; ranges = <>; /* ==== //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/fdt_mips.c#3 (text+ko) ==== @@ -58,7 +58,7 @@ int *trig, int *pol) { - if (!fdt_is_compatible(node, "mips4k,cp0")) + if (!fdt_is_compatible(node, "mips,mips4k")) return (ENXIO); *interrupt = fdt32_to_cpu(intr[0]);