bacon: Cleanup & fixes

Change-Id: I19c0576310f132bfeabea0407e50bb194ac67b0d Signed-off-by: eray orçunus <[email protected]>
kerneltoast · Apr 2, 2016 · 38af00f · 38af00f
1 parent 1649034
commit 38af00f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/arch/arm/boot/dts/project/14001/msm8974-14001-nfc.dtsi b/arch/arm/boot/dts/project/14001/msm8974-14001-nfc.dtsi
@@ -27,18 +27,6 @@
 		qcom,active-only;
 		qcom,master-id = <86>;
 
-		qcom,gpio-mosi = <&msmgpio 0 0>;
-		qcom,gpio-miso = <&msmgpio 1 0>;
-		qcom,gpio-clk  = <&msmgpio 3 0>;
-		qcom,gpio-cs2  = <&msmgpio 9 0>;
-
-		qcom,infinite-mode = <0>;
-		qcom,use-bam;
-		qcom,ver-reg-exists;
-		qcom,bam-consumer-pipe-index = <12>;
-		qcom,bam-producer-pipe-index = <13>;
-		qcom,master-id = <86>;
-
 		pn544-nxp-nfc@28 {
 			compatible = "pn544,nxp-nfc";
 			reg = <0x28>;

diff --git a/arch/arm/configs/bacon_defconfig b/arch/arm/configs/bacon_defconfig
@@ -258,7 +258,6 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_UID_STAT=y
 CONFIG_QSEECOM=y
 CONFIG_QPNP_MISC=y
-CONFIG_TI_DRV2667=y
 CONFIG_SN3193_SLED=y
 CONFIG_SCSI=y
 CONFIG_SCSI_TGT=y