| Message ID | 1458911416-47981-4-git-send-email-hverkuil@xs4all.nl (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Mar 25, 2016 at 10:10 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote: > From: Marek Szyprowski <m.szyprowski@samsung.com> > > Add a dts node entry and enable the HDMI CEC device present in the Exynos4 > family of SoCs. > > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> > --- > arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 4 ++++ > 1 file changed, 4 insertions(+) Applied for v4.7 with a little bit different subject and the new node put in alphabetical order. Please don't include your original patch in your tree because any merging will probably end with having these nodes twice. https://git.kernel.org/cgit/linux/kernel/git/krzk/linux.git/log/?h=next/dt (but tell me if you need to base on this so I would prepare a tag) Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Krzysztof, On 03/29/2016 08:28 AM, Krzysztof Kozlowski wrote: > On Fri, Mar 25, 2016 at 10:10 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote: >> From: Marek Szyprowski <m.szyprowski@samsung.com> >> >> Add a dts node entry and enable the HDMI CEC device present in the Exynos4 >> family of SoCs. >> >> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> >> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> >> --- >> arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 4 ++++ >> 1 file changed, 4 insertions(+) > > Applied for v4.7 with a little bit different subject and the new node > put in alphabetical order. Please don't include your original patch in > your tree because any merging will probably end with having these > nodes twice. Thanks for merging these three via your tree. I've dropped these three patches from my tree to avoid any merge issues. Regards, Hans > > https://git.kernel.org/cgit/linux/kernel/git/krzk/linux.git/log/?h=next/dt > (but tell me if you need to base on this so I would prepare a tag) > > Best regards, > Krzysztof > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi index 395c3ca..c9b1425 100644 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi @@ -500,3 +500,7 @@ &watchdog { status = "okay"; }; + +&hdmicec { + status = "okay"; +};