Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 28 Jul 2015 10:27:36 GMT
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
Message-ID:  <201507281027.t6SARaUE011055@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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";
 		};

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507281027.t6SARaUE011055>