Merge "msm: gpiomux: update gpiomux configuration for 8x26 QRD" (9a5521b3) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/board-8226-gpiomux.c

+19 −18

Original line number	Diff line number	Diff line
		@@ -233,8 +233,7 @@ static struct msm_gpiomux_config msm_synaptics_configs[] __initdata = {
		static struct gpiomux_setting gpio_nc_cfg = {
		.func = GPIOMUX_FUNC_GPIO,
		.drv = GPIOMUX_DRV_2MA,
		.pull = GPIOMUX_PULL_DOWN,
		.dir = GPIOMUX_OUT_LOW,
		.pull = GPIOMUX_PULL_NONE,
		};

		static struct gpiomux_setting goodix_ldo_en_act_cfg = {
		@@ -273,7 +272,7 @@ static struct gpiomux_setting goodix_reset_sus_cfg = {
		.pull = GPIOMUX_PULL_UP,
		};

		static struct msm_gpiomux_config msm_qrd_blsp_configs[] __initdata = {
		static struct msm_gpiomux_config msm_skuf_blsp_configs[] __initdata = {
		{
		.gpio = 2, /* NC */
		.settings = {
		@@ -300,7 +299,7 @@ static struct msm_gpiomux_config msm_qrd_blsp_configs[] __initdata = {
		},
		};

		static struct msm_gpiomux_config msm_qrd_goodix_configs[] __initdata = {
		static struct msm_gpiomux_config msm_skuf_goodix_configs[] __initdata = {
		{
		.gpio = 15, /* LDO EN */
		.settings = {
		@@ -356,8 +355,9 @@ static struct gpiomux_setting nfc_regc_act_cfg = {

		static struct gpiomux_setting nfc_regc_sus_cfg = {
		.func = GPIOMUX_FUNC_GPIO,
		.drv = GPIOMUX_DRV_6MA,
		.pull = GPIOMUX_PULL_UP,
		.drv = GPIOMUX_DRV_2MA,
		.pull = GPIOMUX_PULL_NONE,
		.dir = GPIOMUX_OUT_LOW,
		};

		static struct gpiomux_setting nfc_wake_act_cfg = {
		@@ -368,11 +368,12 @@ static struct gpiomux_setting nfc_wake_act_cfg = {

		static struct gpiomux_setting nfc_wake_sus_cfg = {
		.func = GPIOMUX_FUNC_GPIO,
		.drv = GPIOMUX_DRV_6MA,
		.pull = GPIOMUX_PULL_UP,
		.drv = GPIOMUX_DRV_2MA,
		.pull = GPIOMUX_PULL_NONE,
		.dir = GPIOMUX_OUT_LOW,
		};

		static struct msm_gpiomux_config msm_qrd_nfc_configs[] __initdata = {
		static struct msm_gpiomux_config msm_skuf_nfc_configs[] __initdata = {
		{ /* NFC LDO EN */
		.gpio = 0,
		.settings = {
		@@ -749,9 +750,9 @@ void __init msm8226_init_gpiomux(void)
		msm_gpiomux_install(msm_keypad_configs,
		ARRAY_SIZE(msm_keypad_configs));

		if (of_board_is_qrd())
		msm_gpiomux_install(msm_qrd_blsp_configs,
		ARRAY_SIZE(msm_qrd_blsp_configs));
		if (of_board_is_skuf())
		msm_gpiomux_install(msm_skuf_blsp_configs,
		ARRAY_SIZE(msm_skuf_blsp_configs));
		else
		msm_gpiomux_install(msm_blsp_configs,
		ARRAY_SIZE(msm_blsp_configs));
		@@ -760,16 +761,16 @@ void __init msm8226_init_gpiomux(void)
		ARRAY_SIZE(wcnss_5wire_interface));

		msm_gpiomux_install(&sd_card_det, 1);
		if (of_board_is_qrd())
		msm_gpiomux_install(msm_qrd_goodix_configs,
		ARRAY_SIZE(msm_qrd_goodix_configs));
		if (of_board_is_skuf())
		msm_gpiomux_install(msm_skuf_goodix_configs,
		ARRAY_SIZE(msm_skuf_goodix_configs));
		else
		msm_gpiomux_install(msm_synaptics_configs,
		ARRAY_SIZE(msm_synaptics_configs));

		if (of_board_is_qrd())
		msm_gpiomux_install(msm_qrd_nfc_configs,
		ARRAY_SIZE(msm_qrd_nfc_configs));
		if (of_board_is_skuf())
		msm_gpiomux_install(msm_skuf_nfc_configs,
		ARRAY_SIZE(msm_skuf_nfc_configs));

		msm_gpiomux_install_nowrite(msm_lcd_configs,
		ARRAY_SIZE(msm_lcd_configs));