msm: 8930: i2c gpio changes for QRD SGLTE
I2C camera which uses the gpios 20, 21 (connected to gsbi4)
is moved to gpios 36, 37 (connected to gsbi8).
Also gpios 95, 96 (connected to gsbi9) which were used for
touch screen I2C communication, are now used for IPC
communication (over UART) on SGLTE platform.
Hence, the gsbi4 and gsbi9 are removed from i2c device init
and gsbi8 is added for I2C camera.
Change-Id: I84de4871a00015bc79bd256e7c71848ef84d71df
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8930-gpiomux.c b/arch/arm/mach-msm/board-8930-gpiomux.c
index b495ee7..78046d7 100644
--- a/arch/arm/mach-msm/board-8930-gpiomux.c
+++ b/arch/arm/mach-msm/board-8930-gpiomux.c
@@ -424,6 +424,78 @@
},
};
+static struct msm_gpiomux_config msm8930_sglte_gsbi_configs[] __initdata = {
+ /* Add the I2C/SPI GPIOs Here */
+ {
+ .gpio = 6, /* GSBI1 TX */
+ .settings = {
+ [GPIOMUX_SUSPENDED] = &spi_suspended_config,
+ [GPIOMUX_ACTIVE] = &spi_active,
+ },
+ },
+ {
+ .gpio = 7, /* GSBI1 RX */
+ .settings = {
+ [GPIOMUX_SUSPENDED] = &spi_suspended_config,
+ [GPIOMUX_ACTIVE] = &spi_active,
+ },
+ },
+ {
+ .gpio = 8, /* GSBI1 CTS_N */
+ .settings = {
+ [GPIOMUX_SUSPENDED] = &spi_suspended_config,
+ [GPIOMUX_ACTIVE] = &spi_active,
+ },
+ },
+ {
+ .gpio = 9, /* GSBI1 RFR_N */
+ .settings = {
+ [GPIOMUX_SUSPENDED] = &spi_suspended_config,
+ [GPIOMUX_ACTIVE] = &spi_active,
+ },
+ },
+ {
+ .gpio = 16, /* GSBI3 I2C QUP SDA */
+ .settings = {
+ [GPIOMUX_SUSPENDED] = &gsbi3_suspended_cfg,
+ [GPIOMUX_ACTIVE] = &gsbi3_active_cfg,
+ },
+ },
+ {
+ .gpio = 17, /* GSBI3 I2C QUP SCL */
+ .settings = {
+ [GPIOMUX_SUSPENDED] = &gsbi3_suspended_cfg,
+ [GPIOMUX_ACTIVE] = &gsbi3_active_cfg,
+ },
+ },
+ {
+ .gpio = 44, /* GSBI12 I2C QUP SDA */
+ .settings = {
+ [GPIOMUX_SUSPENDED] = &gsbi12,
+ },
+ },
+ {
+ .gpio = 45, /* GSBI12 I2C QUP SCL */
+ .settings = {
+ [GPIOMUX_SUSPENDED] = &gsbi12,
+ },
+ },
+ {
+ .gpio = 73, /* GSBI10 I2C QUP SDA */
+ .settings = {
+ [GPIOMUX_SUSPENDED] = &gsbi10,
+ },
+ },
+ {
+ .gpio = 74, /* GSBI10 I2C QUP SCL */
+ .settings = {
+ [GPIOMUX_SUSPENDED] = &gsbi10,
+ },
+ },
+
+};
+
+
static struct msm_gpiomux_config msm8960_slimbus_config[] __initdata = {
{
.gpio = 60, /* slimbus data */
@@ -864,6 +936,9 @@
msm_gpiomux_install(sglte_8930_configs,
ARRAY_SIZE(sglte_8930_configs));
+ msm_gpiomux_install(msm8930_sglte_gsbi_configs,
+ ARRAY_SIZE(msm8930_sglte_gsbi_configs));
+
msm_gpiomux_install(msm8960_slimbus_config,
ARRAY_SIZE(msm8960_slimbus_config));
diff --git a/arch/arm/mach-msm/board-8930.c b/arch/arm/mach-msm/board-8930.c
index 343c7f8..d4ea596 100644
--- a/arch/arm/mach-msm/board-8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -2182,6 +2182,11 @@
.src_clk_rate = 24000000,
};
+
+static struct msm_i2c_platform_data msm8960_i2c_qup_gsbi8_pdata = {
+ .clk_freq = 100000,
+ .src_clk_rate = 24000000,
+};
static struct msm_i2c_platform_data msm8960_i2c_qup_gsbi9_pdata = {
.clk_freq = 100000,
.src_clk_rate = 24000000,
@@ -2345,6 +2350,15 @@
&msm8960_device_ssbi_pmic,
};
+static struct platform_device *i2c_qup_devices[] __initdata = {
+ &msm8960_device_qup_i2c_gsbi4,
+ &msm8960_device_qup_i2c_gsbi9,
+};
+
+static struct platform_device *i2c_qup_sglte_devices[] __initdata = {
+ &msm8960_device_qup_i2c_gsbi8,
+};
+
static struct platform_device *common_devices[] __initdata = {
&msm_8960_q6_lpass,
&msm_8960_q6_mss_fw,
@@ -2354,8 +2368,6 @@
&msm_pil_vidc,
&msm8960_device_qup_spi_gsbi1,
&msm8960_device_qup_i2c_gsbi3,
- &msm8960_device_qup_i2c_gsbi4,
- &msm8960_device_qup_i2c_gsbi9,
&msm8960_device_qup_i2c_gsbi10,
&msm8960_device_qup_i2c_gsbi12,
&msm_slim_ctrl,
@@ -2471,8 +2483,11 @@
msm8960_device_qup_i2c_gsbi3.dev.platform_data =
&msm8960_i2c_qup_gsbi3_pdata;
-
- msm8960_device_qup_i2c_gsbi9.dev.platform_data =
+ if (socinfo_get_platform_subtype() == PLATFORM_SUBTYPE_SGLTE)
+ msm8960_device_qup_i2c_gsbi8.dev.platform_data =
+ &msm8960_i2c_qup_gsbi8_pdata;
+ else
+ msm8960_device_qup_i2c_gsbi9.dev.platform_data =
&msm8960_i2c_qup_gsbi9_pdata;
msm8960_device_qup_i2c_gsbi10.dev.platform_data =
@@ -2693,7 +2708,7 @@
static struct i2c_registry msm8960_i2c_devices[] __initdata = {
#ifdef CONFIG_ISL9519_CHARGER
{
- I2C_LIQUID,
+ I2C_LIQUID | I2C_EVT,
MSM_8930_GSBI10_QUP_I2C_BUS_ID,
isl_charger_i2c_info,
ARRAY_SIZE(isl_charger_i2c_info),
@@ -2701,7 +2716,7 @@
#endif /* CONFIG_ISL9519_CHARGER */
#ifdef CONFIG_INPUT_MPU3050
{
- I2C_FFA | I2C_FLUID,
+ I2C_FFA | I2C_FLUID | I2C_EVT,
MSM_8930_GSBI12_QUP_I2C_BUS_ID,
mpu3050_i2c_boardinfo,
ARRAY_SIZE(mpu3050_i2c_boardinfo),
@@ -2714,7 +2729,7 @@
ARRAY_SIZE(msm_isa1200_board_info),
},
{
- I2C_SURF | I2C_FFA | I2C_FLUID,
+ I2C_SURF | I2C_FFA | I2C_FLUID | I2C_EVT,
MSM_8930_GSBI3_QUP_I2C_BUS_ID,
mxt_device_info_8930,
ARRAY_SIZE(mxt_device_info_8930),
@@ -2727,7 +2742,7 @@
},
#ifdef CONFIG_STM_LIS3DH
{
- I2C_FFA | I2C_FLUID,
+ I2C_FFA | I2C_FLUID | I2C_EVT,
MSM_8930_GSBI12_QUP_I2C_BUS_ID,
lis3dh_i2c_boardinfo,
ARRAY_SIZE(lis3dh_i2c_boardinfo),
@@ -2735,7 +2750,7 @@
#endif
#ifdef CONFIG_BMP18X_I2C
{
- I2C_FFA | I2C_FLUID,
+ I2C_FFA | I2C_FLUID | I2C_EVT,
MSM_8930_GSBI12_QUP_I2C_BUS_ID,
bmp18x_i2c_boardinfo,
ARRAY_SIZE(bmp18x_i2c_boardinfo),
@@ -2758,6 +2773,11 @@
msm8930_camera_board_info.board_info,
msm8930_camera_board_info.num_i2c_board_info,
};
+ if (machine_is_msm8930_evt() &&
+ (socinfo_get_platform_subtype() == PLATFORM_SUBTYPE_SGLTE)) {
+ msm8930_camera_i2c_devices.machs |= I2C_EVT;
+ msm8930_camera_i2c_devices.bus = MSM_8930_GSBI8_QUP_I2C_BUS_ID;
+ }
#endif
/* Build the matching 'supported_machs' bitmask */
@@ -2935,6 +2955,16 @@
platform_add_devices(pmic_pm8917_devices,
ARRAY_SIZE(pmic_pm8917_devices));
platform_add_devices(common_devices, ARRAY_SIZE(common_devices));
+ if (machine_is_msm8930_evt() &&
+ (socinfo_get_platform_subtype() == PLATFORM_SUBTYPE_SGLTE)) {
+ /* Removing GSBI4 and GSBI9 and initializing GSBI8
+ * as per SGLTE platform requirement */
+ platform_add_devices(i2c_qup_sglte_devices,
+ ARRAY_SIZE(i2c_qup_sglte_devices));
+ } else {
+ platform_add_devices(i2c_qup_devices,
+ ARRAY_SIZE(i2c_qup_devices));
+ }
msm8930_add_vidc_device();
/*
* TODO: When physical 8930/PM8038 hardware becomes
diff --git a/arch/arm/mach-msm/board-8930.h b/arch/arm/mach-msm/board-8930.h
index 0c1b105..cb9398c 100644
--- a/arch/arm/mach-msm/board-8930.h
+++ b/arch/arm/mach-msm/board-8930.h
@@ -158,6 +158,7 @@
#define MSM_8930_GSBI3_QUP_I2C_BUS_ID 3
#define MSM_8930_GSBI4_QUP_I2C_BUS_ID 4
+#define MSM_8930_GSBI8_QUP_I2C_BUS_ID 8
#define MSM_8930_GSBI9_QUP_I2C_BUS_ID 0
#define MSM_8930_GSBI10_QUP_I2C_BUS_ID 10
#define MSM_8930_GSBI12_QUP_I2C_BUS_ID 12
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index 84b72d0..3713e21 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -1734,6 +1734,34 @@
.resource = resources_qup_i2c_gsbi4,
};
+static struct resource resources_qup_i2c_gsbi8[] = {
+ {
+ .name = "gsbi_qup_i2c_addr",
+ .start = MSM_GSBI8_PHYS,
+ .end = MSM_GSBI8_PHYS + 4 - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .name = "qup_phys_addr",
+ .start = MSM_GSBI8_QUP_PHYS,
+ .end = MSM_GSBI8_QUP_PHYS + MSM_QUP_SIZE - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .name = "qup_err_intr",
+ .start = GSBI8_QUP_IRQ,
+ .end = GSBI8_QUP_IRQ,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+struct platform_device msm8960_device_qup_i2c_gsbi8 = {
+ .name = "qup_i2c",
+ .id = 8,
+ .num_resources = ARRAY_SIZE(resources_qup_i2c_gsbi8),
+ .resource = resources_qup_i2c_gsbi8,
+};
+
static struct resource resources_qup_i2c_gsbi3[] = {
{
.name = "gsbi_qup_i2c_addr",
diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
index 54f1300..ae365af 100644
--- a/arch/arm/mach-msm/devices.h
+++ b/arch/arm/mach-msm/devices.h
@@ -62,6 +62,7 @@
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;
+extern struct platform_device msm8960_device_qup_i2c_gsbi8;
extern struct platform_device msm8960_device_qup_i2c_gsbi9;
extern struct platform_device msm8960_device_qup_i2c_gsbi10;
extern struct platform_device msm8960_device_qup_i2c_gsbi12;