On Tue, Jun 03, 2014 at 08:35:17AM +0100, Ian Campbell wrote: > > I tested both patches with a local build of 3.15~rc7-1~exp2 on a wandboard quad > > and a cubox i4pro, and they seem to work for a fbdev console and X at 16-bit, > > at least. > > > > If that's considered sufficiently upstream, It would be nice to apply them. > > I think that should be fine, I've copied submit@ to create new bug for > this bit (original, closed, bugreport on bcc). Just re-tested with a build of 3.15~rc8, still seems to work on Wandboard Quad and Cubox i4pro. The upstream commit also modifies the Hummingboard dts, but I was not able to test that so left it out of the patch (Suppose I should rename the patch appropriately, too, then. hrm): commit ac8aba3531d89aecde1a5f635634e7b87c3615ba Author: Vagrant Cascadian <vagrant@debian.org> Date: Thu Jun 5 12:24:44 2014 -0700 Add patches to enable HDMI on wandboard/cubox-i. diff --git a/patches/features/arm/ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch b/patches/features/arm/ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch new file mode 100644 index 0000000..28f41c5 --- /dev/null +++ b/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 <fabio.estevam@freescale.com> +Date: Tue, 22 Apr 2014 11:26:22 -0300 +Subject: [PATCH 1/2] ARM: dts: imx6qdl-wandboard: Add HDMI support + +Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> +Signed-off-by: Shawn Guo <shawn.guo@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.rc2 + diff --git a/patches/features/arm/ARM-imx-add-HDMI-support-for-SolidRun-HummingBoard-a.patch b/patches/features/arm/ARM-imx-add-HDMI-support-for-SolidRun-HummingBoard-a.patch new file mode 100644 index 0000000..1ad986b --- /dev/null +++ b/patches/features/arm/ARM-imx-add-HDMI-support-for-SolidRun-HummingBoard-a.patch @@ -0,0 +1,62 @@ +From f34d0d5dd86e794477c8d23622111f9709085041 Mon Sep 17 00:00:00 2001 +From: Russell King <rmk+kernel@arm.linux.org.uk> +Date: Fri, 18 Apr 2014 11:01:27 +0100 +Subject: [PATCH 2/2] 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+kernel@arm.linux.org.uk> +Signed-off-by: Shawn Guo <shawn.guo@freescale.com> +--- + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +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 +-- +2.0.0.rc2 + diff --git a/patches/series b/patches/series index 46319ef..c25897f 100644 --- a/patches/series +++ b/patches/series @@ -94,3 +94,5 @@ features/arm/ARM-dts-sun5i-Add-reg_vcc3v3-to-sun5i-board-mmc-node.patch features/arm/ARM-dts-sun6i-Add-reg_vcc3v3-to-sun6i-board-mmc-node.patch features/arm/ARM-dts-sun7i-Add-reg_vcc3v3-to-sun7i-board-mmc-node.patch features/arm/ARM-dts-sun7i-cubietruck-set-mmc3-bus-width-property.patch +features/arm/ARM-dts-imx6qdl-wandboard-Add-HDMI-support.patch +features/arm/ARM-imx-add-HDMI-support-for-SolidRun-HummingBoard-a.patch live well, vagrant
Attachment:
signature.asc
Description: Digital signature