diff --git a/debian/changelog b/debian/changelog index 466ed4068..f2044e31e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ linux (3.15~rc8-1~exp2) UNRELEASED; urgency=medium + [ maximilian attems ] * Update policy version to 3.9.5 without changes + [ Ian Campbell ] + * [armhf] Enable HDMI on imx6qdl-wandboard, SolidRun HummingBoard and + Cubox -i. (Closes: #750406) + -- maximilian attems Tue, 03 Jun 2014 23:44:00 +0200 linux (3.15~rc8-1~exp1) experimental; urgency=medium diff --git a/debian/patches/features/arm/ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch b/debian/patches/features/arm/ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch new file mode 100644 index 000000000..a03c18fb1 --- /dev/null +++ b/debian/patches/features/arm/ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch @@ -0,0 +1,51 @@ +From fed687c526a4e93a9605f779537bf654cda1a36f Mon Sep 17 00:00:00 2001 +From: Fabio Estevam +Date: Tue, 22 Apr 2014 11:26:22 -0300 +Subject: [PATCH] ARM: dts: imx6qdl-wandboard: Add HDMI support + +Signed-off-by: Fabio Estevam +Signed-off-by: Shawn Guo +--- + 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 +-- +1.9.0 + diff --git a/debian/patches/features/arm/ARM-imx-add-HDMI-support-for-SolidRun-HummingBoard-a.patch b/debian/patches/features/arm/ARM-imx-add-HDMI-support-for-SolidRun-HummingBoard-a.patch new file mode 100644 index 000000000..b779a184f --- /dev/null +++ b/debian/patches/features/arm/ARM-imx-add-HDMI-support-for-SolidRun-HummingBoard-a.patch @@ -0,0 +1,122 @@ +From f34d0d5dd86e794477c8d23622111f9709085041 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 18 Apr 2014 11:01:27 +0100 +Subject: [PATCH] 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 +Signed-off-by: Shawn Guo +--- + arch/arm/boot/dts/imx6dl-hummingboard.dts | 27 +++++++++++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 27 +++++++++++++++++++++++++++ + 2 files changed, 54 insertions(+) + +diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts +index 121991c..5373a5f 100644 +--- a/arch/arm/boot/dts/imx6dl-hummingboard.dts ++++ b/arch/arm/boot/dts/imx6dl-hummingboard.dts +@@ -71,6 +71,13 @@ + status = "okay"; + }; + ++&hdmi { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_hummingboard_hdmi>; ++ ddc-i2c-bus = <&i2c2>; ++ status = "okay"; ++}; ++ + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard_i2c1>; +@@ -86,6 +93,13 @@ + */ + }; + ++&i2c2 { ++ clock-frequency = <100000>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_hummingboard_i2c2>; ++ status = "okay"; ++}; ++ + &iomuxc { + hummingboard { + pinctrl_hummingboard_flexcan1: hummingboard-flexcan1 { +@@ -101,6 +115,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 +@@ -108,6 +128,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 = ; + }; +diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +index c2a2488..25da82a 100644 +--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi ++++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +@@ -55,6 +55,20 @@ + }; + }; + ++&hdmi { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_cubox_i_hdmi>; ++ ddc-i2c-bus = <&i2c2>; ++ status = "okay"; ++}; ++ ++&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 +83,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.9.0 + diff --git a/debian/patches/series b/debian/patches/series index e71b2a0ca..e7d62a46f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -99,3 +99,6 @@ bugfix/all/futex-prevent-requeue-pi-on-same-futex.patch bugfix/all/futex-Validate-atomic-acquisition-in-futex_lock_pi_atomic.patch bugfix/all/futex-Always-cleanup-owner-tid-in-unlock_pi.patch bugfix/all/futex-Make-lookup_pi_state-more-robust.patch + +features/arm/ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch +features/arm/ARM-imx-add-HDMI-support-for-SolidRun-HummingBoard-a.patch