Merge "ARM: dts: msm: Config SPI on BLSP2 QUP6 8092" (28a392a1) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/mpq8092.dtsi

+24 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		sdhc2 = &sdhc_2; /* SDC2 SD card slot */
		serial1 = &blsp2_uart0;
		serial2 = &blsp2_uart3;
		spi12 = &spi_12;
		};

		memory {
		@@ -1251,6 +1252,29 @@
		reg-name = "ramdump";
		vdd-wlan-supply = <&wlan_vreg>;
		};

		spi_12: spi@f9968000 { /* BLSP2 QUP6 */
		compatible = "qcom,spi-qup-v2";
		#address-cells = <1>;
		#size-cells = <0>;
		reg-names = "spi_physical", "spi_bam_physical";
		reg = <0xf9968000 0x1000>,
		<0xf9944000 0x19000>;
		interrupt-names = "spi_irq", "spi_bam_irq";
		interrupts = <0 106 0>, <0 239 0>;
		spi-max-frequency = <19200000>;
		qcom,gpio-mosi = <&msmgpio 87 0>;
		qcom,gpio-miso = <&msmgpio 88 0>;
		qcom,gpio-clk = <&msmgpio 90 0>;
		qcom,gpio-cs0 = <&msmgpio 89 0>;

		qcom,infinite-mode = <0>;
		qcom,use-bam;
		qcom,ver-reg-exists;
		qcom,bam-consumer-pipe-index = <22>;
		qcom,bam-producer-pipe-index = <23>;
		qcom,master-id = <84>;
		};
		};

		&gdsc_venus {

+30 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,12 @@ static struct gpiomux_setting ioexp_suspend_config = {
		.pull = GPIOMUX_PULL_NONE,
		};

		static struct gpiomux_setting gpio_spi_config = {
		.func = GPIOMUX_FUNC_1,
		.drv = GPIOMUX_DRV_6MA,
		.pull = GPIOMUX_PULL_NONE,
		};

		static struct gpiomux_setting ioexp_active_config = {
		.func = GPIOMUX_FUNC_GPIO,
		.drv = GPIOMUX_DRV_16MA,
		@@ -164,6 +170,30 @@ static struct msm_gpiomux_config msm_blsp_configs[] __initdata = {
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		{
		.gpio = 87, /* BLSP2 QUP6 SPI_DATA_MOSI */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		},
		},
		{
		.gpio = 88, /* BLSP2 QUP6 SPI_DATA_MISO */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		},
		},
		{
		.gpio = 90, /* BLSP2 QUP6 SPI_CLK */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		},
		},
		{
		.gpio = 89, /* BLSP2 QUP6 SPI_CS */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		},
		},
		};

		static struct gpiomux_setting ehci_reset_sus_cfg = {

+2 −1

Original line number	Diff line number	Diff line
		@@ -6691,6 +6691,7 @@ static struct clk_lookup mpq_clocks_8092[] = {
		CLK_LOOKUP("iface_clk", gcc_blsp2_ahb_clk.c, "f995d000.serial"),
		CLK_LOOKUP("iface_clk", gcc_blsp2_ahb_clk.c, "f9960000.serial"),
		CLK_LOOKUP("core_clk", gcc_blsp2_qup1_i2c_apps_clk.c, "f9963000.i2c"),
		CLK_LOOKUP("iface_clk", gcc_blsp2_ahb_clk.c, "f9968000.spi"),
		CLK_LOOKUP("", gcc_blsp2_qup1_spi_apps_clk.c, ""),
		CLK_LOOKUP("", gcc_blsp2_qup2_i2c_apps_clk.c, ""),
		CLK_LOOKUP("", gcc_blsp2_qup2_spi_apps_clk.c, ""),
		@@ -6701,7 +6702,7 @@ static struct clk_lookup mpq_clocks_8092[] = {
		CLK_LOOKUP("core_clk", gcc_blsp2_qup5_i2c_apps_clk.c, "f9967000.i2c"),
		CLK_LOOKUP("", gcc_blsp2_qup5_spi_apps_clk.c, ""),
		CLK_LOOKUP("", gcc_blsp2_qup6_i2c_apps_clk.c, ""),
		CLK_LOOKUP("", gcc_blsp2_qup6_spi_apps_clk.c, ""),
		CLK_LOOKUP("core_clk", gcc_blsp2_qup6_spi_apps_clk.c, "f9968000.spi"),
		CLK_LOOKUP("core_clk", gcc_blsp2_uart1_apps_clk.c, "f995d000.serial"),
		CLK_LOOKUP("", gcc_blsp2_uart2_apps_clk.c, ""),
		CLK_LOOKUP("", gcc_blsp2_uart3_apps_clk.c, ""),