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

Commit cef0aa0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Olof Johansson:
 "A few fixes that have trickled in through the merge window:

   - Video fixes for OMAP due to panel-dpi driver removal

   - Clock fixes for OMAP that broke no-idle quirks + nfsroot on DRA7

   - Fixing arch version on ASpeed ast2500

   - Two fixes for reset handling on ARM SCMI"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: aspeed: ast2500 is ARMv6K
  reset: reset-scmi: add missing handle initialisation
  firmware: arm_scmi: reset: fix reset_state assignment in scmi_domain_reset
  bus: ti-sysc: Remove unpaired sysc_clkdm_deny_idle()
  ARM: dts: logicpd-som-lv: Fix i2c2 and i2c3 Pin mux
  ARM: dts: am3517-evm: Fix missing video
  ARM: dts: logicpd-torpedo-baseboard: Fix missing video
  ARM: omap2plus_defconfig: Fix missing video
  bus: ti-sysc: Fix handling of invalid clocks
  bus: ti-sysc: Fix clock handling for no-idle quirks
parents cf4f493b 9bfd7319

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

+4 −19
Original line number Diff line number Diff line
@@ -124,10 +124,11 @@ 
	};



	lcd0: display@0 {

		compatible = "panel-dpi";

		/* This isn't the exact LCD, but the timings meet spec */

		/* To make it work, set CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=4 */

		compatible = "newhaven,nhd-4.3-480272ef-atxl";

		label = "15";

		status = "okay";

		pinctrl-names = "default";

		backlight = <&bl>;

		enable-gpios = <&gpio6 16 GPIO_ACTIVE_HIGH>;	/* gpio176, lcd INI */

		vcc-supply = <&vdd_io_reg>;
@@ -136,22 +137,6 @@ 
				remote-endpoint = <&dpi_out>;

			};

		};



		panel-timing {

			clock-frequency = <9000000>;

			hactive = <480>;

			vactive = <272>;

			hfront-porch = <3>;

			hback-porch = <2>;

			hsync-len = <42>;

			vback-porch = <3>;

			vfront-porch = <4>;

			vsync-len = <11>;

			hsync-active = <0>;

			vsync-active = <0>;

			de-active = <1>;

			pixelclk-active = <1>;

		};

	};



	bl: backlight {

arch/arm/boot/dts/logicpd-som-lv.dtsi

+14 −12
Original line number Diff line number Diff line
@@ -228,6 +228,20 @@ 
		>;

	};



	i2c2_pins: pinmux_i2c2_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0)	/* i2c2_scl */

			OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0)	/* i2c2_sda */

		>;

	};



	i2c3_pins: pinmux_i2c3_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0)	/* i2c3_scl */

			OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0)	/* i2c3_sda */

		>;

	};



	tsc2004_pins: pinmux_tsc2004_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE4)	/* mcbsp4_dr.gpio_153 */
@@ -249,18 +263,6 @@ 
			OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4)	/* sys_boot1.gpio_3 */

		>;

	};

	i2c2_pins: pinmux_i2c2_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0)	/* i2c2_scl */

			OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0)	/* i2c2_sda */

		>;

	};

	i2c3_pins: pinmux_i2c3_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0)	/* i2c3_scl */

			OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0)	/* i2c3_sda */

		>;

	};

};



&omap3_pmx_core2 {

arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi

+6 −31
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ 
&dss {

	status = "ok";

	vdds_dsi-supply = <&vpll2>;

	vdda_video-supply = <&video_reg>;

	pinctrl-names = "default";

	pinctrl-0 = <&dss_dpi_pins1>;

	port {
@@ -124,44 +123,20 @@ 
		display0 = &lcd0;

	};



	video_reg: video_reg {

		pinctrl-names = "default";

		pinctrl-0 = <&panel_pwr_pins>;

		compatible = "regulator-fixed";

		regulator-name = "fixed-supply";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio5 27 GPIO_ACTIVE_HIGH>;	/* gpio155, lcd INI */

	};



	lcd0: display {

		compatible = "panel-dpi";

		/* This isn't the exact LCD, but the timings meet spec */

		/* To make it work, set CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=4 */

		compatible = "newhaven,nhd-4.3-480272ef-atxl";

		label = "15";

		status = "okay";

		/* default-on; */

		pinctrl-names = "default";



		pinctrl-0 = <&panel_pwr_pins>;

		backlight = <&bl>;

		enable-gpios = <&gpio5 27 GPIO_ACTIVE_HIGH>;

		port {

			lcd_in: endpoint {

				remote-endpoint = <&dpi_out>;

			};

		};



		panel-timing {

			clock-frequency = <9000000>;

			hactive = <480>;

			vactive = <272>;

			hfront-porch = <3>;

			hback-porch = <2>;

			hsync-len = <42>;

			vback-porch = <3>;

			vfront-porch = <4>;

			vsync-len = <11>;

			hsync-active = <0>;

			vsync-active = <0>;

			de-active = <1>;

			pixelclk-active = <1>;

		};

	};



	bl: backlight {

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m 
CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m

CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=m

CONFIG_DRM_TILCDC=m

CONFIG_DRM_PANEL_SIMPLE=m

CONFIG_FB=y

CONFIG_FIRMWARE_EDID=y

CONFIG_FB_MODE_HELPERS=y

arch/arm/mach-aspeed/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ config MACH_ASPEED_G4 
config MACH_ASPEED_G5

	bool "Aspeed SoC 5th Generation"

	depends on ARCH_MULTI_V6

	select CPU_V6

	select PINCTRL_ASPEED_G5

	select FTTMR010_TIMER

	help