OMAP4: HSI: Port 2 support

Removed hardcoded value to port 1
Enhanced platform data to include CAWAKE name and mode for each port
Modified HSI platform function to check both ports

Supported configuration are :
Port 1 only
Port 2 only
Port 1 + Port 2

Change-Id: I9b2ed7a4680a99b61dd2552129a3c5a7dbf23db3
Signed-off-by: Djamil Elaidi <d-elaidi@ti.com>

Author: Djamil Elaidi

arch/arm/mach-omap2/omap_hsi.c

@@ -25,8 +25,6 @@
 #include <linux/notifier.h>
 #include <linux/hsi_driver_if.h>
 
-#include <asm/clkdev.h>
-
 #include <plat/omap_hsi.h>
 #include <plat/omap_hwmod.h>
 #include <plat/omap_device.h>
@@ -35,15 +33,14 @@
 #include "clock.h"
 #include "mux.h"
 #include "control.h"
+#include "pm.h"
 
 static int omap_hsi_wakeup_enable(int hsi_port);
 static int omap_hsi_wakeup_disable(int hsi_port);
 #define OMAP_HSI_PLATFORM_DEVICE_DRIVER_NAME	"omap_hsi"
 #define OMAP_HSI_PLATFORM_DEVICE_NAME		"omap_hsi.0"
 #define OMAP_HSI_HWMOD_NAME			"hsi"
 #define OMAP_HSI_HWMOD_CLASSNAME		"hsi"
-#define OMAP_HSI_PADCONF_CAWAKE_PIN		"usbb1_ulpitll_clk.hsi1_cawake"
-#define OMAP_HSI_PADCONF_CAWAKE_MODE           OMAP_MUX_MODE1
 
 
 #define OMAP_MUX_MODE_MASK	0x7
@@ -85,8 +82,9 @@ static int omap_mux_disable_wakeup(const char *muxname)
  */
 
 
-static struct port_ctx hsi_port_ctx[] = {
+static struct hsi_port_ctx omap_hsi_port_ctx[] = {
 	[0] = {
+	       .port_number = 1,
 	       .hst.mode = HSI_MODE_FRAME,
 	       .hst.flow = HSI_FLOW_SYNCHRONIZED,
 	       .hst.frame_size = HSI_FRAMESIZE_DEFAULT,
@@ -101,21 +99,23 @@ static struct port_ctx hsi_port_ctx[] = {
 	       .hsr.counters = HSI_COUNTERS_FT_DEFAULT |
 			       HSI_COUNTERS_TB_DEFAULT |
 			       HSI_COUNTERS_FB_DEFAULT,
+	       .cawake_padconf_name = "usbb1_ulpitll_clk.hsi1_cawake",
+	       .cawake_padconf_hsi_mode = OMAP_MUX_MODE1,
 	       },
 };
 
-static struct ctrl_ctx hsi_ctx = {
+static struct hsi_ctrl_ctx omap_hsi_ctrl_ctx = {
 		.sysconfig = 0,
 		.gdd_gcr = 0,
 		.dll = 0,
-		.pctx = hsi_port_ctx,
+		.pctx = omap_hsi_port_ctx,
 };
 
 static struct hsi_platform_data omap_hsi_platform_data = {
-	.num_ports = ARRAY_SIZE(hsi_port_ctx),
+	.num_ports = ARRAY_SIZE(omap_hsi_port_ctx),
 	.hsi_gdd_chan_count = HSI_HSI_DMA_CHANNEL_MAX,
 	.default_hsi_fclk = HSI_DEFAULT_FCLK,
-	.ctx = &hsi_ctx,
+	.ctx = &omap_hsi_ctrl_ctx,
 	.device_enable = omap_device_enable,
 	.device_idle = omap_device_idle,
 	.device_shutdown = omap_device_shutdown,
@@ -166,24 +166,50 @@ static struct hsi_dev *hsi_get_hsi_controller_data(struct platform_device *pd)
 	return hsi_ctrl;
 }
 
+/**
+* hsi_get_hsi_port_ctx_data - Returns a pointer on the port context
+*
+* @hsi_port - port number to obtain context. Range [1, 2]
+*
+* Return value :* If success: pointer on the HSI port context requested
+*		* else NULL
+*/
+static struct hsi_port_ctx *hsi_get_hsi_port_ctx_data(int hsi_port)
+{
+	int i;
+
+	for (i = 0; i < omap_hsi_platform_data.num_ports; i++)
+		if (omap_hsi_platform_data.ctx->pctx[i].port_number == hsi_port)
+			return &omap_hsi_platform_data.ctx->pctx[i];
+
+	return NULL;
+}
+
 /**
 * omap_hsi_is_io_pad_hsi - Indicates if IO Pad has been muxed for HSI CAWAKE
 *
+* @hsi_port - port number to check for HSI muxing. Range [1, 2]
+*
 * Return value :* 0 if CAWAKE Padconf has not been found or CAWAKE not muxed for
 *		CAWAKE
 *		* else 1
 */
-static int omap_hsi_is_io_pad_hsi(void)
+static int omap_hsi_is_io_pad_hsi(int hsi_port)
 {
+	struct hsi_port_ctx *port_ctx;
 	u16 val;
 
+	port_ctx = hsi_get_hsi_port_ctx_data(hsi_port);
+	if (!port_ctx)
+		return 0;
+
 	/* Check for IO pad */
-	val = omap_mux_read_signal(OMAP_HSI_PADCONF_CAWAKE_PIN);
+	val = omap_mux_read_signal(port_ctx->cawake_padconf_name);
 	if (val == -ENODEV)
 		return 0;
 
 	/* Continue only if CAWAKE is muxed */
-	if ((val & OMAP_MUX_MODE_MASK) != OMAP_HSI_PADCONF_CAWAKE_MODE)
+	if ((val & OMAP_MUX_MODE_MASK) != port_ctx->cawake_padconf_hsi_mode)
 		return 0;
 
 	return 1;
@@ -192,26 +218,39 @@ static int omap_hsi_is_io_pad_hsi(void)
 /**
 * omap_hsi_is_io_wakeup_from_hsi - Indicates an IO wakeup from HSI CAWAKE
 *
+* @hsi_port - returns port number which triggered wakeup. Range [1, 2].
+*	      Only valid if return value is 1 (HSI wakeup detected)
+*
 * Return value :* 0 if CAWAKE Padconf has not been found or no IOWAKEUP event
-*		occured for CAWAKE
-*		* else 1
-* TODO : return value should indicate the HSI port which has awaken
+*		occured for CAWAKE.
+*		* 1 if HSI wakeup detected on port *hsi_port
 */
-int omap_hsi_is_io_wakeup_from_hsi(void)
+int omap_hsi_is_io_wakeup_from_hsi(int *hsi_port)
 {
+	struct hsi_port_ctx *port_ctx;
 	u16 val;
+	int i;
+
+	for (i = 0; i < omap_hsi_platform_data.num_ports; i++) {
+		port_ctx = &omap_hsi_platform_data.ctx->pctx[i];
 
 	/* Check for IO pad wakeup */
-	val = omap_mux_read_signal(OMAP_HSI_PADCONF_CAWAKE_PIN);
+		val = omap_mux_read_signal(port_ctx->cawake_padconf_name);
 	if (val == -ENODEV)
-		return 0;
+			continue;
 
 	/* Continue only if CAWAKE is muxed */
-	if ((val & OMAP_MUX_MODE_MASK) != OMAP_HSI_PADCONF_CAWAKE_MODE)
-		return 0;
+		if ((val & OMAP_MUX_MODE_MASK) !=
+					port_ctx->cawake_padconf_hsi_mode)
+			continue;
 
-	if (val & OMAP44XX_PADCONF_WAKEUPEVENT0)
+		if (val & OMAP44XX_PADCONF_WAKEUPEVENT0) {
+			*hsi_port = port_ctx->port_number;
 		return 1;
+		}
+	}
+
+	*hsi_port = 0;
 
 	return 0;
 }
@@ -220,50 +259,60 @@ int omap_hsi_is_io_wakeup_from_hsi(void)
 * omap_hsi_wakeup_enable - Enable HSI wakeup feature from RET/OFF mode
 *
 * @hsi_port - reference to the HSI port onto which enable wakeup feature.
+*	      Range [1, 2]
 *
 * Return value :* 0 if CAWAKE has been configured to wakeup platform
 *		* -ENODEV if CAWAKE is not muxed on padconf
 */
 static int omap_hsi_wakeup_enable(int hsi_port)
 {
+	struct hsi_port_ctx *port_ctx;
 	int ret = -ENODEV;
 
-	if (omap_hsi_is_io_pad_hsi())
-		ret = omap_mux_enable_wakeup(OMAP_HSI_PADCONF_CAWAKE_PIN);
-	else
-		pr_debug("Trying to enable HSI IO wakeup on non HSI board\n");
-
+	if (omap_hsi_is_io_pad_hsi(hsi_port)) {
+		port_ctx = hsi_get_hsi_port_ctx_data(hsi_port);
+		ret = omap_mux_enable_wakeup(port_ctx->cawake_padconf_name);
+		omap4_trigger_ioctrl();
+	} else {
+		pr_debug("HSI port %d not muxed, failed to enable IO wakeup\n",
+			 hsi_port);
+	}
 
-	/* TODO: handle hsi_port param and use it to find the correct Pad */
 	return ret;
 }
 
 /**
 * omap_hsi_wakeup_disable - Disable HSI wakeup feature from RET/OFF mode
 *
 * @hsi_port - reference to the HSI port onto which disable wakeup feature.
+*	      Range [1, 2]
 *
 * Return value :* 0 if CAWAKE has been configured to not wakeup platform
 *		* -ENODEV if CAWAKE is not muxed on padconf
 */
 static int omap_hsi_wakeup_disable(int hsi_port)
 {
+	struct hsi_port_ctx *port_ctx;
 	int ret = -ENODEV;
 
-	if (omap_hsi_is_io_pad_hsi())
-		ret = omap_mux_disable_wakeup(OMAP_HSI_PADCONF_CAWAKE_PIN);
-	else
-		pr_debug("Trying to disable HSI IO wakeup on non HSI board\n");
-
-
-	/* TODO: handle hsi_port param and use it to find the correct Pad */
+	if (omap_hsi_is_io_pad_hsi(hsi_port)) {
+		port_ctx = hsi_get_hsi_port_ctx_data(hsi_port);
+		ret = omap_mux_disable_wakeup(port_ctx->cawake_padconf_name);
+		omap4_trigger_ioctrl();
+	} else {
+		pr_debug("HSI port %d not muxed, failed to disable IO wakeup\n",
+			 hsi_port);
+	}
 
 	return ret;
 }
 
 /**
 * omap_hsi_prepare_suspend - Prepare HSI for suspend mode
 *
+* @hsi_port - reference to the HSI port. Range [1, 2]
+* @dev_may_wakeup - value of sysfs flag indicating device wakeup capability
+*
 * Return value :* 0 if CAWAKE padconf has been configured properly
 *		* -ENODEV if CAWAKE is not muxed on padconf.
 *
@@ -280,6 +329,24 @@ int omap_hsi_prepare_suspend(int hsi_port, bool dev_may_wakeup)
 	return ret;
 }
 
+/**
+* omap_hsi_io_wakeup_check - Check if IO wakeup is from HSI and schedule HSI
+*			     processing tasklet
+*
+* Return value : * 0 if HSI tasklet scheduled.
+*		 * negative value else.
+*/
+int omap_hsi_io_wakeup_check(void)
+{
+	int hsi_port, ret = -1;
+
+	/* Modem HSI wakeup */
+	if (omap_hsi_is_io_wakeup_from_hsi(&hsi_port))
+		ret = omap_hsi_wakeup(hsi_port);
+
+	return ret;
+}
+
 /**
 * omap_hsi_wakeup - Prepare HSI for wakeup from suspend mode (RET/OFF)
 *
@@ -293,6 +360,7 @@ int omap_hsi_wakeup(int hsi_port)
 {
 	static struct platform_device *pdev;
 	static struct hsi_dev *hsi_ctrl;
+	int i;
 
 	if (!pdev) {
 		pdev = hsi_get_hsi_platform_device();
@@ -301,7 +369,7 @@ int omap_hsi_wakeup(int hsi_port)
 	}
 
 	if (!device_may_wakeup(&pdev->dev)) {
-		dev_info(&pdev->dev, "Modem not allowed to wakeup platform");
+		dev_info(&pdev->dev, "Modem not allowed to wakeup platform\n");
 		return -EPERM;
 	}
 
@@ -311,20 +379,30 @@ int omap_hsi_wakeup(int hsi_port)
 			return -ENODEV;
 	}
 
+	for (i = 0; i < omap_hsi_platform_data.num_ports; i++) {
+		if (omap_hsi_platform_data.ctx->pctx[i].port_number == hsi_port)
+			break;
+	}
+
+	if (i == omap_hsi_platform_data.num_ports)
+		return -ENODEV;
+
+
 	/* Check no other interrupt handler has already scheduled the tasklet */
 	if (test_and_set_bit(HSI_FLAGS_TASKLET_LOCK,
-			     &hsi_ctrl->hsi_port->flags))
+			     &hsi_ctrl->hsi_port[i].flags))
 		return -EBUSY;
 
-	dev_dbg(hsi_ctrl->dev, "Modem wakeup detected from HSI CAWAKE Pad");
+	dev_dbg(hsi_ctrl->dev, "Modem wakeup detected from HSI CAWAKE Pad port "
+			       "%d\n", hsi_port);
 
 	/* CAWAKE falling or rising edge detected */
-	hsi_ctrl->hsi_port->cawake_off_event = true;
-		tasklet_hi_schedule(&hsi_ctrl->hsi_port->hsi_tasklet);
+	hsi_ctrl->hsi_port[i].cawake_off_event = true;
+	tasklet_hi_schedule(&hsi_ctrl->hsi_port[i].hsi_tasklet);
 
 	/* Disable interrupt until Bottom Half has cleared */
 	/* the IRQ status register */
-		disable_irq_nosync(hsi_ctrl->hsi_port->irq);
+	disable_irq_nosync(hsi_ctrl->hsi_port[i].irq);
 
 	 return 0;
 }

arch/arm/mach-omap2/pm44xx.c

@@ -929,6 +929,7 @@ static void omap_pm_clear_dsp_wake_up(void)
 static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id)
 {
 	u32 irqenable_mpu, irqstatus_mpu;
+	int hsi_port;
 
 	irqenable_mpu = omap4_prm_read_inst_reg(OMAP4430_PRM_OCP_SOCKET_INST,
 					 OMAP4_PRM_IRQENABLE_MPU_OFFSET);
@@ -938,9 +939,9 @@ static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id)
 	/* Check if a IO_ST interrupt */
 	if (irqstatus_mpu & OMAP4430_IO_ST_MASK) {
 		/* Check if HSI caused the IO wakeup */
-		if (omap_hsi_is_io_wakeup_from_hsi()) {
+		if (omap_hsi_is_io_wakeup_from_hsi(&hsi_port)) {
 			omap_pm_clear_dsp_wake_up();
-			omap_hsi_wakeup(0);
+			omap_hsi_wakeup(hsi_port);
 		}
 		omap_uart_resume_idle();
 		usbhs_wakeup();

arch/arm/plat-omap/include/plat/omap_hsi.h

@@ -484,16 +484,15 @@ extern int omap_hsi_config(struct omap_hsi_board_config *hsi_config);
 
 #ifdef CONFIG_OMAP_HSI
 extern int omap_hsi_prepare_suspend(int hsi_port, bool dev_may_wakeup);
-extern int omap_hsi_prepare_idle(void);
+extern int omap_hsi_io_wakeup_check(void);
 extern int omap_hsi_wakeup(int hsi_port);
-extern int omap_hsi_is_io_wakeup_from_hsi(void);
+extern int omap_hsi_is_io_wakeup_from_hsi(int *hsi_port);
 #else
 inline int omap_hsi_prepare_suspend(int hsi_port,
 					bool dev_may_wakeup) { return -ENOSYS; }
-inline int omap_hsi_prepare_idle(void) { return -ENOSYS; }
+inline int omap_hsi_io_wakeup_check(void) { return -ENOSYS; }
 inline int omap_hsi_wakeup(int hsi_port) { return -ENOSYS; }
-inline int omap_hsi_is_io_wakeup_from_hsi(void) { return -ENOSYS; }
-
+inline int omap_hsi_is_io_wakeup_from_hsi(int *hsi_port) { return -ENOSYS; }
 #endif
 
 #endif /* __OMAP_HSI_H__ */