Merge "msm: mpq8092: GENI-IR platform support" (19f6c6f4) · Commits · e / devices / android_kernel_sony_msm8994

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

+32 −0

Original line number	Diff line number	Diff line
		@@ -340,6 +340,36 @@ static struct msm_gpiomux_config msm_hdmi_configs[] __initdata = {
		},
		};

		static struct gpiomux_setting geni_ir_tx_config = {
		.func = GPIOMUX_FUNC_4,
		.drv = GPIOMUX_DRV_16MA,
		.pull = GPIOMUX_PULL_NONE,
		.dir = GPIOMUX_OUT_LOW,
		};

		static struct gpiomux_setting geni_ir_rx_config = {
		.func = GPIOMUX_FUNC_4,
		.drv = GPIOMUX_DRV_2MA,
		.pull = GPIOMUX_PULL_NONE,
		};

		static struct msm_gpiomux_config msm_geni_ir_configs[] __initdata = {
		{
		.gpio = 8, /* GENI_IR_TX */
		.settings = {
		[GPIOMUX_ACTIVE] = &geni_ir_tx_config,
		[GPIOMUX_SUSPENDED] = &geni_ir_tx_config,
		},
		},
		{
		.gpio = 9, /* GENI_IR_RX */
		.settings = {
		[GPIOMUX_ACTIVE] = &geni_ir_rx_config,
		[GPIOMUX_SUSPENDED] = &geni_ir_rx_config,
		},
		},
		};

		void __init mpq8092_init_gpiomux(void)
		{
		int rc;
		@@ -362,4 +392,6 @@ void __init mpq8092_init_gpiomux(void)
		msm_gpiomux_install(mpq_hdmi_mux_configs,
		ARRAY_SIZE(mpq_hdmi_mux_configs));
		msm_gpiomux_install(msm_hdmi_configs, ARRAY_SIZE(msm_hdmi_configs));
		msm_gpiomux_install(msm_geni_ir_configs,
		ARRAY_SIZE(msm_geni_ir_configs));
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -6778,7 +6778,9 @@ static struct clk_lookup mpq_clocks_8092[] = {
		CLK_LOOKUP("core_clk", gcc_prng_ahb_clk.c, "f9bff000.qcom,msm-rng"),
		CLK_LOOKUP("", gcc_pwm_ahb_clk.c, ""),
		CLK_LOOKUP("", gcc_pwm_clk.c, ""),
		CLK_LOOKUP("", gcc_spss_ahb_clk.c, ""),
		CLK_LOOKUP("iface_clk", gcc_spss_ahb_clk.c, "fc5c3000.qcom,msm-spss"),
		CLK_LOOKUP("iface_clk", gcc_spss_ahb_clk.c,
		"fc5c1000.qcom,msm-geni-ir"),

		/* SATA */
		CLK_LOOKUP("core_clk", gcc_sata_axi_clk.c, "fc580000.sata"),