msm: 8064: Add support for GSBI4 based UARTDM
GSBI4 based UARTDM is used for primary IPC between APPS
and QSC on 8064 SGLTE2 platform. Hence add required resources
and configuration (i.e. GSBI4 UARTDM as platform device, clocks,
interrupts, DMA channels) for GSBI4 based UARTDM and enable the
same for 8064 SGLTE2 platform.
Change-Id: I3623e4b09d6d3e2d344f1fb7fbbbce75fe008ff4
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8064-gpiomux.c b/arch/arm/mach-msm/board-8064-gpiomux.c
index b8e12d0..876cb23 100644
--- a/arch/arm/mach-msm/board-8064-gpiomux.c
+++ b/arch/arm/mach-msm/board-8064-gpiomux.c
@@ -1383,6 +1383,49 @@
},
};
+static struct gpiomux_setting gsbi4_uartdm_active = {
+ .func = GPIOMUX_FUNC_1,
+ .drv = GPIOMUX_DRV_8MA,
+ .pull = GPIOMUX_PULL_NONE,
+};
+
+static struct gpiomux_setting gsbi4_uartdm_suspended = {
+ .func = GPIOMUX_FUNC_GPIO,
+ .drv = GPIOMUX_DRV_2MA,
+ .pull = GPIOMUX_PULL_DOWN,
+};
+
+static struct msm_gpiomux_config apq8064_uartdm_gsbi4_configs[] __initdata = {
+ {
+ .gpio = 11, /* GSBI4 UARTDM RX */
+ .settings = {
+ [GPIOMUX_ACTIVE] = &gsbi4_uartdm_active,
+ [GPIOMUX_SUSPENDED] = &gsbi4_uartdm_suspended,
+ },
+ },
+ {
+ .gpio = 10, /* GSBI4 UARTDM TX */
+ .settings = {
+ [GPIOMUX_ACTIVE] = &gsbi4_uartdm_active,
+ [GPIOMUX_SUSPENDED] = &gsbi4_uartdm_suspended,
+ },
+ },
+ {
+ .gpio = 13, /* GSBI4 UARTDM RFR */
+ .settings = {
+ [GPIOMUX_ACTIVE] = &gsbi4_uartdm_active,
+ [GPIOMUX_SUSPENDED] = &gsbi4_uartdm_suspended,
+ },
+ },
+ {
+ .gpio = 12, /* GSBI4 UARTDM CTS */
+ .settings = {
+ [GPIOMUX_ACTIVE] = &gsbi4_uartdm_active,
+ [GPIOMUX_SUSPENDED] = &gsbi4_uartdm_suspended,
+ },
+ },
+};
+
void __init apq8064_init_gpiomux(void)
{
int rc;
@@ -1453,6 +1496,10 @@
ARRAY_SIZE(mdm_configs));
msm_gpiomux_install(sglte2_qsc_configs,
ARRAY_SIZE(sglte2_qsc_configs));
+
+ /* GSBI4 UART GPIOs for Primary IPC */
+ msm_gpiomux_install(apq8064_uartdm_gsbi4_configs,
+ ARRAY_SIZE(apq8064_uartdm_gsbi4_configs));
} else if (SOCINFO_VERSION_MINOR(platform_version) == 1) {
msm_gpiomux_install(mdm_i2s_configs,
ARRAY_SIZE(mdm_i2s_configs));
diff --git a/arch/arm/mach-msm/board-8064.c b/arch/arm/mach-msm/board-8064.c
index c125332..7fef77c 100644
--- a/arch/arm/mach-msm/board-8064.c
+++ b/arch/arm/mach-msm/board-8064.c
@@ -75,6 +75,7 @@
#include <mach/msm_pcie.h>
#include <mach/restart.h>
#include <mach/msm_iomap.h>
+#include <mach/msm_serial_hs.h>
#include "msm_watchdog.h"
#include "board-8064.h"
@@ -2394,7 +2395,6 @@
static struct platform_device *common_not_mpq_devices[] __initdata = {
&apq8064_device_qup_i2c_gsbi1,
&apq8064_device_qup_i2c_gsbi3,
- &apq8064_device_qup_i2c_gsbi4,
};
static struct platform_device *early_common_devices[] __initdata = {
@@ -2728,8 +2728,13 @@
&apq8064_i2c_qup_gsbi3_pdata;
apq8064_device_qup_i2c_gsbi1.dev.platform_data =
&apq8064_i2c_qup_gsbi1_pdata;
- apq8064_device_qup_i2c_gsbi4.dev.platform_data =
+
+ /* Add GSBI4 I2C pdata for non-fusion3 SGLTE2 */
+ if (socinfo_get_platform_subtype() !=
+ PLATFORM_SUBTYPE_SGLTE2) {
+ apq8064_device_qup_i2c_gsbi4.dev.platform_data =
&apq8064_i2c_qup_gsbi4_pdata;
+ }
mpq8064_device_qup_i2c_gsbi5.dev.platform_data =
&mpq8064_i2c_qup_gsbi5_pdata;
}
@@ -3194,6 +3199,38 @@
cdp_keys_data.nbuttons = ARRAY_SIZE(cdp_keys_pm8917);
}
+#ifdef CONFIG_SERIAL_MSM_HS
+static int configure_uartdm_gsbi4_gpios(int on)
+{
+ int ret = 0, i;
+ int uart_gpios[] = {10, 11, 12, 13};
+
+ for (i = 0; i < ARRAY_SIZE(uart_gpios); i++) {
+ if (on) {
+ ret = gpio_request(uart_gpios[i], NULL);
+ if (ret) {
+ pr_err("%s: unable to request uart gpio[%d]\n",
+ __func__, uart_gpios[i]);
+ break;
+ }
+ } else {
+ gpio_free(uart_gpios[i]);
+ }
+ }
+
+ if (ret && on && i)
+ for (; i >= 0; i--)
+ gpio_free(uart_gpios[i]);
+ return ret;
+}
+
+static struct msm_serial_hs_platform_data apq8064_uartdm_gsbi4_pdata = {
+ .gpio_config = configure_uartdm_gsbi4_gpios,
+};
+#else
+static struct msm_serial_hs_platform_data apq8064_uartdm_gsbi4_pdata;
+#endif
+
static void __init apq8064_common_init(void)
{
u32 platform_version = socinfo_get_platform_version();
@@ -3243,9 +3280,17 @@
ARRAY_SIZE(pm8917_common_devices));
platform_add_devices(common_devices, ARRAY_SIZE(common_devices));
if (!(machine_is_mpq8064_cdp() || machine_is_mpq8064_hrd() ||
- machine_is_mpq8064_dtv()))
+ machine_is_mpq8064_dtv())) {
platform_add_devices(common_not_mpq_devices,
ARRAY_SIZE(common_not_mpq_devices));
+
+ /* Add GSBI4 I2C Device for non-fusion3 platform */
+ if (socinfo_get_platform_subtype() !=
+ PLATFORM_SUBTYPE_SGLTE2) {
+ platform_device_register(&apq8064_device_qup_i2c_gsbi4);
+ }
+ }
+
msm_hsic_pdata.swfi_latency =
msm_rpmrs_levels[0].latency_us;
if (machine_is_apq8064_mtp()) {
@@ -3277,6 +3322,12 @@
sglte2_qsc_8064_device.dev.platform_data =
&sglte2_qsc_platform_data;
platform_device_register(&sglte2_qsc_8064_device);
+
+ /* GSBI4 UART device for Primay IPC */
+ apq8064_uartdm_gsbi4_pdata.wakeup_irq = gpio_to_irq(10);
+ apq8064_device_uartdm_gsbi4.dev.platform_data =
+ &apq8064_uartdm_gsbi4_pdata;
+ platform_device_register(&apq8064_device_uartdm_gsbi4);
} else if (SOCINFO_VERSION_MINOR(platform_version) == 1) {
i2s_mdm_8064_device.dev.platform_data =
&mdm_platform_data;
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 3789529..df9c1b9 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -5307,7 +5307,7 @@
#ifdef CONFIG_MACH_LGE
CLK_LOOKUP("core_clk", gsbi4_uart_clk.c, "msm_serial_hsl.0"),
#else
- CLK_LOOKUP("core_clk", gsbi4_uart_clk.c, ""),
+ CLK_LOOKUP("core_clk", gsbi4_uart_clk.c, "msm_serial_hs.1"),
#endif
CLK_LOOKUP("core_clk", gsbi5_uart_clk.c, ""),
CLK_LOOKUP("core_clk", gsbi6_uart_clk.c, ""),
@@ -5369,6 +5369,7 @@
CLK_LOOKUP("iface_clk", gsbi4_p_clk.c, "msm_serial_hsl.0"),
#endif
CLK_LOOKUP("iface_clk", gsbi4_p_clk.c, "qup_i2c.4"),
+ CLK_LOOKUP("iface_clk", gsbi4_p_clk.c, "msm_serial_hs.1"),
CLK_LOOKUP("iface_clk", gsbi5_p_clk.c, "spi_qsd.0"),
CLK_LOOKUP("iface_clk", gsbi5_p_clk.c, "qup_i2c.5"),
CLK_LOOKUP("iface_clk", gsbi6_p_clk.c, ""),
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index 60ce99b..fb59c40 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -336,6 +336,50 @@
.resource = resources_uart_gsbi4,
};
+/* GSBI 4 used into UARTDM Mode for 8064 SGLTE */
+static struct resource msm_uart_dm4_resources[] = {
+ {
+ .start = MSM_UART4DM_PHYS,
+ .end = MSM_UART4DM_PHYS + PAGE_SIZE - 1,
+ .name = "uartdm_resource",
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = GSBI4_UARTDM_IRQ,
+ .end = GSBI4_UARTDM_IRQ,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = MSM_GSBI4_PHYS,
+ .end = MSM_GSBI4_PHYS + 4 - 1,
+ .name = "gsbi_resource",
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = DMOV_APQ8064_HSUART_GSBI4_TX_CHAN,
+ .end = DMOV_APQ8064_HSUART_GSBI4_RX_CHAN,
+ .name = "uartdm_channels",
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .start = DMOV_APQ8064_HSUART_GSBI4_TX_CRCI,
+ .end = DMOV_APQ8064_HSUART_GSBI4_RX_CRCI,
+ .name = "uartdm_crci",
+ .flags = IORESOURCE_DMA,
+ },
+};
+static u64 msm_uart_dm4_dma_mask = DMA_BIT_MASK(32);
+struct platform_device apq8064_device_uartdm_gsbi4 = {
+ .name = "msm_serial_hs",
+ .id = 1,
+ .num_resources = ARRAY_SIZE(msm_uart_dm4_resources),
+ .resource = msm_uart_dm4_resources,
+ .dev = {
+ .dma_mask = &msm_uart_dm4_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
+};
+
static struct resource resources_qup_i2c_gsbi4[] = {
{
.name = "gsbi_qup_i2c_addr",
diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
index b795371..54f1300 100644
--- a/arch/arm/mach-msm/devices.h
+++ b/arch/arm/mach-msm/devices.h
@@ -85,6 +85,7 @@
extern struct platform_device apq8064_device_uart_gsbi1;
extern struct platform_device apq8064_device_uart_gsbi3;
extern struct platform_device apq8064_device_uart_gsbi4;
+extern struct platform_device apq8064_device_uartdm_gsbi4;
extern struct platform_device apq8064_device_uart_gsbi7;
extern struct platform_device apq8064_device_qup_i2c_gsbi1;
extern struct platform_device apq8064_device_qup_i2c_gsbi3;
diff --git a/arch/arm/mach-msm/include/mach/dma.h b/arch/arm/mach-msm/include/mach/dma.h
index 5eb9754..05a13ba 100644
--- a/arch/arm/mach-msm/include/mach/dma.h
+++ b/arch/arm/mach-msm/include/mach/dma.h
@@ -272,6 +272,13 @@
#define DMOV8064_TSIF_CHAN 2
#define DMOV8064_TSIF_CRCI 1
+/* channels for APQ8064 SGLTE*/
+#define DMOV_APQ8064_HSUART_GSBI4_TX_CHAN 11
+#define DMOV_APQ8064_HSUART_GSBI4_TX_CRCI 8
+
+#define DMOV_APQ8064_HSUART_GSBI4_RX_CHAN 10
+#define DMOV_APQ8064_HSUART_GSBI4_RX_CRCI 7
+
/* no client rate control ifc (eg, ram) */
#define DMOV_NONE_CRCI 0