Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
To:     robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org,
        shawnguo@kernel.org, s.hauer@pengutronix.de, l.stach@pengutronix.de
Cc:     kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
        laurent.pinchart@ideasonboard.com, marex@denx.de,
        paul.elder@ideasonboard.com, aford173@gmail.com,
        Markus.Niebel@ew.tq-group.com, alexander.stein@ew.tq-group.com,
        devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org, aisheng.dong@nxp.com,
        Peng Fan <peng.fan@nxp.com>
Subject: [PATCH 3/6] soc: imx: add i.MX8MP HDMI blk ctrl HDCP/HRV
Date:   Tue, 12 Jul 2022 16:21:43 +0800
Message-Id: <20220712082146.1192215-4-peng.fan@oss.nxp.com>
In-Reply-To: <20220712082146.1192215-1-peng.fan@oss.nxp.com>
References: <20220712082146.1192215-1-peng.fan@oss.nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 9e0dbff9-9d82-42d2-b68d-08da63df5f03
X-MS-TrafficTypeDiagnostic: DB8PR04MB6890:EE_
X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: UtKgP4L/h4i0800AmUEsJjH0L4bkDUcds5CtFfquCDsTHnK0dDzUficYcP6mw+2ZH2Wridw8X9kc5wMA/YUZdOC/nVv/ifGCGrDKfSRKwQkXHz7dl94PEEfnoFDvmo5XvPKYwXzWiLpF/ex5Ke37uc/Ll4M7JjuS4+fafbUpEtynE/Ke5GAfvAUkLjQGnKpqo+El+uoVXzwL8aNx6Isk3o4/74Vw2kvFOr77yVmlezOn2jOnwHwDQj95zRKIE44nUO9aZjvgmDG1yd8c0yLyNpopeO3ZLtXNShDZlOKw/HjHa8AWRUyp0JwaLDrJKkroI8VbmUgeaGkmSIJL/qsHt9w+OvW06uz+OMwCH2kVcV5EFBKgqZkeKYojglBJW2+YEWqLoUUyWJFJElHudxNkJIuYh6NfPYOXlVCRf3d6bfXgHPkO2YqDvGBSzh6r9Ls5Z5rXazQ0JwLfxiR2+zcpUfCKy0KMfRVNwPKZLPuESnvzWcx2831WugDy4sD166aGikJd7/12JVUd/6Y913BU/FZyHhB0VDTXPTVss9Ca6XtaTEJQkcEdcg+hAkI+2FExH7Ke5va31u9wNeKvg1gnWiaeh/ntr8Lm3twx229SvuzjqlgRanSx4mMPQskGVRMOeIVezg7yTkppXZIoCTtol+DCWURFNKptvOXaQjVCq/H2MgjUJjQYBT4VFhqHH00ZOZBVuaNeqGCMf2qwvgzOpKePV0p6K8xdIFQjMutsm/SWnd8bqccszIyEd/tl66yTcy1NHP6YBBfHGB8CK1W/cxxB3Ag0e+/zT/Qf+u/PXgwL/aB5+eJgKg72UEbjBIsu
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(346002)(376002)(396003)(366004)(136003)(39860400002)(186003)(1076003)(2616005)(2906002)(38100700002)(38350700002)(7416002)(4326008)(66556008)(316002)(66946007)(6512007)(86362001)(5660300002)(26005)(6506007)(6486002)(478600001)(66476007)(8936002)(6666004)(8676002)(41300700001)(52116002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1u+XfKUP+8o7m5FfsAHFoEzoTByNIAD3m/8cwfCnNrsIc4yGFPrDkoNkixJu?=
 =?us-ascii?Q?ENp6W7A4R7uAGr2lk8Pt7Oo5+TvuIRAcyZkO8QyTTJVYV6wk4Zwc+gj+xRNk?=
 =?us-ascii?Q?0UaT/j1geZbjhougqVg4gt5TkcOLBtC7e0sw6xyF7BpwAPiJ9p85Yi5H/7fw?=
 =?us-ascii?Q?tGO2Y3d8qj205BTJLF9Y6eVoR8GiZK7jOnUU5zi1KfscRgrmcjfvyPtOfQdB?=
 =?us-ascii?Q?LZdQz9Efcjwri1eNwp+d3b96C9rlf2ma9yEhDo7i4YAlWM9hwlv4+gWrhg64?=
 =?us-ascii?Q?SwtvPJq+I1p87uRai47Eqew6omH7EAzgjv1uhs6k3vUqcySUzWzgvZVp6X46?=
 =?us-ascii?Q?Uzi3upg+S/Gap7rxpWltUbLAySQgJK39gqXdL8oO4V5lQdKe56BXO0xanl4Y?=
 =?us-ascii?Q?R64RL3g6qHC8VvexNPgsx/xtxevO9LLfCQ5hS/iV01HKxYWNTw3xtlf03/2F?=
 =?us-ascii?Q?GIW04S0iDMr8UOxNZWIaBizI53FT8y9Y2VhCzVZmdgpaoRsXK5ICJ9D6kOWV?=
 =?us-ascii?Q?X0ePqhoA87InvU/CBpOhjirUHFpqJ4mufH1eSbuZZDRvqs5u6795weWkQ/SJ?=
 =?us-ascii?Q?I9BGnclh8QN3wqtxEe3LkA/RWBcl2mOW8EamIYHFXepZ5c5JHL+8cGDdlSh4?=
 =?us-ascii?Q?B8O/Y1e5qjNF5kWxh1A0fhs7hTDP01W+43e7Z8DqaaxNv3qcqfUB3saq4Prk?=
 =?us-ascii?Q?haqgaOJ1zas30Dg8foeK8Fr6qttcQon6yjNkQPaKOUz9gVTwjSFMWAi4aCLv?=
 =?us-ascii?Q?k1907wrV1vFIwsugO9eJ09qZYCrHMHVRaedyM4IVgp3GwCcj9zwY5oV8Cm3B?=
 =?us-ascii?Q?sBl99Qbaue1/0X0iG8JBKPs0uuzgThEoi7SMFllkMQzpPpaCmX71QaiDx+CN?=
 =?us-ascii?Q?CyaE7/JOWNzfF4i7VSGVKvJcFUu3A9b5ESKdQuaImjm1CakfDBZKGoCiu1hE?=
 =?us-ascii?Q?dOfW82TTHFT2+5vrCdhP7fMMJ5vUdAf6OhcsekRw+F9bMTvOFrBXW2sM6u1l?=
 =?us-ascii?Q?ibSWRJKIDfZ8vefzo9AYEZApusrnFABFWczuV0m8VYgQp8K9c7GB3JjliV75?=
 =?us-ascii?Q?EzEJW7iFugrgl02k/nFa8p3qELzGiC61ObObFdIXwrPgpGZZfO3D/QxF5BI3?=
 =?us-ascii?Q?VaAwkEC/1WmiRfYzS/bxDTgajt9Q03pFiEB+zZroYJbFoJO//cQEUN0LZu/8?=
 =?us-ascii?Q?rCHZ+QkWkhWiAd46rEkviATRil3GKB23narvsAL70fefd5sb9dyIE5s8NlVU?=
 =?us-ascii?Q?erTXAGTSJ+9SICZdalrxK42KjYpTJNcurr8ZnY00fXZQnzGtBxnw28zFgoOv?=
 =?us-ascii?Q?y4UoNUgGW4CsvORtQx2+hEulaWEWuk9fzi5vCyzPZ6tYUMfPDIadXeJfllWJ?=
 =?us-ascii?Q?9yodGaVv8LJQ9MI+duPc7x8FzTIYrHasbTnfsETustmGuWii9inapRs13eoQ?=
 =?us-ascii?Q?RRPr+1p0XgD8IRi/vfe3QXm+XaPqvYsbaBGlU7geAxr7J5oXRwfo08oDf318?=
 =?us-ascii?Q?8Ij+EIrcMWfZLRvn5RNh7wIlKQA1bi90YCWJwUHFjdIIrz+3kMXpt7YfFgjl?=
 =?us-ascii?Q?sgMe7iQ5yj3hBsyznIz8+HKY0HjpVlcoNLaat3/I?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9e0dbff9-9d82-42d2-b68d-08da63df5f03
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2022 08:20:25.2562
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: yKN8p3Y0MvqyJoSr3+04dgbxScFPnIjxL+I2/JkcysQQQThvQai+vByUSDzT2Xl6YE+kK36fnQtHZWWmEMdW1g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6890
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Peng Fan <peng.fan@nxp.com>

i.MX8MP HDMI supports HDCP and HRV, so add them.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/soc/imx/imx8mp-blk-ctrl.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/drivers/soc/imx/imx8mp-blk-ctrl.c b/drivers/soc/imx/imx8mp-blk-ctrl.c
index 6f983adcb47c..527d45d12a54 100644
--- a/drivers/soc/imx/imx8mp-blk-ctrl.c
+++ b/drivers/soc/imx/imx8mp-blk-ctrl.c
@@ -235,6 +235,13 @@ static void imx8mp_hdmi_blk_ctrl_power_on(struct imx8mp_blk_ctrl *bc,
 		regmap_set_bits(bc->regmap, HDMI_RTX_RESET_CTL0, BIT(12));
 		regmap_clear_bits(bc->regmap, HDMI_TX_CONTROL0, BIT(3));
 		break;
+	case IMX8MP_HDMIBLK_PD_HDCP:
+		regmap_set_bits(bc->regmap, HDMI_RTX_CLK_CTL0, BIT(11));
+		break;
+	case IMX8MP_HDMIBLK_PD_HRV:
+		regmap_set_bits(bc->regmap, HDMI_RTX_CLK_CTL1, BIT(3) | BIT(4) | BIT(5));
+		regmap_set_bits(bc->regmap, HDMI_RTX_RESET_CTL0, BIT(15));
+		break;
 	default:
 		break;
 	}
@@ -283,6 +290,13 @@ static void imx8mp_hdmi_blk_ctrl_power_off(struct imx8mp_blk_ctrl *bc,
 		regmap_clear_bits(bc->regmap, HDMI_RTX_RESET_CTL0, BIT(12));
 		regmap_clear_bits(bc->regmap, HDMI_RTX_CLK_CTL1, BIT(22) | BIT(24));
 		break;
+	case IMX8MP_HDMIBLK_PD_HDCP:
+		regmap_clear_bits(bc->regmap, HDMI_RTX_CLK_CTL0, BIT(11));
+		break;
+	case IMX8MP_HDMIBLK_PD_HRV:
+		regmap_clear_bits(bc->regmap, HDMI_RTX_RESET_CTL0, BIT(15));
+		regmap_clear_bits(bc->regmap, HDMI_RTX_CLK_CTL1, BIT(3) | BIT(4) | BIT(5));
+		break;
 	default:
 		break;
 	}
@@ -365,6 +379,22 @@ static const struct imx8mp_blk_ctrl_domain_data imx8mp_hdmi_domain_data[] = {
 		.num_clks = 2,
 		.gpc_name = "hdmi-tx-phy",
 	},
+	[IMX8MP_HDMIBLK_PD_HRV] = {
+		.name = "hdmiblk-hrv",
+		.clk_names = (const char *[]){ "axi", "apb" },
+		.num_clks = 2,
+		.gpc_name = "hrv",
+		.path_names = (const char *[]){"hrv"},
+		.num_paths = 1,
+	},
+	[IMX8MP_HDMIBLK_PD_HDCP] = {
+		.name = "hdmiblk-hdcp",
+		.clk_names = (const char *[]){ "axi", "apb" },
+		.num_clks = 2,
+		.gpc_name = "hdcp",
+		.path_names = (const char *[]){"hdcp"},
+		.num_paths = 1,
+	},
 };
 
 static const struct imx8mp_blk_ctrl_data imx8mp_hdmi_blk_ctl_dev_data = {
-- 
2.25.1