Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dc5828e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "ARM: dts: msm: config SPI on BLSP1 QUP1 for 8092""

parents 5cc57e3e 2bd8c528

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

+0 −24
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
	aliases {

		i2c2 = &i2c_2;

		i2c11 = &i2c_11;

		spi1 = &spi_1;

		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */

		sdhc2 = &sdhc_2; /* SDC2 SD card slot */

	};
@@ -135,29 +134,6 @@ 
                qcom,rtb-size = <0x100000>;

        };





	spi_1: spi@f9923000 { /* BLSP1 QUP1 */

		compatible = "qcom,spi-qup-v2";

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "spi_physical", "spi_bam_physical";

		reg = <0xf9923000 0x1000>,

		      <0xf9904000 0xf000>;

		interrupt-names = "spi_irq", "spi_bam_irq";

		interrupts = <0 95 0>, <0 238 0>;

		spi-max-frequency = <19200000>;

		qcom,gpio-mosi = <&msmgpio 0 0>;

		qcom,gpio-miso = <&msmgpio 1 0>;

		qcom,gpio-clk  = <&msmgpio 3 0>;



		qcom,infinite-mode = <0>;

		qcom,use-bam;

		qcom,ver-reg-exists;

		qcom,bam-consumer-pipe-index = <12>;

		qcom,bam-producer-pipe-index = <13>;

		qcom,master-id = <86>;

	};



	blsp1_uart2: serial@f991f000 {

		compatible = "qcom,msm-lsuart-v14";

		reg = <0xf991f000 0x1000>;

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

+0 −24
Original line number Diff line number Diff line
@@ -23,12 +23,6 @@ static struct gpiomux_setting gpio_i2c_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 gpio_uart_config = {

	.func = GPIOMUX_FUNC_2,

	.drv = GPIOMUX_DRV_16MA,
@@ -36,24 +30,6 @@ static struct gpiomux_setting gpio_uart_config = { 
};



static struct msm_gpiomux_config msm_blsp_configs[] __initdata = {

	{

		.gpio      = 0,		/* BLSP1 QUP1 SPI_DATA_MOSI */

		.settings = {

			[GPIOMUX_SUSPENDED] = &gpio_spi_config,

		},

	},

	{

		.gpio      = 1,		/* BLSP1 QUP1 SPI_DATA_MISO */

		.settings = {

			[GPIOMUX_SUSPENDED] = &gpio_spi_config,

		},

	},

	{

		.gpio      = 3,		/* BLSP1 QUP1 SPI_CLK */

		.settings = {

			[GPIOMUX_SUSPENDED] = &gpio_spi_config,

		},

	},

	{

		.gpio      = 6,		/* BLSP1 QUP2 I2C_SDA */

		.settings = {

arch/arm/mach-msm/clock-8092.c

+1 −3
Original line number Diff line number Diff line
@@ -6092,11 +6092,9 @@ static struct clk_lookup mpq_clocks_8092_rumi[] = { 
	CLK_DUMMY("",	gcc_bimc_gfx_clk.c,	"", OFF),

	CLK_DUMMY("",	gcc_bimc_kpss_axi_mstr_clk.c,	"", OFF),

	CLK_DUMMY("",	gcc_bimc_sysnoc_axi_mstr_clk.c,	"", OFF),

	CLK_DUMMY("iface_clk",	gcc_blsp1_ahb_clk.c,	"f9923000.spi", OFF),

	CLK_DUMMY("iface_clk",	gcc_blsp1_ahb_clk.c,	"f9924000.i2c", OFF),

	CLK_DUMMY("",	gcc_blsp1_qup1_i2c_apps_clk.c,	"", OFF),

	CLK_DUMMY("core_clk",	gcc_blsp1_qup1_spi_apps_clk.c,

							"f9923000.spi", OFF),

	CLK_DUMMY("",	gcc_blsp1_qup1_spi_apps_clk.c,	"", OFF),

	CLK_DUMMY("core_clk",	gcc_blsp1_qup2_i2c_apps_clk.c,

							"f9924000.i2c", OFF),

	CLK_DUMMY("",	gcc_blsp1_qup2_spi_apps_clk.c,	"", OFF),