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

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

Merge "msm: tspp: update driver to use pinctrl"

parents 66dc4fbd 4c261646

Documentation/devicetree/bindings/arm/msm/msm_tspp.txt

+35 −25
Original line number Diff line number Diff line
@@ -19,14 +19,22 @@ Required properties: 
- qcom,tsif-ref-clk: reference clock name.

	The driver uses clk_get to get the clocks by name. The clocks

	should be defined in the relevant clock file (e.g. clock-8974.c).

- gpios: GPIO numbers for TSIF0 (CLK, EN, DATA and SYNC) and TSIF1 (same).

- qcom,gpio-names: GPIO names - strings describing the GPIO functionality.

- qcom,gpios-func: GPIO functionality according to the GPIO functionality table.

	GPIO pins can have more than a single functionality, and the TSPP driver

	is responsible for configuring the GPIOs to work in TSIF functionality

	based on this parameter.

	Note: it is assumed that the functionality value (e.g. 1 in 8974 case)

	is applicable to all TSIF GPIOs.

- pinctrl-names: the names of the pinctrl states that are used by the driver to

	configure the TLMM pins. The allowed states are:

	disabled - both tsif inputs are not used

	tsif0-mode1 - only tsif0 is active in mode 1 (no sync signal)

	tsif0-mode2 - only tsif0 is used in mode 2 (with sync signal)

	tsif1-mode1 - only tsif1 is active in mode 1 (no sync signal)

	tsif1-mode2 - only tsif1 is used in mode 2 (with sync signal)

	dual-tsif-mode1 - both tsif0 and tsif1 are active, in mode 1

	dual-tsif-mode1 - both tsif0 and tsif1 are active, in mode 2

- pinctrl-#: a list of pinctrl phandles for the different pinctrl states. Refer

	to "Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt" for

	the pinctrl handles definitions. Each pinctrl-# corresponds to the

	respective state name that appears under pinctrl-state list.

	Note that when switching from one state to another, any pins in

	the old state which do not appear in the new state are automatically

	disabled by the pinctrl framework.



Optional properties:
@@ -64,23 +72,25 @@ Example (for 8974 platform, avaialble at msm8974.dtsi): 
			"TSIF_BAM_IRQ";

		qcom,tsif-pclk = "iface_clk";

		qcom,tsif-ref-clk = "ref_clk";

		gpios = <&msmgpio 89 0>, /* TSIF0 CLK  */

			<&msmgpio 90 0>, /* TSIF0 EN   */

			<&msmgpio 91 0>, /* TSIF0 DATA */

			<&msmgpio 92 0>, /* TSIF0 SYNC */

			<&msmgpio 93 0>, /* TSIF1 CLK  */

			<&msmgpio 94 0>, /* TSIF1 EN   */

			<&msmgpio 95 0>, /* TSIF1 DATA */

			<&msmgpio 96 0>; /* TSIF1 SYNC */

		qcom,gpio-names = "tsif_clk",

				"tsif_en",

				"tsif_data",

				"tsif_sync",

				"tsif_clk",

				"tsif_en",

				"tsif_data",

				"tsif_sync";

		qcom,gpios-func = <1>;



		pinctrl-names = "disabled",

			"tsif0-mode1", "tsif0-mode2",

			"tsif1-mode1", "tsif1-mode2",

			"dual-tsif-mode1", "dual-tsif-mode2";



		pinctrl-0 = <>;				/* disabled */

		pinctrl-1 = <&tsif0_signals_active>;	/* tsif0-mode1 */

		pinctrl-2 = <&tsif0_signals_active

			&tsif0_sync_active>;		/* tsif0-mode2 */

		pinctrl-3 = <&tsif1_signals_active>;	/* tsif1-mode1 */

		pinctrl-4 = <&tsif1_signals_active

			&tsif1_sync_active>;		/* tsif1-mode2 */

		pinctrl-5 = <&tsif0_signals_active

			&tsif1_signals_active>;		/* dual-tsif-mode1 */

		pinctrl-6 = <&tsif0_signals_active

			&tsif0_sync_active

			&tsif1_signals_active

			&tsif1_sync_active>;		/* dual-tsif-mode2 */



		qcom,msm-bus,name = "tsif";

		qcom,msm-bus,num-cases = <2>;

arch/arm/boot/dts/qcom/apq8084-pinctrl.dtsi

+50 −0
Original line number Diff line number Diff line
@@ -623,6 +623,56 @@ 
			};

		};



		tsif0_signals {

			qcom,pins = <&gp 86>,	/* TSIF0 CLK */

				<&gp 85>,	/* TSIF0 Enable */

				<&gp 84>;	/* TSIF0 DATA */

			qcom,num-grp-pins = <3>;

			qcom,pins-func = <3>;

			label = "tsif0-signals";

			tsif0_signals_active: tsif0_signals_active {

				drive_strength = <2>;	/* 2 mA */

				bias-pull-down;		/* pull down */

			};

		};



		/* sync signal is only used in mode-2 */

		tsif0_sync {

			qcom,pins = <&gp 83>;	/* TSIF0 SYNC */

			qcom,num-grp-pins = <1>;

			qcom,pins-func = <3>;

			label = "tsif0-sync";

			tsif0_sync_active: tsif0_sync_active {

				drive_strength = <2>;	/* 2 mA */

				bias-pull-down;		/* pull down */

			};

		};



		tsif1_signals {

			qcom,pins = <&gp 91>,	/* TSIF1 CLK */

				<&gp 96>,	/* TSIF1 Enable */

				<&gp 97>;	/* TSIF1 DATA */

			qcom,num-grp-pins = <3>;

			qcom,pins-func = <3>;

			label = "tsif1-signals";

			tsif1_signals_active: tsif1_signals_active {

				drive_strength = <2>;	/* 2 mA */

				bias-pull-down;		/* pull down */

			};

		};



		/* sync signal is only used in mode-2 */

		tsif1_sync {

			qcom,pins = <&gp 95>;	/* TSIF1 SYNC */

			qcom,num-grp-pins = <1>;

			qcom,pins-func = <3>;

			label = "tsif1-sync";

			tsif1_sync_active: tsif1_sync_active {

				drive_strength = <2>;	/* 2 mA */

				bias-pull-down;		/* pull down */

			};

		};



		cti_trigout_a {

			qcom,pins = <&gp 63>;

			qcom,num-grp-pins = <1>;

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

+20 −18
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ 
		reg = <0xf99d8000 0x1000>, /* MSM_TSIF0_PHYS */

		      <0xf99d9000 0x1000>, /* MSM_TSIF1_PHYS */

		      <0xf99da000 0x1000>, /* MSM_TSPP_PHYS  */

		      <0xf99c4000 0x14000>; /* MSM_TSPP_BAM_PHYS */

		      <0xf99c4000 0x11000>; /* MSM_TSPP_BAM_PHYS */

		reg-names = "MSM_TSIF0_PHYS",

			"MSM_TSIF1_PHYS",

			"MSM_TSPP_PHYS",
@@ -732,23 +732,6 @@ 
			"TSIF_BAM_IRQ";

		qcom,tsif-pclk = "iface_clk";

		qcom,tsif-ref-clk = "ref_clk";

		gpios = <&msmgpio 86 0>, /* TSIF0 CLK  */

			<&msmgpio 85 0>, /* TSIF0 EN   */

			<&msmgpio 84 0>, /* TSIF0 DATA */

			<&msmgpio 83 0>, /* TSIF0 SYNC */

			<&msmgpio 91 0>, /* TSIF1 CLK  */

			<&msmgpio 96 0>, /* TSIF1 EN   */

			<&msmgpio 97 0>, /* TSIF1 DATA */

			<&msmgpio 95 0>; /* TSIF1 SYNC */

		qcom,gpio-names = "tsif_clk",

				"tsif_en",

				"tsif_data",

				"tsif_sync",

				"tsif_clk",

				"tsif_en",

				"tsif_data",

				"tsif_sync";

		qcom,gpios-func = <1>;



		qcom,msm-bus,name = "tsif";

		qcom,msm-bus,num-cases = <2>;
@@ -756,6 +739,25 @@ 
		qcom,msm-bus,vectors-KBps =

				<82 512 0 0>, /* No vote */

				<82 512 12288 24576>; /* Max. bandwidth, 2xTSIF, each max of 96Mbps */



		pinctrl-names = "disabled",

			"tsif0-mode1", "tsif0-mode2",

			"tsif1-mode1", "tsif1-mode2",

			"dual-tsif-mode1", "dual-tsif-mode2";



		pinctrl-0 = <>;				/* disabled */

		pinctrl-1 = <&tsif0_signals_active>;	/* tsif0-mode1 */

		pinctrl-2 = <&tsif0_signals_active

			&tsif0_sync_active>;		/* tsif0-mode2 */

		pinctrl-3 = <&tsif1_signals_active>;	/* tsif1-mode1 */

		pinctrl-4 = <&tsif1_signals_active

			&tsif1_sync_active>;		/* tsif1-mode2 */

		pinctrl-5 = <&tsif0_signals_active

			&tsif1_signals_active>;		/* dual-tsif-mode1 */

		pinctrl-6 = <&tsif0_signals_active

			&tsif0_sync_active

			&tsif1_signals_active

			&tsif1_sync_active>;		/* dual-tsif-mode2 */

	};



	slim_msm: slim@fe1af000 {

arch/arm/boot/dts/qcom/msm8974-pinctrl.dtsi

+50 −0
Original line number Diff line number Diff line
@@ -543,5 +543,55 @@ 
				bias-disable;

			};

		};



		tsif0_signals {

			qcom,pins = <&gp 89>,	/* TSIF0 CLK */

				<&gp 90>,	/* TSIF0 Enable */

				<&gp 91>;	/* TSIF0 DATA */

			qcom,num-grp-pins = <3>;

			qcom,pins-func = <1>;

			label = "tsif0-signals";

			tsif0_signals_active: tsif0_signals_active {

				drive_strength = <2>;	/* 2 mA */

				bias-pull-down;		/* pull down */

			};

		};



		/* sync signal is only used if configured to mode-2 */

		tsif0_sync {

			qcom,pins = <&gp 92>;	/* TSIF0 SYNC */

			qcom,num-grp-pins = <1>;

			qcom,pins-func = <1>;

			label = "tsif0-sync";

			tsif0_sync_active: tsif0_sync_active {

				drive_strength = <2>;	/* 2 mA */

				bias-pull-down;		/* pull down */

			};

		};



		tsif1_signals {

			qcom,pins = <&gp 93>,	/* TSIF1 CLK */

				<&gp 94>,	/* TSIF1 Enable */

				<&gp 95>;	/* TSIF1 DATA */

			qcom,num-grp-pins = <3>;

			qcom,pins-func = <1>;

			label = "tsif1-signals";

			tsif1_signals_active: tsif1_signals_active {

				drive_strength = <2>;	/* 2 mA */

				bias-pull-down;		/* pull down */

			};

		};



		/* sync signal is only used if configured to mode-2 */

		tsif1_sync {

			qcom,pins = <&gp 96>;	/* TSIF1 SYNC */

			qcom,num-grp-pins = <1>;

			qcom,pins-func = <1>;

			label = "tsif1-sync";

			tsif1_sync_active: tsif1_sync_active {

				drive_strength = <2>;	/* 2 mA */

				bias-pull-down;		/* pull down */

			};

		};

	};

};

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

+20 −18
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ 
		reg = <0xf99d8000 0x1000>, /* MSM_TSIF0_PHYS */

		      <0xf99d9000 0x1000>, /* MSM_TSIF1_PHYS */

		      <0xf99da000 0x1000>, /* MSM_TSPP_PHYS  */

		      <0xf99c4000 0x14000>; /* MSM_TSPP_BAM_PHYS */

		      <0xf99c4000 0x11000>; /* MSM_TSPP_BAM_PHYS */

		reg-names = "MSM_TSIF0_PHYS",

			"MSM_TSIF1_PHYS",

			"MSM_TSPP_PHYS",
@@ -575,23 +575,6 @@ 
			"TSIF_BAM_IRQ";

		qcom,tsif-pclk = "iface_clk";

		qcom,tsif-ref-clk = "ref_clk";

		gpios = <&msmgpio 89 0>, /* TSIF0 CLK  */

			<&msmgpio 90 0>, /* TSIF0 EN   */

			<&msmgpio 91 0>, /* TSIF0 DATA */

			<&msmgpio 92 0>, /* TSIF0 SYNC */

			<&msmgpio 93 0>, /* TSIF1 CLK  */

			<&msmgpio 94 0>, /* TSIF1 EN   */

			<&msmgpio 95 0>, /* TSIF1 DATA */

			<&msmgpio 96 0>; /* TSIF1 SYNC */

		qcom,gpio-names = "tsif_clk",

				"tsif_en",

				"tsif_data",

				"tsif_sync",

				"tsif_clk",

				"tsif_en",

				"tsif_data",

				"tsif_sync";

		qcom,gpios-func = <1>;



		qcom,msm-bus,name = "tsif";

		qcom,msm-bus,num-cases = <2>;
@@ -599,6 +582,25 @@ 
		qcom,msm-bus,vectors-KBps =

				<82 512 0 0>, /* No vote */

				<82 512 12288 24576>; /* Max. bandwidth, 2xTSIF, each max of 96Mbps */



		pinctrl-names = "disabled",

			"tsif0-mode1", "tsif0-mode2",

			"tsif1-mode1", "tsif1-mode2",

			"dual-tsif-mode1", "dual-tsif-mode2";



		pinctrl-0 = <>;				/* disabled */

		pinctrl-1 = <&tsif0_signals_active>;	/* tsif0-mode1 */

		pinctrl-2 = <&tsif0_signals_active

			&tsif0_sync_active>;		/* tsif0-mode2 */

		pinctrl-3 = <&tsif1_signals_active>;	/* tsif1-mode1 */

		pinctrl-4 = <&tsif1_signals_active

			&tsif1_sync_active>;		/* tsif1-mode2 */

		pinctrl-5 = <&tsif0_signals_active

			&tsif1_signals_active>;		/* dual-tsif-mode1 */

		pinctrl-6 = <&tsif0_signals_active

			&tsif0_sync_active

			&tsif1_signals_active

			&tsif1_sync_active>;		/* dual-tsif-mode2 */

	};



	slim_msm: slim@fe12f000 {