msm8930 sglte: Add support for GSBI10 for serial console
This change adds GSBI10 UARTDM device and required resource
(its GPIOs and clocks) with their configurations for 8930
SGLTE EVT1 for serial console functionality.
CRs-Fixed: 459320
Change-Id: I14b9300c1a92cba5c1477aa35be0c83d4b46730f
Signed-off-by: Saket Saurabh <ssaurabh@codeaurora.org>
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8930-gpiomux.c b/arch/arm/mach-msm/board-8930-gpiomux.c
index 53432e1..b35be55 100644
--- a/arch/arm/mach-msm/board-8930-gpiomux.c
+++ b/arch/arm/mach-msm/board-8930-gpiomux.c
@@ -18,6 +18,28 @@
#include "devices.h"
#include "board-8930.h"
+/* GSBI10 UART configurations */
+static struct gpiomux_setting gsbi10_uart_cfg = {
+ .func = GPIOMUX_FUNC_2,
+ .drv = GPIOMUX_DRV_8MA,
+ .pull = GPIOMUX_PULL_NONE,
+};
+
+static struct msm_gpiomux_config msm8930_gsbi10_uart_configs[] __initdata = {
+ {
+ .gpio = 71, /* GSBI10 UART TX */
+ .settings = {
+ [GPIOMUX_SUSPENDED] = &gsbi10_uart_cfg,
+ },
+ },
+ {
+ .gpio = 72, /* GSBI10 UART RX */
+ .settings = {
+ [GPIOMUX_SUSPENDED] = &gsbi10_uart_cfg,
+ },
+ },
+};
+
/* The SPI configurations apply to GSBI 1*/
static struct gpiomux_setting spi_active = {
.func = GPIOMUX_FUNC_1,
@@ -1005,9 +1027,19 @@
int __init sglte8930_init_gpiomux(void)
{
+ int minor_ver = SOCINFO_VERSION_MINOR(socinfo_get_platform_version());
+ int major_ver = SOCINFO_VERSION_MAJOR(socinfo_get_platform_version());
+
/* For 8960 Fusion 2.2 Primary IPC */
msm_gpiomux_install(msm8930_fusion_gsbi_configs,
ARRAY_SIZE(msm8930_fusion_gsbi_configs));
+ /* For 8930 SGLTE Serial Console */
+ if (machine_is_msm8930_evt() && major_ver == 1) {
+ if (minor_ver == 0)
+ msm_gpiomux_install(msm8930_gsbi10_uart_configs,
+ ARRAY_SIZE(msm8930_gsbi10_uart_configs));
+ }
+
/* For SGLTE 8960 Fusion External VFR */
msm_gpiomux_install(msm8930_external_vfr_configs,
ARRAY_SIZE(msm8930_external_vfr_configs));
diff --git a/arch/arm/mach-msm/board-8930.c b/arch/arm/mach-msm/board-8930.c
index 5e26455..6ad1cb9 100644
--- a/arch/arm/mach-msm/board-8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -2360,7 +2360,6 @@
static struct platform_device *early_common_devices[] __initdata = {
&msm8960_device_dmov,
&msm_device_smd,
- &msm8960_device_uart_gsbi5,
&msm_device_uart_dm6,
&msm_device_saw_core0,
&msm_device_saw_core1,
@@ -2510,8 +2509,27 @@
&msm_lowlatency_pcm,
};
+#define GSBI_DUAL_MODE_CODE 0x60
+#define MSM_GSBI10_PHYS 0x1A200000
+
static void __init msm8930_i2c_init(void)
{
+ int minor_ver = SOCINFO_VERSION_MINOR(socinfo_get_platform_version());
+ int major_ver = SOCINFO_VERSION_MAJOR(socinfo_get_platform_version());
+ void __iomem *gsbi_mem;
+
+ if (machine_is_msm8930_evt() &&
+ (socinfo_get_platform_subtype() == PLATFORM_SUBTYPE_SGLTE)) {
+ if (major_ver == 1 && minor_ver == 0) {
+ gsbi_mem = ioremap_nocache(MSM_GSBI10_PHYS, 4);
+ writel_relaxed(GSBI_DUAL_MODE_CODE, gsbi_mem);
+ /* Ensure protocol code is written before proceeding */
+ wmb();
+ iounmap(gsbi_mem);
+ msm8960_i2c_qup_gsbi10_pdata.use_gsbi_shared_mode = 1;
+ }
+ }
+
msm8960_device_qup_i2c_gsbi4.dev.platform_data =
&msm8960_i2c_qup_gsbi4_pdata;
@@ -2930,6 +2948,8 @@
static void __init msm8930_cdp_init(void)
{
int i, reg_size = 0;
+ int minor_ver = SOCINFO_VERSION_MINOR(socinfo_get_platform_version());
+ int major_ver = SOCINFO_VERSION_MAJOR(socinfo_get_platform_version());
if (socinfo_get_pmic_model() == PMIC_MODEL_PM8917)
msm8930_pm8917_pdata_fixup();
if (meminfo_init(SYS_MEMORY, SZ_256M) < 0)
@@ -2985,6 +3005,17 @@
msm_device_uart_dm9.dev.platform_data = &msm_uart_dm9_pdata;
#endif
platform_device_register(&msm_device_uart_dm9);
+
+ /* For 8930 SGLTE serial console */
+ if (major_ver == 1) {
+ if (minor_ver == 0)
+ /* Add UART Serial for EVT1 device */
+ platform_device_register(
+ &msm8930_device_uart_gsbi10);
+ }
+ } else {
+ /* For 8930 Standalone serial console */
+ platform_device_register(&msm8960_device_uart_gsbi5);
}
msm_otg_pdata.phy_init_seq = hsusb_phy_init_seq;
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index e802bf2..1f5d624 100755
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -6044,8 +6044,9 @@
CLK_LOOKUP("core_clk", gsbi8_uart_clk.c, ""),
/* used on 8930 SGLTE for Primary IPC */
CLK_LOOKUP("core_clk", gsbi9_uart_clk.c, "msm_serial_hs.1"),
- CLK_LOOKUP("core_clk", gsbi10_uart_clk.c, ""),
- CLK_LOOKUP("core_clk", gsbi11_uart_clk.c, ""),
+ /* used on 8930 SGLTE for serial console */
+ CLK_LOOKUP("core_clk", gsbi10_uart_clk.c, "msm_serial_hsl.1"),
+ CLK_LOOKUP("core_clk", gsbi11_uart_clk.c, ""),
CLK_LOOKUP("core_clk", gsbi12_uart_clk.c, ""),
CLK_LOOKUP("core_clk", gsbi1_qup_clk.c, "spi_qsd.0"),
CLK_LOOKUP("core_clk", gsbi2_qup_clk.c, ""),
@@ -6100,7 +6101,9 @@
CLK_LOOKUP("iface_clk", gsbi9_p_clk.c, "msm_serial_hs.1"),
CLK_LOOKUP("iface_clk", gsbi9_p_clk.c, "qup_i2c.0"),
CLK_LOOKUP("iface_clk", gsbi10_p_clk.c, "qup_i2c.10"),
- CLK_LOOKUP("iface_clk", gsbi11_p_clk.c, ""),
+ /* used on 8930 SGLTE for serial console */
+ CLK_LOOKUP("iface_clk", gsbi10_p_clk.c, "msm_serial_hsl.1"),
+ CLK_LOOKUP("iface_clk", gsbi11_p_clk.c, ""),
CLK_LOOKUP("iface_clk", gsbi12_p_clk.c, "qup_i2c.12"),
CLK_LOOKUP("iface_clk", tsif_p_clk.c, ""),
CLK_LOOKUP("iface_clk", usb_fs1_p_clk.c, ""),
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index 8663620..812ebf6 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -76,11 +76,13 @@
#define MSM_GSBI11_PHYS 0x12440000
#define MSM_GSBI12_PHYS 0x12480000
+/* GSBI UART devices */
#define MSM_UART2DM_PHYS (MSM_GSBI2_PHYS + 0x40000)
#define MSM_UART5DM_PHYS (MSM_GSBI5_PHYS + 0x40000)
#define MSM_UART6DM_PHYS (MSM_GSBI6_PHYS + 0x40000)
#define MSM_UART8DM_PHYS (MSM_GSBI8_PHYS + 0x40000)
#define MSM_UART9DM_PHYS (MSM_GSBI9_PHYS + 0x40000)
+#define MSM_UART10DM_PHYS (MSM_GSBI10_PHYS + 0x40000)
/* GSBI QUP devices */
#define MSM_GSBI1_QUP_PHYS (MSM_GSBI1_PHYS + 0x80000)
@@ -412,6 +414,37 @@
},
};
+/* GSBI10 used for serial console on 8930 SGLTE*/
+static struct msm_serial_hslite_platform_data uart_gsbi10_pdata;
+
+static struct resource resources_uart_gsbi10[] = {
+ {
+ .start = GSBI10_UARTDM_IRQ,
+ .end = GSBI10_UARTDM_IRQ,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = MSM_UART10DM_PHYS,
+ .end = MSM_UART10DM_PHYS + PAGE_SIZE - 1,
+ .name = "uartdm_resource",
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = MSM_GSBI10_PHYS,
+ .end = MSM_GSBI10_PHYS + PAGE_SIZE - 1,
+ .name = "gsbi_resource",
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+struct platform_device msm8930_device_uart_gsbi10 = {
+ .name = "msm_serial_hsl",
+ .id = 1,
+ .num_resources = ARRAY_SIZE(resources_uart_gsbi10),
+ .resource = resources_uart_gsbi10,
+ .dev.platform_data = &uart_gsbi10_pdata,
+};
+
static struct resource resources_uart_gsbi5[] = {
{
.start = GSBI5_UARTDM_IRQ,
diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
index bf7cb2b..7493978 100644
--- a/arch/arm/mach-msm/devices.h
+++ b/arch/arm/mach-msm/devices.h
@@ -60,6 +60,7 @@
extern struct platform_device msm8960_device_uart_gsbi2;
extern struct platform_device msm8960_device_uart_gsbi5;
extern struct platform_device msm8960_device_uart_gsbi8;
+extern struct platform_device msm8930_device_uart_gsbi10;
extern struct platform_device msm8960_device_ssbi_pmic;
extern struct platform_device msm8960_device_qup_i2c_gsbi3;
extern struct platform_device msm8960_device_qup_i2c_gsbi4;