Source: linux Version: 3.15~rc5-1~exp1 Severity: wishlist Tags: patch Please apply the following patches, which enable HDMI video output on the cubox-i (tested) and untested on wandboard and hummingboard.
The patch for wandboard was from linux-next, the cubox-i/hummingboard patch from: http://www.home.arm.linux.org.uk/~rmk/cubox/hummingboard-cubox-i-v3.15-rc1/0214-ARM-imx-add-HDMI-support-for-SolidRun-HummingBoard-a.patch At the very least, please consider the config.armmp changes, as this would allow users to use a custom .dtb file without having to rebuild the kernel. I tried patches for 3.14, but the diff was considerably larger. So I've tested using local builds of 3.15~rc5 with the debian packaging from svn. Thanks! live well, vagrant diff --git a/config/armhf/config.armmp b/config/armhf/config.armmp index f9d65d9..b692d4b 100644 --- a/config/armhf/config.armmp +++ b/config/armhf/config.armmp @@ -209,6 +209,16 @@ CONFIG_DRM_TILCDC=m CONFIG_HWSPINLOCK_OMAP=m ## +## file: drivers/staging/imx-drm/Kconfig +## +CONFIG_DRM_IMX=m +CONFIG_DRM_IMX_FB_HELPER=m +CONFIG_DRM_IMX_LDB=m +CONFIG_DRM_IMX_HDMI=m +CONFIG_DRM_IMX_IPUV3_CORE=m +CONFIG_DRM_IMX_IPUV3=m + +## ## file: drivers/i2c/Kconfig ## CONFIG_I2C_CHARDEV=m diff --git a/patches/0001-ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch b/patches/0001-ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch new file mode 100644 index 0000000..a67c1ed --- /dev/null +++ b/patches/0001-ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch @@ -0,0 +1,51 @@ +From 840e684cc847e847672a0abefd38875f682ad94d Mon Sep 17 00:00:00 2001 +From: Fabio Estevam <fabio.este...@freescale.com> +Date: Tue, 22 Apr 2014 11:26:22 -0300 +Subject: [PATCH] ARM: dts: imx6qdl-wandboard: Add HDMI support + +Signed-off-by: Fabio Estevam <fabio.este...@freescale.com> +Signed-off-by: Shawn Guo <shawn....@freescale.com> +--- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi +index bdfdf89..5c6f10c 100644 +--- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi ++++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi +@@ -62,6 +62,18 @@ + status = "okay"; + }; + ++&hdmi { ++ ddc-i2c-bus = <&i2c1>; ++ status = "okay"; ++}; ++ ++&i2c1 { ++ clock-frequency = <100000>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_i2c1>; ++ status = "okay"; ++}; ++ + &i2c2 { + clock-frequency = <100000>; + pinctrl-names = "default"; +@@ -127,6 +139,13 @@ + >; + }; + ++ pinctrl_i2c1: i2c1grp { ++ fsl,pins = < ++ MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 ++ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 ++ >; ++ }; ++ + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 +-- +2.0.0.rc0 + diff --git a/patches/0214-ARM-imx-add-HDMI-support-for-SolidRun-HummingBoard-a.patch b/patches/0214-ARM-imx-add-HDMI-support-for-SolidRun-HummingBoard-a.patch new file mode 100644 index 0000000..94ac895 --- /dev/null +++ b/patches/0214-ARM-imx-add-HDMI-support-for-SolidRun-HummingBoard-a.patch @@ -0,0 +1,121 @@ +From: Russell King <rmk+ker...@arm.linux.org.uk> +Subject: [PATCH 214/230] ARM: imx: add HDMI support for SolidRun HummingBoard + and Cubox-i + +Add the HDMI DT configuration for the SolidRun HummingBoard and Cubox-i. + +Signed-off-by: Russell King <rmk+ker...@arm.linux.org.uk> +--- + arch/arm/boot/dts/imx6dl-hummingboard.dts | 28 ++++++++++++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 28 ++++++++++++++++++++++++++++ + 2 files changed, 56 insertions(+) + +diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts +index 5bfae54fb780..d3095f58bf7b 100644 +--- a/arch/arm/boot/dts/imx6dl-hummingboard.dts ++++ b/arch/arm/boot/dts/imx6dl-hummingboard.dts +@@ -67,6 +67,14 @@ + status = "okay"; + }; + ++&hdmi { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_hummingboard_hdmi>; ++ ddc-i2c-bus = <&i2c2>; ++ status = "okay"; ++ crtcs = <&ipu1 0>; ++}; ++ + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard_i2c1>; +@@ -82,6 +90,13 @@ + */ + }; + ++&i2c2 { ++ clock-frequency = <100000>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_hummingboard_i2c2>; ++ status = "okay"; ++}; ++ + &iomuxc { + hummingboard { + pinctrl_hummingboard_flexcan1: hummingboard-flexcan1 { +@@ -97,6 +112,12 @@ + >; + }; + ++ pinctrl_hummingboard_hdmi: hummingboard-hdmi { ++ fsl,pins = < ++ MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0 ++ >; ++ }; ++ + pinctrl_hummingboard_i2c1: hummingboard-i2c1 { + fsl,pins = < + MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 +@@ -104,6 +125,13 @@ + >; + }; + ++ pinctrl_hummingboard_i2c2: hummingboard-i2c2 { ++ fsl,pins = < ++ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 ++ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 ++ >; ++ }; ++ + pinctrl_hummingboard_spdif: hummingboard-spdif { + fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>; + }; +diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +index c2a24888a276..5b9e7bceedaa 100644 +--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi ++++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +@@ -55,6 +55,21 @@ + }; + }; + ++&hdmi { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_cubox_i_hdmi>; ++ ddc-i2c-bus = <&i2c2>; ++ status = "okay"; ++ crtcs = <&ipu1 0>; ++}; ++ ++&i2c2 { ++ clock-frequency = <100000>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_cubox_i_i2c2>; ++ status = "okay"; ++}; ++ + &i2c3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_cubox_i_i2c3>; +@@ -69,6 +84,19 @@ + + &iomuxc { + cubox_i { ++ pinctrl_cubox_i_hdmi: cubox-i-hdmi { ++ fsl,pins = < ++ MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0 ++ >; ++ }; ++ ++ pinctrl_cubox_i_i2c2: cubox-i-i2c2 { ++ fsl,pins = < ++ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 ++ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 ++ >; ++ }; ++ + pinctrl_cubox_i_i2c3: cubox-i-i2c3 { + fsl,pins = < + MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1 +-- +1.8.3.1 + diff --git a/patches/series b/patches/series index 22d532a..f566084 100644 --- a/patches/series +++ b/patches/series @@ -69,3 +69,5 @@ bugfix/all/0002-Staging-speakup-Update-__speakup_paste_selection-tty.patch features/all/x86-memtest-WARN-if-bad-RAM-found.patch features/all/efi-autoload-efivars.patch features/all/mvsas-Recognise-device-subsystem-9485-9485-as-88SE94.patch +0214-ARM-imx-add-HDMI-support-for-SolidRun-HummingBoard-a.patch +0001-ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch
signature.asc
Description: Digital signature
