Merge branch 'ti/4.4-pull' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into audio-display-ti-linux-4.4.y

omapdrm changes for 2016.04

* 'ti/4.4-pull' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  drm/omap: fix replication logic
  ARM: dts: K2G: add keystone-k2g-evm-lcd.dts
  ARM: dts: K2G: change sound names to avoid conflicts
  drm/omap: k2g: allow pclk rate of 9MHz
  drm/omap: decrease min width & height
  drm/omap: remove divider constraint from hsdiv

Author: Jyri Sarha

arch/arm/boot/dts/Makefile

@@ -151,7 +151,8 @@ dtb-$(CONFIG_ARCH_KEYSTONE) += \
 	keystone-k2hk-evm.dtb \
 	keystone-k2l-evm.dtb \
 	keystone-k2e-evm.dtb \
-	keystone-k2g-evm.dtb
+	keystone-k2g-evm.dtb \
+	keystone-k2g-evm-lcd.dtb
 dtb-$(CONFIG_MACH_KIRKWOOD) += \
 	kirkwood-b3.dtb \
 	kirkwood-blackarmor-nas220.dtb \

arch/arm/boot/dts/keystone-k2g-evm-lcd.dts

@@ -0,0 +1,103 @@
+#include "keystone-k2g-evm.dts"
+
+/ {
+	aliases {
+		display0 = &lcd0;
+		sound0 = &sound1;
+	};
+
+	lcd0: display {
+		compatible = "newhaven,nhd-4.3-480272ef-atxl", "panel-dpi";
+		label = "lcd";
+
+		panel-timing {
+			clock-frequency = <9000000>;
+			hactive = <480>;
+			vactive = <272>;
+			hfront-porch = <2>;
+			hback-porch = <2>;
+			hsync-len = <41>;
+			vfront-porch = <2>;
+			vback-porch = <2>;
+			vsync-len = <10>;
+			hsync-active = <0>;
+			vsync-active = <0>;
+			de-active = <1>;
+			pixelclk-active = <1>;
+		};
+
+		port {
+			lcd_in: endpoint {
+				remote-endpoint = <&dpi_out>;
+			};
+		};
+	};
+
+	sound1: sound@1 {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "K2G-EVM-LCD";
+		simple-audio-card,widgets =
+			"Headphone", "Headphone Jack",
+			"Line", "Line In";
+		simple-audio-card,routing =
+			"Headphone Jack",       "HPLOUT",
+			"Headphone Jack",       "HPROUT",
+			"LINE1L",               "Line In",
+			"LINE1R",               "Line In";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,bitclock-master = <&sound1_master>;
+		simple-audio-card,frame-master = <&sound1_master>;
+
+		sound1_master: simple-audio-card,cpu {
+			sound-dai = <&mcasp2>;
+			clocks = <&k2g_clks K2G_DEV_MCASP2 K2G_DEV_MCASP_AUX_CLK>;
+			system-clock-id = <MCASP_CLK_HCLK_AUXCLK>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&tlv320aic3106>;
+			system-clock-frequency = <12288000>;
+		};
+	};
+};
+
+&i2c1 {
+	edt-ft5306@38 {
+		status = "okay";
+		compatible = "edt,edt-ft5306", "edt,edt-ft5x06";
+		reg = <0x38>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&edt_ft5306_ts_pins>;
+
+		interrupt-parent = <&gpio1>;
+		interrupts = <42 IRQ_TYPE_EDGE_FALLING>;
+
+		touchscreen-size-x = <480>;
+		touchscreen-size-y = <272>;
+	};
+};
+
+&k2g_pinctrl {
+	edt_ft5306_ts_pins: edt_ft5306_ts_pins {
+		pinctrl-single,pins = <
+			K2G_CORE_IOPAD(0x1364) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE3)	/* pr1_pru1_gpo16.gpio1_42 */
+		>;
+	};
+};
+
+&dpi_out {
+	remote-endpoint = <&lcd_in>;
+};
+
+&hdmi {
+	status = "disabled";
+};
+
+&sii9022 {
+	status = "disabled";
+};
+
+&sound0 {
+	status = "disabled";
+};

arch/arm/boot/dts/keystone-k2g-evm.dts

@@ -104,9 +104,9 @@
 
 		simple-audio-card,dai-link@0 {
 			format = "i2s";
-			bitclock-master = <&sound0_master>;
-			frame-master = <&sound0_master>;
-			sound0_master: cpu {
+			bitclock-master = <&sound0_0_master>;
+			frame-master = <&sound0_0_master>;
+			sound0_0_master: cpu {
 				sound-dai = <&mcasp2>;
 				clocks = <&k2g_clks K2G_DEV_MCASP2 K2G_DEV_MCASP_AUX_CLK>;
 				system-clock-id = <MCASP_CLK_HCLK_AUXCLK>;
@@ -120,9 +120,9 @@
 
 		simple-audio-card,dai-link@1 {
 			format = "i2s";
-			bitclock-master = <&sound1_master>;
-			frame-master = <&sound1_master>;
-			sound1_master: cpu {
+			bitclock-master = <&sound0_1_master>;
+			frame-master = <&sound0_1_master>;
+			sound0_1_master: cpu {
 				sound-dai = <&mcasp2>;
 				clocks = <&k2g_clks K2G_DEV_MCASP2 K2G_DEV_MCASP_AUX_CLK>;
 				system-clock-id = <MCASP_CLK_HCLK_AUXCLK>;

drivers/gpu/drm/omapdrm/dss/dispc.c

@@ -2805,12 +2805,13 @@ static int dispc_ovl_setup_common(enum omap_plane plane,
 }
 
 static int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi,
-		bool replication, const struct omap_video_timings *mgr_timings,
+		const struct omap_video_timings *mgr_timings,
 		bool mem_to_mem)
 {
 	int r;
 	enum omap_overlay_caps caps = dss_feat_get_overlay_caps(plane);
 	enum omap_channel channel;
+	const bool replication = true;
 
 	channel = dispc_ovl_get_channel_out(plane);
 
@@ -2838,7 +2839,7 @@ static int dispc_wb_setup(const struct omap_dss_writeback_info *wi,
 	enum omap_plane plane = OMAP_DSS_WB;
 	const int pos_x = 0, pos_y = 0;
 	const u8 zorder = 0, global_alpha = 0;
-	const bool replication = false;
+	const bool replication = true;
 	bool truncation;
 	int in_width = mgr_timings->x_res;
 	int in_height = mgr_timings->y_res;
@@ -4373,7 +4374,7 @@ static void dispc_errata_i734_wa(void)
 
 	/* Setup and enable GFX plane */
 	dispc_ovl_set_channel_out(OMAP_DSS_GFX, OMAP_DSS_CHANNEL_LCD);
-	dispc_ovl_setup(OMAP_DSS_GFX, &ovli, false, &i734.timings, false);
+	dispc_ovl_setup(OMAP_DSS_GFX, &ovli, &i734.timings, false);
 	dispc_ovl_enable(OMAP_DSS_GFX, true);
 
 	/* Set up and enable display manager for LCD1 */

drivers/gpu/drm/omapdrm/dss/dispc6.c

@@ -557,7 +557,8 @@ static bool dispc6_lcd_timings_ok(int hsw, int hfp, int hbp,
 bool dispc6_mgr_timings_ok(enum omap_channel channel,
 			   const struct omap_video_timings *timings)
 {
-	if (timings->pixelclock < dispc.feat->min_pclk)
+	if (timings->pixelclock < dispc.feat->min_pclk &&
+		timings->pixelclock != 9000000)
 		return false;
 
 	if (timings->pixelclock > dispc.feat->max_pclk)
@@ -1005,7 +1006,7 @@ static s32 pixinc(int pixels, u8 ps)
 }
 
 static int dispc6_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi,
-			    bool replication, const struct omap_video_timings *mgr_timings,
+			    const struct omap_video_timings *mgr_timings,
 			    bool mem_to_mem)
 {
 	u32 fourcc = dispc6_dss_colormode_to_fourcc(oi->color_mode);

drivers/gpu/drm/omapdrm/dss/dpi.c

@@ -197,14 +197,6 @@ static bool dpi_calc_hsdiv_cb(int m_dispc, unsigned long dispc,
 {
 	struct dpi_clk_calc_ctx *ctx = data;
 
-	/*
-	 * Odd dividers give us uneven duty cycle, causing problem when level
-	 * shifted. So skip all odd dividers when the pixel clock is on the
-	 * higher side.
-	 */
-	if (m_dispc > 1 && m_dispc % 2 != 0 && ctx->pck_min >= 100000000)
-		return false;
-
 	ctx->pll_cinfo.mX[ctx->clkout_idx] = m_dispc;
 	ctx->pll_cinfo.clkout[ctx->clkout_idx] = dispc;
 

drivers/gpu/drm/omapdrm/dss/omapdss.h

@@ -996,7 +996,7 @@ struct dispc_ops {
 	void (*ovl_set_channel_out)(enum omap_plane plane,
 			enum omap_channel channel);
 	int (*ovl_setup)(enum omap_plane plane, const struct omap_overlay_info *oi,
-			bool replication, const struct omap_video_timings *mgr_timings,
+			const struct omap_video_timings *mgr_timings,
 			bool mem_to_mem);
 
 	enum omap_color_mode (*ovl_get_color_modes)(enum omap_plane plane);

drivers/gpu/drm/omapdrm/omap_drv.c

@@ -527,8 +527,8 @@ static int omap_modeset_init(struct drm_device *dev)
 		priv->num_planes, priv->num_crtcs, priv->num_encoders,
 		priv->num_connectors);
 
-	dev->mode_config.min_width = 32;
-	dev->mode_config.min_height = 32;
+	dev->mode_config.min_width = 8;
+	dev->mode_config.min_height = 2;
 
 	/* note: eventually will need some cpu_is_omapXYZ() type stuff here
 	 * to fill in these limits properly on different OMAP generations..

drivers/gpu/drm/omapdrm/omap_plane.c

@@ -144,7 +144,7 @@ static void omap_plane_atomic_update(struct drm_plane *plane,
 				  omap_crtc_channel(state->crtc));
 
 	/* and finally, update omapdss: */
-	ret = priv->dispc_ops->ovl_setup(omap_plane->id, &info, false,
+	ret = priv->dispc_ops->ovl_setup(omap_plane->id, &info,
 			      omap_crtc_timings(state->crtc), false);
 	if (ret) {
 		priv->dispc_ops->ovl_enable(omap_plane->id, false);

drivers/gpu/drm/omapdrm/omap_wb_m2m.c

@@ -56,7 +56,7 @@ static bool wbm2m_convert(struct wbm2m_dev *dev, enum omap_plane src_plane,
 
 	/* configure input */
 
-	r = priv->dispc_ops->ovl_setup(src_plane, src_info, 0, &t, 1);
+	r = priv->dispc_ops->ovl_setup(src_plane, src_info, &t, 1);
 	if (r)
 		return false;