From: rmk+kernel@arm.linux.org.uk (Russell King) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/5] DRM: Armada: add support for drm tda19988 driver Date: Sun, 06 Oct 2013 23:11:56 +0100 [thread overview] Message-ID: <E1VSwYO-0000iT-CU@rmk-PC.arm.linux.org.uk> (raw) In-Reply-To: <20131006220728.GG12758@n2100.arm.linux.org.uk> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- drivers/gpu/drm/armada/Kconfig | 9 +++++++ drivers/gpu/drm/armada/armada_drv.c | 42 +++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/armada/Kconfig b/drivers/gpu/drm/armada/Kconfig index c7a0a94..87e62dd 100644 --- a/drivers/gpu/drm/armada/Kconfig +++ b/drivers/gpu/drm/armada/Kconfig @@ -13,3 +13,12 @@ config DRM_ARMADA This driver provides no built-in acceleration; acceleration is performed by other IP found on the SoC. This driver provides kernel mode setting and buffer management to userspace. + +config DRM_ARMADA_TDA1998X + bool "Support TDA1998X HDMI output" + depends on DRM_ARMADA != n + depends on I2C && DRM_I2C_NXP_TDA998X = y + default y + help + Support the TDA1998x HDMI output device found on the Solid-Run + CuBox. diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index db62f1b..69517cf 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -16,6 +16,42 @@ #include <drm/armada_drm.h> #include "armada_ioctlP.h" +#ifdef CONFIG_DRM_ARMADA_TDA1998X +#include <drm/i2c/tda998x.h> +#include "armada_slave.h" + +static struct tda998x_encoder_params params = { + /* With 0x24, there is no translation between vp_out and int_vp + FB LCD out Pins VIP Int Vp + R:23:16 R:7:0 VPC7:0 7:0 7:0[R] + G:15:8 G:15:8 VPB7:0 23:16 23:16[G] + B:7:0 B:23:16 VPA7:0 15:8 15:8[B] + */ + .swap_a = 2, + .swap_b = 3, + .swap_c = 4, + .swap_d = 5, + .swap_e = 0, + .swap_f = 1, + .audio_cfg = BIT(2), + .audio_frame[1] = 1, + .audio_format = AFMT_SPDIF, + .audio_sample_rate = 44100, +}; + +static const struct armada_drm_slave_config tda19988_config = { + .i2c_adapter_id = 0, + .crtcs = 1 << 0, /* Only LCD0@the moment */ + .polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT, + .interlace_allowed = true, + .info = { + .type = "tda998x", + .addr = 0x70, + .platform_data = ¶ms, + }, +}; +#endif + static void armada_drm_unref_work(struct work_struct *work) { struct armada_private *priv = @@ -134,6 +170,12 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags) goto err_kms; } +#ifdef CONFIG_DRM_ARMADA_TDA1998X + ret = armada_drm_connector_slave_create(dev, &tda19988_config); + if (ret) + goto err_kms; +#endif + ret = drm_vblank_init(dev, n); if (ret) goto err_kms; -- 1.7.4.4
WARNING: multiple messages have this Message-ID (diff)
From: Russell King <rmk+kernel@arm.linux.org.uk> To: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org Cc: David Airlie <airlied@linux.ie>, Rob Clark <robdclark@gmail.com>, Jason Cooper <jason@lakedaemon.net>, Daniel Vetter <daniel@ffwll.ch>, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Subject: [PATCH 5/5] DRM: Armada: add support for drm tda19988 driver Date: Sun, 06 Oct 2013 23:11:56 +0100 [thread overview] Message-ID: <E1VSwYO-0000iT-CU@rmk-PC.arm.linux.org.uk> (raw) In-Reply-To: <20131006220728.GG12758@n2100.arm.linux.org.uk> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- drivers/gpu/drm/armada/Kconfig | 9 +++++++ drivers/gpu/drm/armada/armada_drv.c | 42 +++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/armada/Kconfig b/drivers/gpu/drm/armada/Kconfig index c7a0a94..87e62dd 100644 --- a/drivers/gpu/drm/armada/Kconfig +++ b/drivers/gpu/drm/armada/Kconfig @@ -13,3 +13,12 @@ config DRM_ARMADA This driver provides no built-in acceleration; acceleration is performed by other IP found on the SoC. This driver provides kernel mode setting and buffer management to userspace. + +config DRM_ARMADA_TDA1998X + bool "Support TDA1998X HDMI output" + depends on DRM_ARMADA != n + depends on I2C && DRM_I2C_NXP_TDA998X = y + default y + help + Support the TDA1998x HDMI output device found on the Solid-Run + CuBox. diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index db62f1b..69517cf 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -16,6 +16,42 @@ #include <drm/armada_drm.h> #include "armada_ioctlP.h" +#ifdef CONFIG_DRM_ARMADA_TDA1998X +#include <drm/i2c/tda998x.h> +#include "armada_slave.h" + +static struct tda998x_encoder_params params = { + /* With 0x24, there is no translation between vp_out and int_vp + FB LCD out Pins VIP Int Vp + R:23:16 R:7:0 VPC7:0 7:0 7:0[R] + G:15:8 G:15:8 VPB7:0 23:16 23:16[G] + B:7:0 B:23:16 VPA7:0 15:8 15:8[B] + */ + .swap_a = 2, + .swap_b = 3, + .swap_c = 4, + .swap_d = 5, + .swap_e = 0, + .swap_f = 1, + .audio_cfg = BIT(2), + .audio_frame[1] = 1, + .audio_format = AFMT_SPDIF, + .audio_sample_rate = 44100, +}; + +static const struct armada_drm_slave_config tda19988_config = { + .i2c_adapter_id = 0, + .crtcs = 1 << 0, /* Only LCD0 at the moment */ + .polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT, + .interlace_allowed = true, + .info = { + .type = "tda998x", + .addr = 0x70, + .platform_data = ¶ms, + }, +}; +#endif + static void armada_drm_unref_work(struct work_struct *work) { struct armada_private *priv = @@ -134,6 +170,12 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags) goto err_kms; } +#ifdef CONFIG_DRM_ARMADA_TDA1998X + ret = armada_drm_connector_slave_create(dev, &tda19988_config); + if (ret) + goto err_kms; +#endif + ret = drm_vblank_init(dev, n); if (ret) goto err_kms; -- 1.7.4.4
next prev parent reply other threads:[~2013-10-06 22:11 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-10-06 22:07 [PATCH 0/5] Armada DRM stuff Russell King - ARM Linux 2013-10-06 22:07 ` Russell King - ARM Linux 2013-10-06 22:07 ` [PATCH 1/5] drm/i2c: tda998x: set VIF for full range, underscanned display Russell King 2013-10-06 22:07 ` Russell King 2013-10-07 8:59 ` Jean-Francois Moine 2013-10-07 8:59 ` Jean-Francois Moine 2013-10-18 15:00 ` Rob Clark 2013-10-18 15:00 ` Rob Clark 2013-10-06 22:08 ` [PATCH 2/5] DRM: Armada: Add Armada DRM driver Russell King 2013-10-06 22:08 ` Russell King 2013-10-10 21:25 ` Rob Clark 2013-10-10 21:25 ` Rob Clark 2013-10-10 21:59 ` Russell King - ARM Linux 2013-10-10 21:59 ` Russell King - ARM Linux 2013-10-10 22:23 ` Rob Clark 2013-10-10 22:23 ` Rob Clark 2013-10-10 22:53 ` Russell King - ARM Linux 2013-10-10 22:53 ` Russell King - ARM Linux 2013-10-11 0:10 ` Rob Clark 2013-10-11 0:10 ` Rob Clark 2013-10-06 22:09 ` [PATCH 3/5] DRM: Armada: Add support for ARGB 32x64 or 64x32 hardware cursors Russell King 2013-10-06 22:09 ` Russell King 2013-10-07 9:01 ` Jean-Francois Moine 2013-10-07 9:01 ` Jean-Francois Moine 2013-10-07 9:40 ` Russell King - ARM Linux 2013-10-07 9:40 ` Russell King - ARM Linux 2013-10-07 10:09 ` Jean-Francois Moine 2013-10-07 10:09 ` Jean-Francois Moine 2013-10-07 10:32 ` Russell King - ARM Linux 2013-10-07 10:32 ` Russell King - ARM Linux 2013-10-07 12:29 ` Siarhei Siamashka 2013-10-07 12:29 ` Siarhei Siamashka 2013-10-07 12:50 ` Russell King - ARM Linux 2013-10-07 12:50 ` Russell King - ARM Linux 2013-10-17 23:58 ` Rob Clark 2013-10-17 23:58 ` Rob Clark 2013-10-18 14:31 ` Alex Deucher 2013-10-18 14:31 ` Alex Deucher 2013-10-06 22:10 ` [PATCH 4/5] DRM: Armada: start of MMP2/MMP3 support Russell King 2013-10-06 22:10 ` Russell King 2013-10-18 0:11 ` Rob Clark 2013-10-18 0:11 ` Rob Clark 2013-10-06 22:11 ` Russell King [this message] 2013-10-06 22:11 ` [PATCH 5/5] DRM: Armada: add support for drm tda19988 driver Russell King 2013-10-07 9:18 ` Jean-Francois Moine 2013-10-07 9:18 ` Jean-Francois Moine 2013-10-07 9:44 ` Russell King - ARM Linux 2013-10-07 9:44 ` Russell King - ARM Linux 2013-10-07 10:48 ` Jean-Francois Moine 2013-10-07 10:48 ` Jean-Francois Moine 2013-10-07 11:09 ` Russell King - ARM Linux 2013-10-07 11:09 ` Russell King - ARM Linux 2013-10-07 11:29 ` Sebastian Hesselbarth 2013-10-07 11:29 ` Sebastian Hesselbarth 2013-10-07 15:53 ` Mark Brown 2013-10-07 15:53 ` Mark Brown 2013-10-07 16:08 ` Sebastian Hesselbarth 2013-10-07 16:08 ` Sebastian Hesselbarth 2013-10-07 17:05 ` Mark Brown 2013-10-07 17:05 ` Mark Brown 2013-10-07 12:03 ` Jean-Francois Moine 2013-10-07 12:03 ` Jean-Francois Moine 2013-10-07 12:36 ` Russell King - ARM Linux 2013-10-07 12:36 ` Russell King - ARM Linux 2013-10-07 14:59 ` Rob Clark 2013-10-07 14:59 ` Rob Clark 2013-10-08 9:19 ` Jean-Francois Moine 2013-10-08 9:19 ` Jean-Francois Moine 2013-10-08 9:49 ` Russell King - ARM Linux 2013-10-08 9:49 ` Russell King - ARM Linux 2013-10-08 15:34 ` Jean-Francois Moine 2013-10-08 15:34 ` Jean-Francois Moine 2013-10-18 0:20 ` Rob Clark 2013-10-18 0:20 ` Rob Clark 2013-10-08 12:07 ` Rob Clark 2013-10-08 12:07 ` Rob Clark 2013-10-07 21:47 ` [PATCH 0/5] Armada DRM stuff Sebastian Hesselbarth 2013-10-07 21:47 ` Sebastian Hesselbarth 2013-10-09 14:31 ` Russell King - ARM Linux 2013-10-09 14:31 ` Russell King - ARM Linux 2013-10-09 14:48 ` Rob Clark 2013-10-09 14:48 ` Rob Clark 2013-10-18 15:15 ` [GIT PULL] Armada DRM support Russell King - ARM Linux 2013-10-18 15:15 ` Russell King - ARM Linux 2013-10-22 13:36 ` Russell King - ARM Linux 2013-10-22 13:36 ` Russell King - ARM Linux
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=E1VSwYO-0000iT-CU@rmk-PC.arm.linux.org.uk \ --to=rmk+kernel@arm.linux.org.uk \ --cc=linux-arm-kernel@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.