All of lore.kernel.org
 help / color / mirror / Atom feed
From: Heiko Stuebner <heiko@sntech.de>
To: Pierre-Hugues Husson <phh@phh.me>
Cc: Hans Verkuil <hverkuil@xs4all.nl>,
	linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-media@vger.kernel.org
Subject: [PATCH] pinctrl: rockchip: Add iomux-route switching support for rk3288
Date: Sat, 14 Oct 2017 17:39:17 +0200	[thread overview]
Message-ID: <13020229.tRmotBUImn@phil> (raw)
In-Reply-To: <2009704.s5LEIeT6xV@phil>

So far only the hdmi cec supports using one of two different pins
as source, so add the route switching for it.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
If I didn't mess up any numbering, the pinctrl change should look like
the following patch.

Hope that helps
Heiko

 drivers/pinctrl/pinctrl-rockchip.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index b5cb7858ffdc..8dd49e2e144b 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -884,6 +884,24 @@ static struct rockchip_mux_route_data rk3228_mux_route_data[] = {
 	},
 };
 
+static struct rockchip_mux_route_data rk3288_mux_route_data[] = {
+	{
+		/* edphdmi_cecinoutt1 */
+		.bank_num = 7,
+		.pin = 16,
+		.func = 2,
+		.route_offset = 0x264,
+		.route_val = BIT(16 + 12) | BIT(12),
+	}, {
+		/* edphdmi_cecinout */
+		.bank_num = 7,
+		.pin = 23,
+		.func = 4,
+		.route_offset = 0x264,
+		.route_val = BIT(16 + 12),
+	},
+};
+
 static struct rockchip_mux_route_data rk3328_mux_route_data[] = {
 	{
 		/* uart2dbg_rxm0 */
@@ -3391,6 +3409,8 @@ static struct rockchip_pin_ctrl rk3288_pin_ctrl = {
 		.type			= RK3288,
 		.grf_mux_offset		= 0x0,
 		.pmu_mux_offset		= 0x84,
+		.iomux_routes		= rk3288_mux_route_data,
+		.niomux_routes		= ARRAY_SIZE(rk3288_mux_route_data),
 		.pull_calc_reg		= rk3288_calc_pull_reg_and_bit,
 		.drv_calc_reg		= rk3288_calc_drv_reg_and_bit,
 };
-- 
2.14.1

WARNING: multiple messages have this Message-ID (diff)
From: heiko@sntech.de (Heiko Stuebner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] pinctrl: rockchip: Add iomux-route switching support for rk3288
Date: Sat, 14 Oct 2017 17:39:17 +0200	[thread overview]
Message-ID: <13020229.tRmotBUImn@phil> (raw)
In-Reply-To: <2009704.s5LEIeT6xV@phil>

So far only the hdmi cec supports using one of two different pins
as source, so add the route switching for it.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
If I didn't mess up any numbering, the pinctrl change should look like
the following patch.

Hope that helps
Heiko

 drivers/pinctrl/pinctrl-rockchip.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index b5cb7858ffdc..8dd49e2e144b 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -884,6 +884,24 @@ static struct rockchip_mux_route_data rk3228_mux_route_data[] = {
 	},
 };
 
+static struct rockchip_mux_route_data rk3288_mux_route_data[] = {
+	{
+		/* edphdmi_cecinoutt1 */
+		.bank_num = 7,
+		.pin = 16,
+		.func = 2,
+		.route_offset = 0x264,
+		.route_val = BIT(16 + 12) | BIT(12),
+	}, {
+		/* edphdmi_cecinout */
+		.bank_num = 7,
+		.pin = 23,
+		.func = 4,
+		.route_offset = 0x264,
+		.route_val = BIT(16 + 12),
+	},
+};
+
 static struct rockchip_mux_route_data rk3328_mux_route_data[] = {
 	{
 		/* uart2dbg_rxm0 */
@@ -3391,6 +3409,8 @@ static struct rockchip_pin_ctrl rk3288_pin_ctrl = {
 		.type			= RK3288,
 		.grf_mux_offset		= 0x0,
 		.pmu_mux_offset		= 0x84,
+		.iomux_routes		= rk3288_mux_route_data,
+		.niomux_routes		= ARRAY_SIZE(rk3288_mux_route_data),
 		.pull_calc_reg		= rk3288_calc_pull_reg_and_bit,
 		.drv_calc_reg		= rk3288_calc_drv_reg_and_bit,
 };
-- 
2.14.1

  reply	other threads:[~2017-10-14 15:39 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-13 22:53 [PATCH 0/3] Enable CEC on rk3399 Pierre-Hugues Husson
2017-10-13 22:53 ` Pierre-Hugues Husson
2017-10-13 22:53 ` [PATCH 1/3] drm: bridge: synopsys/dw-hdmi: Enable cec clock Pierre-Hugues Husson
2017-10-13 22:53   ` Pierre-Hugues Husson
2017-10-14  0:18   ` Fabio Estevam
2017-10-14  0:18     ` Fabio Estevam
2017-10-14 13:21     ` Pierre-Hugues Husson
2017-10-14 13:21       ` Pierre-Hugues Husson
2017-10-14 13:41       ` Fabio Estevam
2017-10-14 13:41         ` Fabio Estevam
2017-10-14  8:16   ` Hans Verkuil
2017-10-14  8:16     ` Hans Verkuil
2017-10-20  7:25     ` Hans Verkuil
2017-10-20  7:25       ` Hans Verkuil
2017-10-20  8:12   ` Russell King - ARM Linux
2017-10-20  8:12     ` Russell King - ARM Linux
2017-10-20 19:21     ` Pierre-Hugues Husson
2017-10-20 19:21       ` Pierre-Hugues Husson
2017-10-13 22:53 ` [PATCH 2/3] arm64: dts: rockchip: add the cec clk for dw-mipi-hdmi on rk3399 Pierre-Hugues Husson
2017-10-13 22:53   ` Pierre-Hugues Husson
2017-10-15 12:13   ` Heiko Stuebner
2017-10-15 12:13     ` Heiko Stuebner
2017-10-13 22:53 ` [PATCH 3/3] arm64: dts: rockchip: enable cec pin for rk3399 firefly Pierre-Hugues Husson
2017-10-13 22:53   ` Pierre-Hugues Husson
2017-10-15 12:13   ` Heiko Stuebner
2017-10-15 12:13     ` Heiko Stuebner
2017-10-14  8:23 ` [PATCH 0/3] Enable CEC on rk3399 Hans Verkuil
2017-10-14  8:23   ` Hans Verkuil
2017-10-14 13:14   ` Pierre-Hugues Husson
2017-10-14 13:14     ` Pierre-Hugues Husson
2017-10-14 14:52     ` Heiko Stuebner
2017-10-14 14:52       ` Heiko Stuebner
2017-10-14 15:39       ` Heiko Stuebner [this message]
2017-10-14 15:39         ` [PATCH] pinctrl: rockchip: Add iomux-route switching support for rk3288 Heiko Stuebner
2017-10-20  7:28         ` Hans Verkuil
2017-10-20  7:28           ` Hans Verkuil
2017-10-20  7:38           ` Heiko Stübner
2017-10-20  7:38             ` Heiko Stübner
2017-10-20  7:44             ` Hans Verkuil
2017-10-20  7:44               ` Hans Verkuil
2017-10-20 16:58               ` Heiko Stübner
2017-10-20 16:58                 ` Heiko Stübner
2017-10-20 16:58                 ` Heiko Stübner
2017-10-15 10:31       ` [PATCH 0/3] Enable CEC on rk3399 Hans Verkuil
2017-10-15 10:31         ` Hans Verkuil
2017-10-15 11:13         ` Heiko Stuebner
2017-10-15 11:13           ` Heiko Stuebner
2017-10-15 11:13           ` Heiko Stuebner
2017-10-21  8:53 [PATCH] pinctrl: rockchip: Add iomux-route switching support for rk3288 Heiko Stuebner
2017-10-31  9:14 ` Linus Walleij

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=13020229.tRmotBUImn@phil \
    --to=heiko@sntech.de \
    --cc=hverkuil@xs4all.nl \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=phh@phh.me \
    /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: link
Be 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.