Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f0184f7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I56d9097a,I0db7259e,Ide5960ea,Ib11bd43c,I2b443e6d into msm-3.10 

* changes:
  defconfig: fsm9900: Add GSM NL HW support
  ARM: dts: msm: Enable the UART1 entry in fsm9900 MTP
  defconfig: fsm9900: Enable PPPOE kernel option
  msm: emac: Report time delta of next PTP pulse in sysfs
  platform: msm: uim: fix return value of write operation
parents 4baf1e45 eca90a0e

arch/arm/boot/dts/qcom/fsm9900-mtp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
	};



	uart1: serial@f9921000 {

		status = "disabled";

		status = "ok";

	};



	uim0: qcom,uim@f995d000 {

arch/arm/configs/fsm9900-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ CONFIG_MSM_L2_ERP_1BIT_PANIC=y 
CONFIG_MSM_L2_ERP_2BIT_PANIC=y

CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y

CONFIG_MSM_PP2S_FEMTO=y

CONFIG_FSM9900_GSM_NL=y

CONFIG_STRICT_MEMORY_RWX=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y
@@ -172,6 +173,8 @@ CONFIG_NET_VENDOR_MSM=y 
CONFIG_MSM_EMAC=y

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_PPP=y

CONFIG_PPPOE=m

CONFIG_ATH6K_LEGACY_EXT=y

CONFIG_DANIPC=y

# CONFIG_INPUT_MOUSEDEV is not set

arch/arm/configs/fsm9900_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ CONFIG_MSM_L2_ERP_1BIT_PANIC=y 
CONFIG_MSM_L2_ERP_2BIT_PANIC=y

CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y

CONFIG_MSM_PP2S_FEMTO=y

CONFIG_FSM9900_GSM_NL=y

CONFIG_STRICT_MEMORY_RWX=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y
@@ -171,6 +172,8 @@ CONFIG_NET_VENDOR_MSM=y 
CONFIG_MSM_EMAC=y

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_PPP=y

CONFIG_PPPOE=m

CONFIG_ATH6K_LEGACY_EXT=y

CONFIG_DANIPC=y

# CONFIG_INPUT_MOUSEDEV is not set

drivers/net/ethernet/msm/emac/emac_ptp.c

+3 −3
Original line number Diff line number Diff line
@@ -613,11 +613,11 @@ static int emac_ptp_sysfs_mtnp_show( 
	if (ret)

		return ret;



	return scnprintf(buf, count, "%ld %ld %ld %ld\n",

	return scnprintf(buf, count, "%ld %ld %d %ld\n",

			 ts.tv_sec,

			 ts.tv_nsec,

			 (ts.tv_nsec != 0) ? ts.tv_sec : ts.tv_sec + 1,

			 NSEC_PER_SEC - ts.tv_nsec);

			 (ts.tv_nsec == 0) ? 1 : 0,

			 (ts.tv_nsec == 0) ? 0 : (NSEC_PER_SEC - ts.tv_nsec));

}



/* Do a "slam" of a very particular time into the time registers... */

drivers/platform/msm/uim_hs_lite.c

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static ssize_t uim_dev_write(struct file *file, const char __user *buf, 


	uim_hsl_start_tx(port);



	return 0;

	return count;

}



static unsigned int uim_dev_poll(struct file *file, poll_table *wait)