From owner-svn-soc-all@freebsd.org Tue Jul 28 10:27:37 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97F089AD736 for ; Tue, 28 Jul 2015 10:27:37 +0000 (UTC) (envelope-from pratiksinghal@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6EBFC1CA6 for ; Tue, 28 Jul 2015 10:27:37 +0000 (UTC) (envelope-from pratiksinghal@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6SARbZ0011075 for ; Tue, 28 Jul 2015 10:27:37 GMT (envelope-from pratiksinghal@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6SARaUE011055 for svn-soc-all@FreeBSD.org; Tue, 28 Jul 2015 10:27:36 GMT (envelope-from pratiksinghal@FreeBSD.org) Date: Tue, 28 Jul 2015 10:27:36 GMT Message-Id: <201507281027.t6SARaUE011055@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to pratiksinghal@FreeBSD.org using -f From: pratiksinghal@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288846 - in soc2015/pratiksinghal/cubie-head/sys: arm/allwinner boot/fdt/dts/arm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jul 2015 10:27:37 -0000 Author: pratiksinghal Date: Tue Jul 28 10:27:35 2015 New Revision: 288846 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288846 Log: Corrected the dts file and other minor problem Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.h soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.h ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.h Tue Jul 28 09:36:26 2015 (r288845) +++ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.h Tue Jul 28 10:27:35 2015 (r288846) @@ -174,19 +174,11 @@ #define A10_MMC_IDMAC_RD (6U << 13) #define A10_MMC_IDMAC_WR (7U << 13) #define A10_MMC_IDMAC_DESC_CLOSE (8U << 13) -<<<<<<< .working #define A10_MMC_IDMAC_ERROR \ (A10_MMC_IDMAC_FATAL_BUS_ERR | A10_MMC_IDMAC_CARD_ERR_SUM | \ A10_MMC_IDMAC_DES_INVALID | A10_MMC_IDMAC_ABNORMAL_INT_SUM) #define A10_MMC_IDMAC_COMPLETE \ (A10_MMC_IDMAC_TRANSMIT_INT | A10_MMC_IDMAC_RECEIVE_INT) -======= -#define A10_MMC_IDMAC_ERROR \ - (A10_MMC_IDMAC_FATAL_BUS_ERR | A10_MMC_IDMAC_CARD_ERR_SUM | \ - A10_MMC_IDMAC_DES_INVALID | A10_MMC_IDMAC_ABNORMAL_INT_SUM) -#define A10_MMC_IDMAC_COMPLETE \ - (A10_MMC_IDMAC_TRANSMIT_INT | A10_MMC_IDMAC_RECEIVE_INT) ->>>>>>> .merge-right.r287986 /* The DMA descriptor table. */ struct a10_mmc_dma_desc { Modified: soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi Tue Jul 28 09:36:26 2015 (r288845) +++ soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi Tue Jul 28 10:27:35 2015 (r288846) @@ -130,7 +130,7 @@ ac97@01c21400 { compatible = "allwinner,sun4i-a10-ac97"; reg = <0x01C214000 0x1000>; - interrupts = <46> + interrupts = <46>; interrupt-parent = <&AINTC>; status = "disabled"; };