From 37abc181bbac235633ae23f94d81138c20a4c147 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Tue, 25 Aug 2020 19:07:10 -0300 Subject: phy: Move phy-rockchip-dphy-rx0 out of staging There is no need for this driver to be in staging. Let's promote it! Signed-off-by: Ezequiel Garcia Link: https://lore.kernel.org/r/20200825220710.634106-1-ezequiel@collabora.com Signed-off-by: Vinod Koul --- drivers/staging/media/Kconfig | 2 - drivers/staging/media/Makefile | 1 - .../staging/media/phy-rockchip-dphy-rx0/Kconfig | 13 - .../staging/media/phy-rockchip-dphy-rx0/Makefile | 2 - drivers/staging/media/phy-rockchip-dphy-rx0/TODO | 6 - .../phy-rockchip-dphy-rx0/phy-rockchip-dphy-rx0.c | 388 --------------------- 6 files changed, 412 deletions(-) delete mode 100644 drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig delete mode 100644 drivers/staging/media/phy-rockchip-dphy-rx0/Makefile delete mode 100644 drivers/staging/media/phy-rockchip-dphy-rx0/TODO delete mode 100644 drivers/staging/media/phy-rockchip-dphy-rx0/phy-rockchip-dphy-rx0.c (limited to 'drivers/staging') diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index 71d077762698..63d3bc61b529 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -42,8 +42,6 @@ source "drivers/staging/media/tegra-video/Kconfig" source "drivers/staging/media/ipu3/Kconfig" -source "drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig" - source "drivers/staging/media/rkisp1/Kconfig" if MEDIA_ANALOG_TV_SUPPORT diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index 17ececa1e095..fee9c9b2aaaf 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -10,6 +10,5 @@ obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/ obj-$(CONFIG_TEGRA_VDE) += tegra-vde/ obj-$(CONFIG_VIDEO_HANTRO) += hantro/ obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/ -obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX0) += phy-rockchip-dphy-rx0/ obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1) += rkisp1/ obj-$(CONFIG_VIDEO_USBVISION) += usbvision/ diff --git a/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig b/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig deleted file mode 100644 index fb74df829371..000000000000 --- a/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -config PHY_ROCKCHIP_DPHY_RX0 - tristate "Rockchip MIPI Synopsys DPHY RX0 driver" - depends on ARCH_ROCKCHIP || COMPILE_TEST - select GENERIC_PHY_MIPI_DPHY - select GENERIC_PHY - help - Enable this to support the Rockchip MIPI Synopsys DPHY RX0 - associated to the Rockchip ISP module present in RK3399 SoCs. - - To compile this driver as a module, choose M here: the module - will be called phy-rockchip-dphy-rx0. diff --git a/drivers/staging/media/phy-rockchip-dphy-rx0/Makefile b/drivers/staging/media/phy-rockchip-dphy-rx0/Makefile deleted file mode 100644 index 507e5d0593ab..000000000000 --- a/drivers/staging/media/phy-rockchip-dphy-rx0/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX0) += phy-rockchip-dphy-rx0.o diff --git a/drivers/staging/media/phy-rockchip-dphy-rx0/TODO b/drivers/staging/media/phy-rockchip-dphy-rx0/TODO deleted file mode 100644 index ab612e5b27dc..000000000000 --- a/drivers/staging/media/phy-rockchip-dphy-rx0/TODO +++ /dev/null @@ -1,6 +0,0 @@ -The main reason for keeping this in staging is because the only driver -that uses this is rkisp1, which is also in staging. It should be moved together -with rkisp1. - -Please CC patches to Linux Media and -Helen Koike . diff --git a/drivers/staging/media/phy-rockchip-dphy-rx0/phy-rockchip-dphy-rx0.c b/drivers/staging/media/phy-rockchip-dphy-rx0/phy-rockchip-dphy-rx0.c deleted file mode 100644 index 7c4df6d48c43..000000000000 --- a/drivers/staging/media/phy-rockchip-dphy-rx0/phy-rockchip-dphy-rx0.c +++ /dev/null @@ -1,388 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Rockchip MIPI Synopsys DPHY RX0 driver - * - * Copyright (C) 2019 Collabora, Ltd. - * - * Based on: - * - * drivers/media/platform/rockchip/isp1/mipi_dphy_sy.c - * in https://chromium.googlesource.com/chromiumos/third_party/kernel, - * chromeos-4.4 branch. - * - * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd. - * Jacob Chen - * Shunqian Zheng - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define RK3399_GRF_SOC_CON9 0x6224 -#define RK3399_GRF_SOC_CON21 0x6254 -#define RK3399_GRF_SOC_CON22 0x6258 -#define RK3399_GRF_SOC_CON23 0x625c -#define RK3399_GRF_SOC_CON24 0x6260 -#define RK3399_GRF_SOC_CON25 0x6264 -#define RK3399_GRF_SOC_STATUS1 0xe2a4 - -#define CLOCK_LANE_HS_RX_CONTROL 0x34 -#define LANE0_HS_RX_CONTROL 0x44 -#define LANE1_HS_RX_CONTROL 0x54 -#define LANE2_HS_RX_CONTROL 0x84 -#define LANE3_HS_RX_CONTROL 0x94 -#define LANES_THS_SETTLE_CONTROL 0x75 -#define THS_SETTLE_COUNTER_THRESHOLD 0x04 - -struct hsfreq_range { - u16 range_h; - u8 cfg_bit; -}; - -static const struct hsfreq_range rk3399_mipidphy_hsfreq_ranges[] = { - { 89, 0x00 }, { 99, 0x10 }, { 109, 0x20 }, { 129, 0x01 }, - { 139, 0x11 }, { 149, 0x21 }, { 169, 0x02 }, { 179, 0x12 }, - { 199, 0x22 }, { 219, 0x03 }, { 239, 0x13 }, { 249, 0x23 }, - { 269, 0x04 }, { 299, 0x14 }, { 329, 0x05 }, { 359, 0x15 }, - { 399, 0x25 }, { 449, 0x06 }, { 499, 0x16 }, { 549, 0x07 }, - { 599, 0x17 }, { 649, 0x08 }, { 699, 0x18 }, { 749, 0x09 }, - { 799, 0x19 }, { 849, 0x29 }, { 899, 0x39 }, { 949, 0x0a }, - { 999, 0x1a }, { 1049, 0x2a }, { 1099, 0x3a }, { 1149, 0x0b }, - { 1199, 0x1b }, { 1249, 0x2b }, { 1299, 0x3b }, { 1349, 0x0c }, - { 1399, 0x1c }, { 1449, 0x2c }, { 1500, 0x3c } -}; - -static const char * const rk3399_mipidphy_clks[] = { - "dphy-ref", - "dphy-cfg", - "grf", -}; - -enum dphy_reg_id { - GRF_DPHY_RX0_TURNDISABLE = 0, - GRF_DPHY_RX0_FORCERXMODE, - GRF_DPHY_RX0_FORCETXSTOPMODE, - GRF_DPHY_RX0_ENABLE, - GRF_DPHY_RX0_TESTCLR, - GRF_DPHY_RX0_TESTCLK, - GRF_DPHY_RX0_TESTEN, - GRF_DPHY_RX0_TESTDIN, - GRF_DPHY_RX0_TURNREQUEST, - GRF_DPHY_RX0_TESTDOUT, - GRF_DPHY_TX0_TURNDISABLE, - GRF_DPHY_TX0_FORCERXMODE, - GRF_DPHY_TX0_FORCETXSTOPMODE, - GRF_DPHY_TX0_TURNREQUEST, - GRF_DPHY_TX1RX1_TURNDISABLE, - GRF_DPHY_TX1RX1_FORCERXMODE, - GRF_DPHY_TX1RX1_FORCETXSTOPMODE, - GRF_DPHY_TX1RX1_ENABLE, - GRF_DPHY_TX1RX1_MASTERSLAVEZ, - GRF_DPHY_TX1RX1_BASEDIR, - GRF_DPHY_TX1RX1_ENABLECLK, - GRF_DPHY_TX1RX1_TURNREQUEST, - GRF_DPHY_RX1_SRC_SEL, - /* rk3288 only */ - GRF_CON_DISABLE_ISP, - GRF_CON_ISP_DPHY_SEL, - GRF_DSI_CSI_TESTBUS_SEL, - GRF_DVP_V18SEL, - /* below is for rk3399 only */ - GRF_DPHY_RX0_CLK_INV_SEL, - GRF_DPHY_RX1_CLK_INV_SEL, -}; - -struct dphy_reg { - u16 offset; - u8 mask; - u8 shift; -}; - -#define PHY_REG(_offset, _width, _shift) \ - { .offset = _offset, .mask = BIT(_width) - 1, .shift = _shift, } - -static const struct dphy_reg rk3399_grf_dphy_regs[] = { - [GRF_DPHY_RX0_TURNREQUEST] = PHY_REG(RK3399_GRF_SOC_CON9, 4, 0), - [GRF_DPHY_RX0_CLK_INV_SEL] = PHY_REG(RK3399_GRF_SOC_CON9, 1, 10), - [GRF_DPHY_RX1_CLK_INV_SEL] = PHY_REG(RK3399_GRF_SOC_CON9, 1, 11), - [GRF_DPHY_RX0_ENABLE] = PHY_REG(RK3399_GRF_SOC_CON21, 4, 0), - [GRF_DPHY_RX0_FORCERXMODE] = PHY_REG(RK3399_GRF_SOC_CON21, 4, 4), - [GRF_DPHY_RX0_FORCETXSTOPMODE] = PHY_REG(RK3399_GRF_SOC_CON21, 4, 8), - [GRF_DPHY_RX0_TURNDISABLE] = PHY_REG(RK3399_GRF_SOC_CON21, 4, 12), - [GRF_DPHY_TX0_FORCERXMODE] = PHY_REG(RK3399_GRF_SOC_CON22, 4, 0), - [GRF_DPHY_TX0_FORCETXSTOPMODE] = PHY_REG(RK3399_GRF_SOC_CON22, 4, 4), - [GRF_DPHY_TX0_TURNDISABLE] = PHY_REG(RK3399_GRF_SOC_CON22, 4, 8), - [GRF_DPHY_TX0_TURNREQUEST] = PHY_REG(RK3399_GRF_SOC_CON22, 4, 12), - [GRF_DPHY_TX1RX1_ENABLE] = PHY_REG(RK3399_GRF_SOC_CON23, 4, 0), - [GRF_DPHY_TX1RX1_FORCERXMODE] = PHY_REG(RK3399_GRF_SOC_CON23, 4, 4), - [GRF_DPHY_TX1RX1_FORCETXSTOPMODE] = PHY_REG(RK3399_GRF_SOC_CON23, 4, 8), - [GRF_DPHY_TX1RX1_TURNDISABLE] = PHY_REG(RK3399_GRF_SOC_CON23, 4, 12), - [GRF_DPHY_TX1RX1_TURNREQUEST] = PHY_REG(RK3399_GRF_SOC_CON24, 4, 0), - [GRF_DPHY_RX1_SRC_SEL] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 4), - [GRF_DPHY_TX1RX1_BASEDIR] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 5), - [GRF_DPHY_TX1RX1_ENABLECLK] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 6), - [GRF_DPHY_TX1RX1_MASTERSLAVEZ] = PHY_REG(RK3399_GRF_SOC_CON24, 1, 7), - [GRF_DPHY_RX0_TESTDIN] = PHY_REG(RK3399_GRF_SOC_CON25, 8, 0), - [GRF_DPHY_RX0_TESTEN] = PHY_REG(RK3399_GRF_SOC_CON25, 1, 8), - [GRF_DPHY_RX0_TESTCLK] = PHY_REG(RK3399_GRF_SOC_CON25, 1, 9), - [GRF_DPHY_RX0_TESTCLR] = PHY_REG(RK3399_GRF_SOC_CON25, 1, 10), - [GRF_DPHY_RX0_TESTDOUT] = PHY_REG(RK3399_GRF_SOC_STATUS1, 8, 0), -}; - -struct rk_dphy_drv_data { - const char * const *clks; - unsigned int num_clks; - const struct hsfreq_range *hsfreq_ranges; - unsigned int num_hsfreq_ranges; - const struct dphy_reg *regs; -}; - -struct rk_dphy { - struct device *dev; - struct regmap *grf; - struct clk_bulk_data *clks; - - const struct rk_dphy_drv_data *drv_data; - struct phy_configure_opts_mipi_dphy config; - - u8 hsfreq; -}; - -static inline void rk_dphy_write_grf(struct rk_dphy *priv, - unsigned int index, u8 value) -{ - const struct dphy_reg *reg = &priv->drv_data->regs[index]; - /* Update high word */ - unsigned int val = (value << reg->shift) | - (reg->mask << (reg->shift + 16)); - - if (WARN_ON(!reg->offset)) - return; - regmap_write(priv->grf, reg->offset, val); -} - -static void rk_dphy_write(struct rk_dphy *priv, u8 test_code, u8 test_data) -{ - rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTDIN, test_code); - rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTEN, 1); - /* - * With the falling edge on TESTCLK, the TESTDIN[7:0] signal content - * is latched internally as the current test code. Test data is - * programmed internally by rising edge on TESTCLK. - * This code assumes that TESTCLK is already 1. - */ - rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTCLK, 0); - rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTEN, 0); - rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTDIN, test_data); - rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTCLK, 1); -} - -static void rk_dphy_enable(struct rk_dphy *priv) -{ - rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCERXMODE, 0); - rk_dphy_write_grf(priv, GRF_DPHY_RX0_FORCETXSTOPMODE, 0); - - /* Disable lane turn around, which is ignored in receive mode */ - rk_dphy_write_grf(priv, GRF_DPHY_RX0_TURNREQUEST, 0); - rk_dphy_write_grf(priv, GRF_DPHY_RX0_TURNDISABLE, 0xf); - - rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, - GENMASK(priv->config.lanes - 1, 0)); - - /* dphy start */ - rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTCLK, 1); - rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTCLR, 1); - usleep_range(100, 150); - rk_dphy_write_grf(priv, GRF_DPHY_RX0_TESTCLR, 0); - usleep_range(100, 150); - - /* set clock lane */ - /* HS hsfreq_range & lane 0 settle bypass */ - rk_dphy_write(priv, CLOCK_LANE_HS_RX_CONTROL, 0); - /* HS RX Control of lane0 */ - rk_dphy_write(priv, LANE0_HS_RX_CONTROL, priv->hsfreq << 1); - /* HS RX Control of lane1 */ - rk_dphy_write(priv, LANE1_HS_RX_CONTROL, priv->hsfreq << 1); - /* HS RX Control of lane2 */ - rk_dphy_write(priv, LANE2_HS_RX_CONTROL, priv->hsfreq << 1); - /* HS RX Control of lane3 */ - rk_dphy_write(priv, LANE3_HS_RX_CONTROL, priv->hsfreq << 1); - /* HS RX Data Lanes Settle State Time Control */ - rk_dphy_write(priv, LANES_THS_SETTLE_CONTROL, - THS_SETTLE_COUNTER_THRESHOLD); - - /* Normal operation */ - rk_dphy_write(priv, 0x0, 0); -} - -static int rk_dphy_configure(struct phy *phy, union phy_configure_opts *opts) -{ - struct rk_dphy *priv = phy_get_drvdata(phy); - const struct rk_dphy_drv_data *drv_data = priv->drv_data; - struct phy_configure_opts_mipi_dphy *config = &opts->mipi_dphy; - unsigned int hsfreq = 0; - unsigned int i; - u64 data_rate_mbps; - int ret; - - /* pass with phy_mipi_dphy_get_default_config (with pixel rate?) */ - ret = phy_mipi_dphy_config_validate(config); - if (ret) - return ret; - - data_rate_mbps = div_u64(config->hs_clk_rate, 1000 * 1000); - - dev_dbg(priv->dev, "lanes %d - data_rate_mbps %llu\n", - config->lanes, data_rate_mbps); - for (i = 0; i < drv_data->num_hsfreq_ranges; i++) { - if (drv_data->hsfreq_ranges[i].range_h >= data_rate_mbps) { - hsfreq = drv_data->hsfreq_ranges[i].cfg_bit; - break; - } - } - if (!hsfreq) - return -EINVAL; - - priv->hsfreq = hsfreq; - priv->config = *config; - return 0; -} - -static int rk_dphy_power_on(struct phy *phy) -{ - struct rk_dphy *priv = phy_get_drvdata(phy); - int ret; - - ret = clk_bulk_enable(priv->drv_data->num_clks, priv->clks); - if (ret) - return ret; - - rk_dphy_enable(priv); - - return 0; -} - -static int rk_dphy_power_off(struct phy *phy) -{ - struct rk_dphy *priv = phy_get_drvdata(phy); - - rk_dphy_write_grf(priv, GRF_DPHY_RX0_ENABLE, 0); - clk_bulk_disable(priv->drv_data->num_clks, priv->clks); - return 0; -} - -static int rk_dphy_init(struct phy *phy) -{ - struct rk_dphy *priv = phy_get_drvdata(phy); - - return clk_bulk_prepare(priv->drv_data->num_clks, priv->clks); -} - -static int rk_dphy_exit(struct phy *phy) -{ - struct rk_dphy *priv = phy_get_drvdata(phy); - - clk_bulk_unprepare(priv->drv_data->num_clks, priv->clks); - return 0; -} - -static const struct phy_ops rk_dphy_ops = { - .power_on = rk_dphy_power_on, - .power_off = rk_dphy_power_off, - .init = rk_dphy_init, - .exit = rk_dphy_exit, - .configure = rk_dphy_configure, - .owner = THIS_MODULE, -}; - -static const struct rk_dphy_drv_data rk3399_mipidphy_drv_data = { - .clks = rk3399_mipidphy_clks, - .num_clks = ARRAY_SIZE(rk3399_mipidphy_clks), - .hsfreq_ranges = rk3399_mipidphy_hsfreq_ranges, - .num_hsfreq_ranges = ARRAY_SIZE(rk3399_mipidphy_hsfreq_ranges), - .regs = rk3399_grf_dphy_regs, -}; - -static const struct of_device_id rk_dphy_dt_ids[] = { - { - .compatible = "rockchip,rk3399-mipi-dphy-rx0", - .data = &rk3399_mipidphy_drv_data, - }, - {} -}; -MODULE_DEVICE_TABLE(of, rk_dphy_dt_ids); - -static int rk_dphy_probe(struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - struct device_node *np = dev->of_node; - const struct rk_dphy_drv_data *drv_data; - struct phy_provider *phy_provider; - const struct of_device_id *of_id; - struct rk_dphy *priv; - struct phy *phy; - unsigned int i; - int ret; - - if (!dev->parent || !dev->parent->of_node) - return -ENODEV; - - priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); - if (!priv) - return -ENOMEM; - priv->dev = dev; - - priv->grf = syscon_node_to_regmap(dev->parent->of_node); - if (IS_ERR(priv->grf)) { - dev_err(dev, "Can't find GRF syscon\n"); - return -ENODEV; - } - - of_id = of_match_device(rk_dphy_dt_ids, dev); - if (!of_id) - return -EINVAL; - - drv_data = of_id->data; - priv->drv_data = drv_data; - priv->clks = devm_kcalloc(&pdev->dev, drv_data->num_clks, - sizeof(*priv->clks), GFP_KERNEL); - if (!priv->clks) - return -ENOMEM; - for (i = 0; i < drv_data->num_clks; i++) - priv->clks[i].id = drv_data->clks[i]; - ret = devm_clk_bulk_get(&pdev->dev, drv_data->num_clks, priv->clks); - if (ret) - return ret; - - phy = devm_phy_create(dev, np, &rk_dphy_ops); - if (IS_ERR(phy)) { - dev_err(dev, "failed to create phy\n"); - return PTR_ERR(phy); - } - phy_set_drvdata(phy, priv); - - phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); - - return PTR_ERR_OR_ZERO(phy_provider); -} - -static struct platform_driver rk_dphy_driver = { - .probe = rk_dphy_probe, - .driver = { - .name = "rockchip-mipi-dphy-rx0", - .of_match_table = rk_dphy_dt_ids, - }, -}; -module_platform_driver(rk_dphy_driver); - -MODULE_AUTHOR("Ezequiel Garcia "); -MODULE_DESCRIPTION("Rockchip MIPI Synopsys DPHY RX0 driver"); -MODULE_LICENSE("Dual MIT/GPL"); -- cgit v1.2.3