From 5174d6a64aabf3a4fa60dd21cc1fd6f11e5e3573 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Wed, 22 Jan 2014 21:45:00 +0000 Subject: [PATCH 1/3] mxc_hdmi: Dont require CEA mode This fixes problems with DVI monitors connected to the HDMI port via a DVI <-> HDMI cable. With dvi monitors, the list of CEA modes is always zero, preventing modes higher than 1024x768 to be used. This patch disables the CEA mode check. Upstream-Status: Pending Signed-off-by: Jeffrey Clark --- drivers/video/mxc/mxc_hdmi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/mxc/mxc_hdmi.c b/drivers/video/mxc/mxc_hdmi.c index 057bcd184209c3..50ce154392c466 100644 --- a/drivers/video/mxc/mxc_hdmi.c +++ b/drivers/video/mxc/mxc_hdmi.c @@ -1800,10 +1800,10 @@ static void mxc_hdmi_edid_rebuild_modelist(struct mxc_hdmi *hdmi) */ mode = &hdmi->fbi->monspecs.modedb[i]; - if (!(mode->vmode & FB_VMODE_INTERLACED) && - (mxc_edid_mode_to_vic(mode) != 0)) { + if (!(mode->vmode & FB_VMODE_INTERLACED)) { + int vic = mxc_edid_mode_to_vic(mode); - dev_dbg(&hdmi->pdev->dev, "Added mode %d:", i); + dev_dbg(&hdmi->pdev->dev, "%s: Added mode %d(VIC %u):", __func__, i, vic); dev_dbg(&hdmi->pdev->dev, "xres = %d, yres = %d, freq = %d, vmode = %d, flag = %d\n", hdmi->fbi->monspecs.modedb[i].xres, From 52b964943a1fd98d2b5710531cf8ef123eb6d2f0 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Sat, 24 May 2014 19:40:28 -0500 Subject: [PATCH 2/3] wandboard: Fix bluetooth Fix uart3 dts pins Add minimal bluetooth to default config --- arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 2 +- arch/arm/boot/dts/imx6qdl.dtsi | 8 ++++++++ arch/arm/configs/wandboard_defconfig | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi index 1cc484078bd355..7587a6ebc7c980 100644 --- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi +++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi @@ -432,7 +432,7 @@ reference manual. &uart3 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart3_1>; + pinctrl-0 = <&pinctrl_uart3_2>; fsl,uart-has-rtscts; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 2cb5ae0294e635..95bd7b16b6a66a 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -1518,6 +1518,14 @@ MX6QDL_PAD_EIM_EB3__UART3_RTS_B 0x1b0b1 >; }; + pinctrl_uart3_2: uart3grp-2 { + fsl,pins = < + MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1 + MX6QDL_PAD_EIM_EB3__UART3_RTS_B 0x1b0b1 + >; + }; }; uart4 { diff --git a/arch/arm/configs/wandboard_defconfig b/arch/arm/configs/wandboard_defconfig index 2b2dfc088b3962..1e085a0494b370 100644 --- a/arch/arm/configs/wandboard_defconfig +++ b/arch/arm/configs/wandboard_defconfig @@ -66,6 +66,15 @@ CONFIG_NETFILTER=y CONFIG_VLAN_8021Q=y CONFIG_CAN=y CONFIG_CAN_FLEXCAN=y +CONFIG_BT=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y CONFIG_CFG80211=y CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=y From 184b2ace4239f6e79da48e239cc52b0d96d601fd Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Tue, 27 May 2014 09:45:40 -0500 Subject: [PATCH 3/3] Revert "mxc_hdmi: Dont require CEA mode" Using this patch can cause usable CEA modes to be erroneously overwritten. This reverts commit 5174d6a64aabf3a4fa60dd21cc1fd6f11e5e3573. --- drivers/video/mxc/mxc_hdmi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/mxc/mxc_hdmi.c b/drivers/video/mxc/mxc_hdmi.c index 50ce154392c466..057bcd184209c3 100644 --- a/drivers/video/mxc/mxc_hdmi.c +++ b/drivers/video/mxc/mxc_hdmi.c @@ -1800,10 +1800,10 @@ static void mxc_hdmi_edid_rebuild_modelist(struct mxc_hdmi *hdmi) */ mode = &hdmi->fbi->monspecs.modedb[i]; - if (!(mode->vmode & FB_VMODE_INTERLACED)) { - int vic = mxc_edid_mode_to_vic(mode); + if (!(mode->vmode & FB_VMODE_INTERLACED) && + (mxc_edid_mode_to_vic(mode) != 0)) { - dev_dbg(&hdmi->pdev->dev, "%s: Added mode %d(VIC %u):", __func__, i, vic); + dev_dbg(&hdmi->pdev->dev, "Added mode %d:", i); dev_dbg(&hdmi->pdev->dev, "xres = %d, yres = %d, freq = %d, vmode = %d, flag = %d\n", hdmi->fbi->monspecs.modedb[i].xres,