From patchwork Tue Jun 25 14:21:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 19083 X-Patchwork-Delegate: sylvester.nawrocki@gmail.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UrU8z-0004By-K6; Tue, 25 Jun 2013 16:22:53 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1UrU8x-0003K0-26; Tue, 25 Jun 2013 16:22:53 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751387Ab3FYOWt (ORCPT + 1 other); Tue, 25 Jun 2013 10:22:49 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:8780 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751059Ab3FYOWr (ORCPT ); Tue, 25 Jun 2013 10:22:47 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOY009EZD9KVV80@mailout3.samsung.com>; Tue, 25 Jun 2013 23:22:46 +0900 (KST) X-AuditID: cbfee61a-b7f3b6d000006edd-fc-51c9a7b60954 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id DA.20.28381.6B7A9C15; Tue, 25 Jun 2013 23:22:46 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MOY00ISLD8IH350@mmp1.samsung.com>; Tue, 25 Jun 2013 23:22:46 +0900 (KST) From: Sylwester Nawrocki To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: kishon@ti.com, linux-media@vger.kernel.org, kyungmin.park@samsung.com, balbi@ti.com, t.figa@samsung.com, devicetree-discuss@lists.ozlabs.org, kgene.kim@samsung.com, dh09.lee@samsung.com, jg1.han@samsung.com, inki.dae@samsung.com, plagnioj@jcrosoft.com, linux-fbdev@vger.kernel.org, Sylwester Nawrocki Subject: [PATCH v2 4/5] exynos4-is: Use generic MIPI CSIS PHY driver Date: Tue, 25 Jun 2013 16:21:49 +0200 Message-id: <1372170110-12993-4-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1372170110-12993-1-git-send-email-s.nawrocki@samsung.com> References: <1372170110-12993-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrFLMWRmVeSWpSXmKPExsVy+t9jAd1ty08GGixeYWxx8H69xYHZD1kt rp+3s5h0fwKLxeWFl1gtehdcZbO48LSHzeJs0xt2i02Pr7FanOj7wGrRs2Erq8WM8/uYLNY9 fMFkcfhNO6vF+hmvWRz4PV5duMPisXlJvcf5GQsZPfq2rGL0OH5jO5PH501yAWxRXDYpqTmZ ZalF+nYJXBkL3goVLFao+PiGtYFxlVQXIyeHhICJxOzD8xkhbDGJC/fWs3UxcnEICSxilFgy ewaU08EkcWrbDCaQKjYBQ4neo31AHRwcIgLeEsuvKYLUMAtcZJI4vfcdG0hcWMBFouepJ0g5 i4CqxIoZ78FaeQXcJO7MX8AEUiIhoCAxZ5INSJhTwF1i/dGlLCC2EFDJlRnzWCYw8i5gZFjF KJpakFxQnJSea6hXnJhbXJqXrpecn7uJERyiz6R2MK5ssDjEKMDBqMTDG7nrRKAQa2JZcWXu IUYJDmYlEd5DWScDhXhTEiurUovy44tKc1KLDzFKc7AoifMeaLUOFBJITyxJzU5NLUgtgsky cXBKNTAKmZbcPMDH1Rp+7tKtsNmffOpNC9zvMTPvPRFx9sKuXumGsBcrtrgJhuW9/c54NYa7 8Cv/S74J8TwSO35cM3y97JiQwW7FJPbYLq/wDp35AWcleVLkv13b8PaScb/9EaWOm8+69vv2 hp/5sIB/XeapCyqnUw8/VE+N29jnfF82NORAxMns6wZKLMUZiYZazEXFiQDj2R9HTQIAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.6.25.141515 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_4000_4999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __STOCK_PHRASE_24 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Use the generic PHY API instead of the platform callback to control the MIPI CSIS DPHY. The 'phy_label' field is added to the platform data structure to allow PHY lookup on non-dt platforms Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Acked-by: Felipe Balbi --- drivers/media/platform/exynos4-is/mipi-csis.c | 16 +++++++++++++--- include/linux/platform_data/mipi-csis.h | 11 ++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c index a2eda9d..8436254 100644 --- a/drivers/media/platform/exynos4-is/mipi-csis.c +++ b/drivers/media/platform/exynos4-is/mipi-csis.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -167,6 +168,7 @@ struct csis_pktbuf { * @sd: v4l2_subdev associated with CSIS device instance * @index: the hardware instance index * @pdev: CSIS platform device + * @phy: pointer to the CSIS generic PHY * @regs: mmaped I/O registers memory * @supplies: CSIS regulator supplies * @clock: CSIS clocks @@ -189,6 +191,8 @@ struct csis_state { struct v4l2_subdev sd; u8 index; struct platform_device *pdev; + struct phy *phy; + const char *phy_label; void __iomem *regs; struct regulator_bulk_data supplies[CSIS_NUM_SUPPLIES]; struct clk *clock[NUM_CSIS_CLOCKS]; @@ -726,6 +730,7 @@ static int s5pcsis_get_platform_data(struct platform_device *pdev, state->index = max(0, pdev->id); state->max_num_lanes = state->index ? CSIS1_MAX_LANES : CSIS0_MAX_LANES; + state->phy_label = pdata->phy_label; return 0; } @@ -763,8 +768,9 @@ static int s5pcsis_parse_dt(struct platform_device *pdev, "samsung,csis-wclk"); state->num_lanes = endpoint.bus.mipi_csi2.num_data_lanes; - of_node_put(node); + + state->phy_label = "csis"; return 0; } #else @@ -800,6 +806,10 @@ static int s5pcsis_probe(struct platform_device *pdev) return -EINVAL; } + state->phy = devm_phy_get(dev, state->phy_label); + if (IS_ERR(state->phy)) + return PTR_ERR(state->phy); + mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); state->regs = devm_ioremap_resource(dev, mem_res); if (IS_ERR(state->regs)) @@ -893,7 +903,7 @@ static int s5pcsis_pm_suspend(struct device *dev, bool runtime) mutex_lock(&state->lock); if (state->flags & ST_POWERED) { s5pcsis_stop_stream(state); - ret = s5p_csis_phy_enable(state->index, false); + ret = phy_power_off(state->phy); if (ret) goto unlock; ret = regulator_bulk_disable(CSIS_NUM_SUPPLIES, @@ -929,7 +939,7 @@ static int s5pcsis_pm_resume(struct device *dev, bool runtime) state->supplies); if (ret) goto unlock; - ret = s5p_csis_phy_enable(state->index, true); + ret = phy_power_on(state->phy); if (!ret) { state->flags |= ST_POWERED; } else { diff --git a/include/linux/platform_data/mipi-csis.h b/include/linux/platform_data/mipi-csis.h index bf34e17..9214317 100644 --- a/include/linux/platform_data/mipi-csis.h +++ b/include/linux/platform_data/mipi-csis.h @@ -17,21 +17,14 @@ * @wclk_source: CSI wrapper clock selection: 0 - bus clock, 1 - ext. SCLK_CAM * @lanes: number of data lanes used * @hs_settle: HS-RX settle time + * @phy_label: the generic PHY label */ struct s5p_platform_mipi_csis { unsigned long clk_rate; u8 wclk_source; u8 lanes; u8 hs_settle; + const char *phy_label; }; -/** - * s5p_csis_phy_enable - global MIPI-CSI receiver D-PHY control - * @id: MIPI-CSIS harware instance index (0...1) - * @on: true to enable D-PHY and deassert its reset - * false to disable D-PHY - * @return: 0 on success, or negative error code on failure - */ -int s5p_csis_phy_enable(int id, bool on); - #endif /* __PLAT_SAMSUNG_MIPI_CSIS_H_ */