Commit 1a13e36a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux 

Pull fbdev updates from Tomi Valkeinen:

 - ssd1307fb: various fixes and improvements, SSD1305 support

 - use architecture agnostic functions instead of MTRR functions in
   various fbdev drivers

 - TI DRA7xx SoC display support (arch/arm/ side)

 - OMAPDSS componentization to fix probing order issues

 - OMAPDSS scaling fixes

 - msm_fb: remove obsoleted driver

* tag 'fbdev-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (77 commits)
  msm: msm_fb: Remove dead code
  OMAPDSS: HDMI: wait for framedone when stopping video
  OMAPDSS: HDMI4: fix error handling
  OMAPDSS: DISPC: scaler debug print
  OMAPDSS: DISPC: do only y decimation on OMAP3
  OMAPDSS: DISPC: check if scaling setup failed
  OMAPDSS: DISPC: fix 64 bit issue in 5-tap
  OMAPDSS: DISPC: fix row_inc for OMAP3
  OMAPDSS: DISPC: add check for scaling limits
  OMAPDSS: DISPC: fix check_horiz_timing_omap3 args
  OMAPDSS: DISPC: fix predecimation for YUV modes
  OMAPDSS: DISPC: work-around for errata i631
  OMAPDSS: simplify submodule reg/unreg code
  OMAPDSS: componentize omapdss
  OMAPDSS: reorder uninit calls
  OMAPDSS: remove uses of __init/__exit
  OMAPDSS: fix dss_init_ports error handling
  OMAPDSS: refactor dss probe function
  OMAPDSS: move 'dss_initialized' to dss driver
  fbdev: propagate result of fb_videomode_from_videomode()
  ...
parents 36a1624d f778dad3

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ skyworks Skyworks Solutions, Inc. 
smsc	Standard Microsystems Corporation

snps	Synopsys, Inc.

solidrun	SolidRun

solomon        Solomon Systech Limited

sony	Sony Corporation

spansion	Spansion Inc.

sprd	Spreadtrum Communications Inc.

Documentation/devicetree/bindings/video/ssd1307fb.txt

+22 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


Required properties:

  - compatible: Should be "solomon,<chip>fb-<bus>". The only supported bus for

    now is i2c, and the supported chips are ssd1306 and ssd1307.

    now is i2c, and the supported chips are ssd1305, ssd1306 and ssd1307.

  - reg: Should contain address of the controller on the I2C bus. Most likely

         0x3c or 0x3d

  - pwm: Should contain the pwm to use according to the OF device tree PWM
@@ -15,6 +15,16 @@ Required properties: 


Optional properties:

  - reset-active-low: Is the reset gpio is active on physical low?

  - solomon,segment-no-remap: Display needs normal (non-inverted) data column

                              to segment mapping

  - solomon,com-seq: Display uses sequential COM pin configuration

  - solomon,com-lrremap: Display uses left-right COM pin remap

  - solomon,com-invdir: Display uses inverted COM pin scan direction

  - solomon,com-offset: Number of the COM pin wired to the first display line

  - solomon,prechargep1: Length of deselect period (phase 1) in clock cycles.

  - solomon,prechargep2: Length of precharge period (phase 2) in clock cycles.

                         This needs to be the higher, the higher the capacitance

                         of the OLED's pixels is



[0]: Documentation/devicetree/bindings/pwm/pwm.txt
@@ -26,3 +36,14 @@ ssd1307: oled@3c { 
        reset-gpios = <&gpio2 7>;

        reset-active-low;

};



ssd1306: oled@3c {

        compatible = "solomon,ssd1306fb-i2c";

        reg = <0x3c>;

        pwms = <&pwm 4 3000>;

        reset-gpios = <&gpio2 7>;

        reset-active-low;

        solomon,com-lrremap;

        solomon,com-invdir;

        solomon,com-offset = <32>;

};

arch/arm/boot/dts/am57xx-beagle-x15.dts

+81 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
		rtc0 = &mcp_rtc;

		rtc1 = &tps659038_rtc;

		rtc2 = &rtc;

		display0 = &hdmi0;

	};



	memory {
@@ -103,6 +104,51 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&extcon_usb2_pins>;

	};



	hdmi0: connector {

		compatible = "hdmi-connector";

		label = "hdmi";



		type = "a";



		port {

			hdmi_connector_in: endpoint {

				remote-endpoint = <&tpd12s015_out>;

			};

		};

	};



	tpd12s015: encoder {

		compatible = "ti,tpd12s015";



		pinctrl-names = "default";

		pinctrl-0 = <&tpd12s015_pins>;



		gpios = <&gpio7 10 GPIO_ACTIVE_HIGH>,	/* gpio7_10, CT CP HPD */

			<&gpio6 28 GPIO_ACTIVE_HIGH>,	/* gpio6_28, LS OE */

			<&gpio7 12 GPIO_ACTIVE_HIGH>;	/* gpio7_12/sp1_cs2, HPD */



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;



				tpd12s015_in: endpoint {

					remote-endpoint = <&hdmi_out>;

				};

			};



			port@1 {

				reg = <1>;



				tpd12s015_out: endpoint {

					remote-endpoint = <&hdmi_connector_in>;

				};

			};

		};

	};

};



&dra7_pmx_core {
@@ -122,6 +168,13 @@ 
		>;

	};



	hdmi_pins: pinmux_hdmi_pins {

		pinctrl-single,pins = <

			0x408 (PIN_INPUT | MUX_MODE1)	/* i2c2_sda.hdmi1_ddc_scl */

			0x40c (PIN_INPUT | MUX_MODE1)	/* i2c2_scl.hdmi1_ddc_sda */

		>;

	};



	i2c3_pins_default: i2c3_pins_default {

		pinctrl-single,pins = <

			0x2a4 (PIN_INPUT| MUX_MODE10)	/* mcasp1_aclkx.i2c3_sda */
@@ -278,6 +331,14 @@ 
			0x3e8 (PIN_INPUT_PULLUP | MUX_MODE14) /* uart1_ctsn.gpio7_24 */

		>;

	};



	tpd12s015_pins: pinmux_tpd12s015_pins {

		pinctrl-single,pins = <

			0x3b0 (PIN_OUTPUT | MUX_MODE14)		/* gpio7_10 CT_CP_HPD */

			0x3b8 (PIN_INPUT_PULLDOWN | MUX_MODE14)	/* gpio7_12 HPD */

			0x370 (PIN_OUTPUT | MUX_MODE14)		/* gpio6_28 LS_OE */

		>;

	};

};



&i2c1 {
@@ -608,3 +669,23 @@ 
		};

       };

};



&dss {

	status = "ok";



	vdda_video-supply = <&ldoln_reg>;

};



&hdmi {

	status = "ok";

	vdda-supply = <&ldo3_reg>;



	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_pins>;



	port {

		hdmi_out: endpoint {

			remote-endpoint = <&tpd12s015_in>;

		};

	};

};

arch/arm/boot/dts/dra7.dtsi

+43 −0
Original line number Diff line number Diff line
@@ -131,6 +131,11 @@ 
							regulator-max-microvolt = <3000000>;

						};

					};



					scm_conf_clocks: clocks {

						#address-cells = <1>;

						#size-cells = <0>;

					};

				};



				dra7_pmx_core: pinmux@1400 {
@@ -1469,6 +1474,44 @@ 
			clocks = <&sys_clkin1>;

			status = "disabled";

		};



		dss: dss@58000000 {

			compatible = "ti,dra7-dss";

			/* 'reg' defined in dra72x.dtsi and dra74x.dtsi */

			/* 'clocks' defined in dra72x.dtsi and dra74x.dtsi */

			status = "disabled";

			ti,hwmods = "dss_core";

			/* CTRL_CORE_DSS_PLL_CONTROL */

			syscon-pll-ctrl = <&scm_conf 0x538>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



			dispc@58001000 {

				compatible = "ti,dra7-dispc";

				reg = <0x58001000 0x1000>;

				interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;

				ti,hwmods = "dss_dispc";

				clocks = <&dss_dss_clk>;

				clock-names = "fck";

				/* CTRL_CORE_SMA_SW_1 */

				syscon-pol = <&scm_conf 0x534>;

			};



			hdmi: encoder@58060000 {

				compatible = "ti,dra7-hdmi";

				reg = <0x58040000 0x200>,

				      <0x58040200 0x80>,

				      <0x58040300 0x80>,

				      <0x58060000 0x19000>;

				reg-names = "wp", "pll", "phy", "core";

				interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

				ti,hwmods = "dss_hdmi";

				clocks = <&dss_48mhz_clk>, <&dss_hdmi_clk>;

				clock-names = "fck", "sys_clk";

			};

		};

	};



	thermal_zones: thermal-zones {

arch/arm/boot/dts/dra72-evm.dts

+110 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 
		reg = <0x80000000 0x40000000>; /* 1024 MB */

	};



	aliases {

		display0 = &hdmi0;

	};



	evm_3v3: fixedregulator-evm_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "evm_3v3";
@@ -35,6 +39,51 @@ 
		compatible = "linux,extcon-usb-gpio";

		id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;

	};



	hdmi0: connector {

		compatible = "hdmi-connector";

		label = "hdmi";



		type = "a";



		port {

			hdmi_connector_in: endpoint {

				remote-endpoint = <&tpd12s015_out>;

			};

		};

	};



	tpd12s015: encoder {

		compatible = "ti,tpd12s015";



		pinctrl-names = "default";

		pinctrl-0 = <&tpd12s015_pins>;



		gpios = <&pcf_hdmi 4 GPIO_ACTIVE_HIGH>,	/* P4, CT CP HPD */

			<&pcf_hdmi 5 GPIO_ACTIVE_HIGH>,	/* P5, LS OE */

			<&gpio7 12 GPIO_ACTIVE_HIGH>;	/* gpio7_12/sp1_cs2, HPD */



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;



				tpd12s015_in: endpoint {

					remote-endpoint = <&hdmi_out>;

				};

			};



			port@1 {

				reg = <1>;



				tpd12s015_out: endpoint {

					remote-endpoint = <&hdmi_connector_in>;

				};

			};

		};

	};

};



&dra7_pmx_core {
@@ -45,6 +94,13 @@ 
		>;

	};



	i2c5_pins: pinmux_i2c5_pins {

		pinctrl-single,pins = <

			0x2b4 (PIN_INPUT | MUX_MODE10) /* mcasp1_axr0.i2c5_sda */

			0x2b8 (PIN_INPUT | MUX_MODE10) /* mcasp1_axr1.i2c5_scl */

		>;

	};



	nand_default: nand_default {

		pinctrl-single,pins = <

			0x0	(PIN_INPUT  | MUX_MODE0) /* gpmc_ad0 */
@@ -142,6 +198,19 @@ 
			0xb8 (PIN_OUTPUT | MUX_MODE1)	/* gpmc_cs2.qspi1_cs0 */

		>;

	};



	hdmi_pins: pinmux_hdmi_pins {

		pinctrl-single,pins = <

			0x408 (PIN_INPUT | MUX_MODE1) /* i2c2_sda.hdmi1_ddc_scl */

			0x40c (PIN_INPUT | MUX_MODE1) /* i2c2_scl.hdmi1_ddc_sda */

		>;

	};



	tpd12s015_pins: pinmux_tpd12s015_pins {

		pinctrl-single,pins = <

			0x3b8 (PIN_INPUT_PULLDOWN | MUX_MODE14) /* gpio7_12 HPD */

		>;

	};

};



&i2c1 {
@@ -277,6 +346,27 @@ 
	};

};



&i2c5 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c5_pins>;

	clock-frequency = <400000>;



	pcf_hdmi: pcf8575@26 {

		compatible = "nxp,pcf8575";

		reg = <0x26>;

		gpio-controller;

		#gpio-cells = <2>;

		/*

		 * initial state is used here to keep the mdio interface

		 * selected on RU89 through SEL_VIN4_MUX_S0, VIN2_S1 and

		 * VIN2_S0 driven high otherwise Ethernet stops working

		 * VIN6_SEL_S0 is low, thus selecting McASP3 over VIN6

		 */

		lines-initial-states = <0x0f2b>;

	};

};



&uart1 {

	status = "okay";

};
@@ -566,3 +656,23 @@ 
		};

	};

};



&dss {

	status = "ok";



	vdda_video-supply = <&ldo5_reg>;

};



&hdmi {

	status = "ok";

	vdda-supply = <&ldo3_reg>;



	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_pins>;



	port {

		hdmi_out: endpoint {

			remote-endpoint = <&tpd12s015_in>;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE