* [PATCH v8 0/3] Add support Rockchip Soc LVDS
@ 2017-09-02 11:28 Sandy Huang
2017-09-02 11:28 ` [PATCH v8 1/3] dt-bindings: display: Add Document for " Sandy Huang
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Sandy Huang @ 2017-09-02 11:28 UTC (permalink / raw)
To: linux-arm-kernel
this patches add support Rockchip RK3288 LVDS support, based on patches from
Mark yao[0] and Heiko Stuebner[1].
[0]: https://github.com/RockchipOpensourceCommunity/popmetal-kernel-3.14
[1]: http://lists.infradead.org/pipermail/linux-rockchip/2015-April/002830.html
Changes:
- Update rockchip_lvds_encoder_helper_funcs to atomic API
- Add bridge function for RGB/LVDS convert to other output type
- Fix some unreasonable define
- Adapter to the latest rockchip DRM driver framework
- Add pinctrl for RGB output type
- Reseved some define for rockchip next Soc
Sandy Huang (3):
dt-bindings: display: Add Document for Rockchip Soc LVDS
ARM: dts: Add LVDS info for rk3288
drm/rockchip: Add support for Rockchip Soc LVDS
.../bindings/display/rockchip/rockchip-lvds.txt | 99 ++++
arch/arm/boot/dts/rk3288.dtsi | 52 ++
drivers/gpu/drm/rockchip/Kconfig | 8 +
drivers/gpu/drm/rockchip/Makefile | 1 +
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +
drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 +
drivers/gpu/drm/rockchip/rockchip_lvds.c | 582 +++++++++++++++++++++
drivers/gpu/drm/rockchip/rockchip_lvds.h | 114 ++++
8 files changed, 859 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.c
create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.h
--
2.7.4
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v8 1/3] dt-bindings: display: Add Document for Rockchip Soc LVDS 2017-09-02 11:28 [PATCH v8 0/3] Add support Rockchip Soc LVDS Sandy Huang @ 2017-09-02 11:28 ` Sandy Huang 2017-09-11 20:13 ` Rob Herring 2017-09-02 11:28 ` [PATCH v8 2/3] ARM: dts: Add LVDS info for rk3288 Sandy Huang 2017-09-02 11:28 ` [PATCH v8 3/3] drm/rockchip: Add support for Rockchip Soc LVDS Sandy Huang 2 siblings, 1 reply; 12+ messages in thread From: Sandy Huang @ 2017-09-02 11:28 UTC (permalink / raw) To: linux-arm-kernel This patch add Document for Rockchip Soc RK3288 LVDS, This based on the patches from Mark yao and Heiko Stuebner. Signed-off-by: Mark yao <mark.yao@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Sandy Huang <hjc@rock-chips.com> --- Change the Signed-off order .../bindings/display/rockchip/rockchip-lvds.txt | 99 ++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt b/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt new file mode 100644 index 0000000..da6939e --- /dev/null +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt @@ -0,0 +1,99 @@ +Rockchip RK3288 LVDS interface +================================ + +Required properties: +- compatible: matching the soc type, one of + - "rockchip,rk3288-lvds"; + +- reg: physical base address of the controller and length + of memory mapped region. +- clocks: must include clock specifiers corresponding to entries in the + clock-names property. +- clock-names: must contain "pclk_lvds" + +- avdd1v0-supply: regulator phandle for 1.0V analog power +- avdd1v8-supply: regulator phandle for 1.8V analog power +- avdd3v3-supply: regulator phandle for 3.3V analog power + +- rockchip,grf: phandle to the general register files syscon +- rockchip,output: "rgb", "lvds" or "duallvds", This describes the output interface + +Optional properties: +- pinctrl-names: must contain a "lcdc" entry. +- pinctrl-0: pin control group to be used for this controller. + +Required nodes: + +The lvds has two video ports as described by + Documentation/devicetree/bindings/media/video-interfaces.txt +Their connections are modeled using the OF graph bindings specified in + Documentation/devicetree/bindings/graph.txt. + +- video port 0 for the VOP input, the remote endpoint maybe vopb or vopl +- video port 1 for either a panel or subsequent encoder + +the lvds panel described by + Documentation/devicetree/bindings/display/panel/simple-panel.txt + +Panel required properties: +- ports for remote LVDS output + +Panel optional properties: +- data-mapping: should be "vesa-24","jeida-24" or "jeida-18". +This describes decribed by: + Documentation/devicetree/bindings/display/panel/panel-lvds.txt + +Example: + +lvds_panel: lvds-panel { + compatible = "auo,b101ean01"; + enable-gpios = <&gpio7 21 GPIO_ACTIVE_HIGH>; + data-mapping = "jeida-24"; + + ports { + panel_in_lvds: endpoint { + remote-endpoint = <&lvds_out_panel>; + }; + }; +}; + +For Rockchip RK3288: + + lvds: lvds at ff96c000 { + compatible = "rockchip,rk3288-lvds"; + rockchip,grf = <&grf>; + reg = <0xff96c000 0x4000>; + clocks = <&cru PCLK_LVDS_PHY>; + clock-names = "pclk_lvds"; + pinctrl-names = "lcdc"; + pinctrl-0 = <&lcdc_ctl>; + avdd1v0-supply = <&vdd10_lcd>; + avdd1v8-supply = <&vcc18_lcd>; + avdd3v3-supply = <&vcca_33>; + rockchip,output = "rgb"; + ports { + #address-cells = <1>; + #size-cells = <0>; + + lvds_in: port at 0 { + reg = <0>; + + lvds_in_vopb: endpoint at 0 { + reg = <0>; + remote-endpoint = <&vopb_out_lvds>; + }; + lvds_in_vopl: endpoint at 1 { + reg = <1>; + remote-endpoint = <&vopl_out_lvds>; + }; + }; + + lvds_out: port at 1 { + reg = <1>; + + lvds_out_panel: endpoint { + remote-endpoint = <&panel_in_lvds>; + }; + }; + }; + }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v8 1/3] dt-bindings: display: Add Document for Rockchip Soc LVDS 2017-09-02 11:28 ` [PATCH v8 1/3] dt-bindings: display: Add Document for " Sandy Huang @ 2017-09-11 20:13 ` Rob Herring 0 siblings, 0 replies; 12+ messages in thread From: Rob Herring @ 2017-09-11 20:13 UTC (permalink / raw) To: linux-arm-kernel On Sat, Sep 02, 2017 at 07:28:47PM +0800, Sandy Huang wrote: > This patch add Document for Rockchip Soc RK3288 LVDS, > This based on the patches from Mark yao and Heiko Stuebner. > > Signed-off-by: Mark yao <mark.yao@rock-chips.com> > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > Signed-off-by: Sandy Huang <hjc@rock-chips.com> > --- > Change the Signed-off order > > .../bindings/display/rockchip/rockchip-lvds.txt | 99 ++++++++++++++++++++++ > 1 file changed, 99 insertions(+) > create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt I see this is already applied, but in the future please add acks when posting new versions. Rob ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v8 2/3] ARM: dts: Add LVDS info for rk3288 2017-09-02 11:28 [PATCH v8 0/3] Add support Rockchip Soc LVDS Sandy Huang 2017-09-02 11:28 ` [PATCH v8 1/3] dt-bindings: display: Add Document for " Sandy Huang @ 2017-09-02 11:28 ` Sandy Huang 2017-09-08 23:45 ` Heiko Stuebner 2017-09-02 11:28 ` [PATCH v8 3/3] drm/rockchip: Add support for Rockchip Soc LVDS Sandy Huang 2 siblings, 1 reply; 12+ messages in thread From: Sandy Huang @ 2017-09-02 11:28 UTC (permalink / raw) To: linux-arm-kernel add LVDS info in rk3288.dtsi for LVDS driver This based on the patches from Mark yao and Heiko Stuebner. Signed-off-by: Mark yao <mark.yao@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Sandy Huang <hjc@rock-chips.com> --- Change the Signed-off order arch/arm/boot/dts/rk3288.dtsi | 52 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 858e1fed..b82c31a 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -983,6 +983,11 @@ reg = <2>; remote-endpoint = <&mipi_in_vopb>; }; + + vopb_out_lvds: endpoint at 3 { + reg = <3>; + remote-endpoint = <&lvds_in_vopb>; + }; }; }; @@ -1026,6 +1031,11 @@ reg = <2>; remote-endpoint = <&mipi_in_vopl>; }; + + vopl_out_lvds: endpoint at 3 { + reg = <3>; + remote-endpoint = <&lvds_in_vopl>; + }; }; }; @@ -1099,6 +1109,39 @@ }; }; + lvds: lvds at ff96c000 { + compatible = "rockchip,rk3288-lvds"; + reg = <0xff96c000 0x4000>; + clocks = <&cru PCLK_LVDS_PHY>; + clock-names = "pclk_lvds"; + pinctrl-names = "lcdc"; + pinctrl-0 = <&lcdc_ctl>; + power-domains = <&power RK3288_PD_VIO>; + rockchip,grf = <&grf>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + lvds_in: port at 0 { + reg = <0>; + + #address-cells = <1>; + #size-cells = <0>; + + lvds_in_vopb: endpoint at 0 { + reg = <0>; + remote-endpoint = <&vopb_out_lvds>; + }; + lvds_in_vopl: endpoint at 1 { + reg = <1>; + remote-endpoint = <&vopl_out_lvds>; + }; + }; + }; + }; + hdmi: hdmi at ff980000 { compatible = "rockchip,rk3288-dw-hdmi"; reg = <0xff980000 0x20000>; @@ -1823,5 +1866,14 @@ rockchip,pins = <RK_GPIO6 11 RK_FUNC_1 &pcfg_pull_none>; }; }; + + lcdc { + lcdc_ctl: lcdc-ctl { + rockchip,pins = <1 24 RK_FUNC_1 &pcfg_pull_none>, + <1 25 RK_FUNC_1 &pcfg_pull_none>, + <1 26 RK_FUNC_1 &pcfg_pull_none>, + <1 27 RK_FUNC_1 &pcfg_pull_none>; + }; + }; }; }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v8 2/3] ARM: dts: Add LVDS info for rk3288 2017-09-02 11:28 ` [PATCH v8 2/3] ARM: dts: Add LVDS info for rk3288 Sandy Huang @ 2017-09-08 23:45 ` Heiko Stuebner 0 siblings, 0 replies; 12+ messages in thread From: Heiko Stuebner @ 2017-09-08 23:45 UTC (permalink / raw) To: linux-arm-kernel Am Samstag, 2. September 2017, 19:28:52 CEST schrieb Sandy Huang: > add LVDS info in rk3288.dtsi for LVDS driver > This based on the patches from Mark yao and Heiko Stuebner. > > Signed-off-by: Mark yao <mark.yao@rock-chips.com> > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > Signed-off-by: Sandy Huang <hjc@rock-chips.com> applied for 4.15 after moving both the lvds node to its correct position (please always sort by address) and fixed the register addressing to honor the recent rk3288 64bit conversion. Heiko ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v8 3/3] drm/rockchip: Add support for Rockchip Soc LVDS 2017-09-02 11:28 [PATCH v8 0/3] Add support Rockchip Soc LVDS Sandy Huang 2017-09-02 11:28 ` [PATCH v8 1/3] dt-bindings: display: Add Document for " Sandy Huang 2017-09-02 11:28 ` [PATCH v8 2/3] ARM: dts: Add LVDS info for rk3288 Sandy Huang @ 2017-09-02 11:28 ` Sandy Huang 2017-09-07 10:16 ` Mark yao 2 siblings, 1 reply; 12+ messages in thread From: Sandy Huang @ 2017-09-02 11:28 UTC (permalink / raw) To: linux-arm-kernel This adds support for Rockchip soc lvds found on rk3288 Based on the patches from Mark yao and Heiko Stuebner. Signed-off-by: Mark Yao <mark.yao@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Sandy Huang <hjc@rock-chips.com> --- Change the Signed-off order drivers/gpu/drm/rockchip/Kconfig | 8 + drivers/gpu/drm/rockchip/Makefile | 1 + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + drivers/gpu/drm/rockchip/rockchip_lvds.c | 582 ++++++++++++++++++++++++++++ drivers/gpu/drm/rockchip/rockchip_lvds.h | 114 ++++++ 6 files changed, 708 insertions(+) create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.c create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.h diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig index dcc539b..0c31f0a 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -57,4 +57,12 @@ config ROCKCHIP_INNO_HDMI for the Innosilicon HDMI driver. If you want to enable HDMI on RK3036 based SoC, you should select this option. +config ROCKCHIP_LVDS + bool "Rockchip LVDS support" + depends on DRM_ROCKCHIP + help + Choose this option to enable support for Rockchip LVDS controllers. + Rockchip rk3288 SoC has LVDS TX Controller can be used, and it + support LVDS, rgb, dual LVDS output mode. say Y to enable its + driver. endif diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile index fa8dc9d..a881d2c 100644 --- a/drivers/gpu/drm/rockchip/Makefile +++ b/drivers/gpu/drm/rockchip/Makefile @@ -12,5 +12,6 @@ rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o +rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) += rockchip_lvds.o obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index c41f48a..082c251 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -445,6 +445,8 @@ static int __init rockchip_drm_init(void) num_rockchip_sub_drivers = 0; ADD_ROCKCHIP_SUB_DRIVER(vop_platform_driver, CONFIG_DRM_ROCKCHIP); + ADD_ROCKCHIP_SUB_DRIVER(rockchip_lvds_driver, + CONFIG_ROCKCHIP_LVDS); ADD_ROCKCHIP_SUB_DRIVER(rockchip_dp_driver, CONFIG_ROCKCHIP_ANALOGIX_DP); ADD_ROCKCHIP_SUB_DRIVER(cdn_dp_driver, CONFIG_ROCKCHIP_CDN_DP); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h index c7e96b8..498dfbc 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -69,5 +69,6 @@ extern struct platform_driver dw_hdmi_rockchip_pltfm_driver; extern struct platform_driver dw_mipi_dsi_driver; extern struct platform_driver inno_hdmi_driver; extern struct platform_driver rockchip_dp_driver; +extern struct platform_driver rockchip_lvds_driver; extern struct platform_driver vop_platform_driver; #endif /* _ROCKCHIP_DRM_DRV_H_ */ diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c new file mode 100644 index 0000000..86d9a8c --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -0,0 +1,582 @@ +/* + * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd + * Author: + * Mark Yao <mark.yao@rock-chips.com> + * Sandy Huang <hjc@rock-chips.com> + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <drm/drmP.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_dp_helper.h> +#include <drm/drm_panel.h> +#include <drm/drm_of.h> + +#include <linux/component.h> +#include <linux/clk.h> +#include <linux/mfd/syscon.h> +#include <linux/of_graph.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <linux/reset.h> + +#include "rockchip_drm_drv.h" +#include "rockchip_drm_vop.h" +#include "rockchip_lvds.h" + +#define DISPLAY_OUTPUT_RGB 0 +#define DISPLAY_OUTPUT_LVDS 1 +#define DISPLAY_OUTPUT_DUAL_LVDS 2 + +#define connector_to_lvds(c) \ + container_of(c, struct rockchip_lvds, connector) + +#define encoder_to_lvds(c) \ + container_of(c, struct rockchip_lvds, encoder) + +/** + * rockchip_lvds_soc_data - rockchip lvds Soc private data + * @ch1_offset: lvds channel 1 registe offset + * grf_soc_con6: general registe offset for LVDS contrl + * grf_soc_con7: general registe offset for LVDS contrl + * has_vop_sel: to indicate whether need to choose from different VOP. + */ +struct rockchip_lvds_soc_data { + u32 ch1_offset; + int grf_soc_con6; + int grf_soc_con7; + bool has_vop_sel; +}; + +struct rockchip_lvds { + struct device *dev; + void __iomem *regs; + struct regmap *grf; + struct clk *pclk; + const struct rockchip_lvds_soc_data *soc_data; + int output; /* rgb lvds or dual lvds output */ + int format; /* vesa or jeida format */ + struct drm_device *drm_dev; + struct drm_panel *panel; + struct drm_bridge *bridge; + struct drm_connector connector; + struct drm_encoder encoder; + struct dev_pin_info *pins; +}; + +static inline void lvds_writel(struct rockchip_lvds *lvds, u32 offset, u32 val) +{ + writel_relaxed(val, lvds->regs + offset); + if (lvds->output == DISPLAY_OUTPUT_LVDS) + return; + writel_relaxed(val, lvds->regs + offset + lvds->soc_data->ch1_offset); +} + +static inline int lvds_name_to_format(const char *s) +{ + if (strncmp(s, "jeida-18", 8) == 0) + return LVDS_JEIDA_18; + else if (strncmp(s, "jeida-24", 8) == 0) + return LVDS_JEIDA_24; + else if (strncmp(s, "vesa-24", 7) == 0) + return LVDS_VESA_24; + + return -EINVAL; +} + +static inline int lvds_name_to_output(const char *s) +{ + if (strncmp(s, "rgb", 3) == 0) + return DISPLAY_OUTPUT_RGB; + else if (strncmp(s, "lvds", 4) == 0) + return DISPLAY_OUTPUT_LVDS; + else if (strncmp(s, "duallvds", 8) == 0) + return DISPLAY_OUTPUT_DUAL_LVDS; + + return -EINVAL; +} + +static int rockchip_lvds_poweron(struct rockchip_lvds *lvds) +{ + int ret; + u32 val; + + ret = clk_enable(lvds->pclk); + if (ret < 0) { + DRM_DEV_ERROR(lvds->dev, "failed to enable lvds pclk %d\n", ret); + return ret; + } + ret = pm_runtime_get_sync(lvds->dev); + if (ret < 0) { + DRM_DEV_ERROR(lvds->dev, "failed to get pm runtime: %d\n", ret); + clk_disable(lvds->pclk); + return ret; + } + val = RK3288_LVDS_CH0_REG0_LANE4_EN | RK3288_LVDS_CH0_REG0_LANE3_EN | + RK3288_LVDS_CH0_REG0_LANE2_EN | RK3288_LVDS_CH0_REG0_LANE1_EN | + RK3288_LVDS_CH0_REG0_LANE0_EN; + if (lvds->output == DISPLAY_OUTPUT_RGB) { + val |= RK3288_LVDS_CH0_REG0_TTL_EN | + RK3288_LVDS_CH0_REG0_LANECK_EN; + lvds_writel(lvds, RK3288_LVDS_CH0_REG0, val); + lvds_writel(lvds, RK3288_LVDS_CH0_REG2, + RK3288_LVDS_PLL_FBDIV_REG2(0x46)); + lvds_writel(lvds, RK3288_LVDS_CH0_REG4, + RK3288_LVDS_CH0_REG4_LANECK_TTL_MODE | + RK3288_LVDS_CH0_REG4_LANE4_TTL_MODE | + RK3288_LVDS_CH0_REG4_LANE3_TTL_MODE | + RK3288_LVDS_CH0_REG4_LANE2_TTL_MODE | + RK3288_LVDS_CH0_REG4_LANE1_TTL_MODE | + RK3288_LVDS_CH0_REG4_LANE0_TTL_MODE); + lvds_writel(lvds, RK3288_LVDS_CH0_REG5, + RK3288_LVDS_CH0_REG5_LANECK_TTL_DATA | + RK3288_LVDS_CH0_REG5_LANE4_TTL_DATA | + RK3288_LVDS_CH0_REG5_LANE3_TTL_DATA | + RK3288_LVDS_CH0_REG5_LANE2_TTL_DATA | + RK3288_LVDS_CH0_REG5_LANE1_TTL_DATA | + RK3288_LVDS_CH0_REG5_LANE0_TTL_DATA); + } else { + val |= RK3288_LVDS_CH0_REG0_LVDS_EN | + RK3288_LVDS_CH0_REG0_LANECK_EN; + lvds_writel(lvds, RK3288_LVDS_CH0_REG0, val); + lvds_writel(lvds, RK3288_LVDS_CH0_REG1, + RK3288_LVDS_CH0_REG1_LANECK_BIAS | + RK3288_LVDS_CH0_REG1_LANE4_BIAS | + RK3288_LVDS_CH0_REG1_LANE3_BIAS | + RK3288_LVDS_CH0_REG1_LANE2_BIAS | + RK3288_LVDS_CH0_REG1_LANE1_BIAS | + RK3288_LVDS_CH0_REG1_LANE0_BIAS); + lvds_writel(lvds, RK3288_LVDS_CH0_REG2, + RK3288_LVDS_CH0_REG2_RESERVE_ON | + RK3288_LVDS_CH0_REG2_LANECK_LVDS_MODE | + RK3288_LVDS_CH0_REG2_LANE4_LVDS_MODE | + RK3288_LVDS_CH0_REG2_LANE3_LVDS_MODE | + RK3288_LVDS_CH0_REG2_LANE2_LVDS_MODE | + RK3288_LVDS_CH0_REG2_LANE1_LVDS_MODE | + RK3288_LVDS_CH0_REG2_LANE0_LVDS_MODE | + RK3288_LVDS_PLL_FBDIV_REG2(0x46)); + lvds_writel(lvds, RK3288_LVDS_CH0_REG4, 0x00); + lvds_writel(lvds, RK3288_LVDS_CH0_REG5, 0x00); + } + lvds_writel(lvds, RK3288_LVDS_CH0_REG3, RK3288_LVDS_PLL_FBDIV_REG3(0x46)); + lvds_writel(lvds, RK3288_LVDS_CH0_REGD, RK3288_LVDS_PLL_PREDIV_REGD(0x0a)); + lvds_writel(lvds, RK3288_LVDS_CH0_REG20, RK3288_LVDS_CH0_REG20_LSB); + + lvds_writel(lvds, RK3288_LVDS_CFG_REGC, RK3288_LVDS_CFG_REGC_PLL_ENABLE); + lvds_writel(lvds, RK3288_LVDS_CFG_REG21, RK3288_LVDS_CFG_REG21_TX_ENABLE); + + return 0; +} + +static void rockchip_lvds_poweroff(struct rockchip_lvds *lvds) +{ + int ret; + u32 val; + + lvds_writel(lvds, RK3288_LVDS_CFG_REG21, RK3288_LVDS_CFG_REG21_TX_ENABLE); + lvds_writel(lvds, RK3288_LVDS_CFG_REGC, RK3288_LVDS_CFG_REGC_PLL_ENABLE); + val = LVDS_DUAL | LVDS_TTL_EN | LVDS_CH0_EN | LVDS_CH1_EN | LVDS_PWRDN; + val |= val << 16; + ret = regmap_write(lvds->grf, lvds->soc_data->grf_soc_con7, val); + if (ret != 0) + DRM_DEV_ERROR(lvds->dev, "Could not write to GRF: %d\n", ret); + + pm_runtime_put(lvds->dev); + clk_disable(lvds->pclk); +} + +static const struct drm_connector_funcs rockchip_lvds_connector_funcs = { + .dpms = drm_atomic_helper_connector_dpms, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = drm_connector_cleanup, + .reset = drm_atomic_helper_connector_reset, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static int rockchip_lvds_connector_get_modes(struct drm_connector *connector) +{ + struct rockchip_lvds *lvds = connector_to_lvds(connector); + struct drm_panel *panel = lvds->panel; + + return drm_panel_get_modes(panel); +} + +static const +struct drm_connector_helper_funcs rockchip_lvds_connector_helper_funcs = { + .get_modes = rockchip_lvds_connector_get_modes, +}; + +static void rockchip_lvds_grf_config(struct drm_encoder *encoder, + struct drm_display_mode *mode) +{ + struct rockchip_lvds *lvds = encoder_to_lvds(encoder); + u8 pin_hsync = (mode->flags & DRM_MODE_FLAG_PHSYNC) ? 1 : 0; + u8 pin_dclk = (mode->flags & DRM_MODE_FLAG_PCSYNC) ? 1 : 0; + u32 val; + int ret; + + /* iomux to LCD data/sync mode */ + if (lvds->output == DISPLAY_OUTPUT_RGB) + if (lvds->pins && !IS_ERR(lvds->pins->default_state)) + pinctrl_select_state(lvds->pins->p, + lvds->pins->default_state); + val = lvds->format | LVDS_CH0_EN; + if (lvds->output == DISPLAY_OUTPUT_RGB) + val |= LVDS_TTL_EN | LVDS_CH1_EN; + else if (lvds->output == DISPLAY_OUTPUT_DUAL_LVDS) + val |= LVDS_DUAL | LVDS_CH1_EN; + + if ((mode->htotal - mode->hsync_start) & 0x01) + val |= LVDS_START_PHASE_RST_1; + + val |= (pin_dclk << 8) | (pin_hsync << 9); + val |= (0xffff << 16); + ret = regmap_write(lvds->grf, lvds->soc_data->grf_soc_con7, val); + if (ret != 0) { + DRM_DEV_ERROR(lvds->dev, "Could not write to GRF: %d\n", ret); + return; + } +} + +static int rockchip_lvds_set_vop_source(struct rockchip_lvds *lvds, + struct drm_encoder *encoder) +{ + u32 val; + int ret; + + if (!lvds->soc_data->has_vop_sel) + return 0; + + ret = drm_of_encoder_active_endpoint_id(lvds->dev->of_node, encoder); + if (ret < 0) + return ret; + + val = RK3288_LVDS_SOC_CON6_SEL_VOP_LIT << 16; + if (ret) + val |= RK3288_LVDS_SOC_CON6_SEL_VOP_LIT; + + ret = regmap_write(lvds->grf, lvds->soc_data->grf_soc_con6, val); + if (ret < 0) + return ret; + + return 0; +} + +static int +rockchip_lvds_encoder_atomic_check(struct drm_encoder *encoder, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state); + + s->output_mode = ROCKCHIP_OUT_MODE_P888; + s->output_type = DRM_MODE_CONNECTOR_LVDS; + + return 0; +} + +static void rockchip_lvds_encoder_enable(struct drm_encoder *encoder) +{ + struct rockchip_lvds *lvds = encoder_to_lvds(encoder); + struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; + int ret; + + drm_panel_prepare(lvds->panel); + ret = rockchip_lvds_poweron(lvds); + if (ret < 0) { + DRM_DEV_ERROR(lvds->dev, "failed to power on lvds: %d\n", ret); + drm_panel_unprepare(lvds->panel); + } + rockchip_lvds_grf_config(encoder, mode); + rockchip_lvds_set_vop_source(lvds, encoder); + drm_panel_enable(lvds->panel); +} + +static void rockchip_lvds_encoder_disable(struct drm_encoder *encoder) +{ + struct rockchip_lvds *lvds = encoder_to_lvds(encoder); + + drm_panel_disable(lvds->panel); + rockchip_lvds_poweroff(lvds); + drm_panel_unprepare(lvds->panel); +} + +static const +struct drm_encoder_helper_funcs rockchip_lvds_encoder_helper_funcs = { + .enable = rockchip_lvds_encoder_enable, + .disable = rockchip_lvds_encoder_disable, + .atomic_check = rockchip_lvds_encoder_atomic_check, +}; + +static const struct drm_encoder_funcs rockchip_lvds_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + +static const struct rockchip_lvds_soc_data rk3288_lvds_data = { + .ch1_offset = 0x100, + .grf_soc_con6 = 0x025c, + .grf_soc_con7 = 0x0260, + .has_vop_sel = true, +}; + +static const struct of_device_id rockchip_lvds_dt_ids[] = { + { + .compatible = "rockchip,rk3288-lvds", + .data = &rk3288_lvds_data + }, + {} +}; +MODULE_DEVICE_TABLE(of, rockchip_lvds_dt_ids); + +static int rockchip_lvds_bind(struct device *dev, struct device *master, + void *data) +{ + struct rockchip_lvds *lvds = dev_get_drvdata(dev); + struct drm_device *drm_dev = data; + struct drm_encoder *encoder; + struct drm_connector *connector; + struct device_node *remote = NULL; + struct device_node *port, *endpoint; + int ret; + const char *name; + u32 endpoint_id; + + lvds->drm_dev = drm_dev; + port = of_graph_get_port_by_id(dev->of_node, 1); + if (!port) { + DRM_DEV_ERROR(dev, + "can't found port point, please init lvds panel port!\n"); + return -EINVAL; + } + for_each_child_of_node(port, endpoint) { + of_property_read_u32(endpoint, "reg", &endpoint_id); + ret = drm_of_find_panel_or_bridge(dev->of_node, 1, endpoint_id, + &lvds->panel, &lvds->bridge); + if (!ret) + break; + } + if (ret) { + DRM_DEV_ERROR(dev, "failed to find panel and bridge node\n"); + ret = -EPROBE_DEFER; + goto err_put_port; + } + if (lvds->panel) + remote = lvds->panel->dev->of_node; + else + remote = lvds->bridge->of_node; + if (of_property_read_string(dev->of_node, "rockchip,output", &name)) + /* default set it as output rgb */ + lvds->output = DISPLAY_OUTPUT_RGB; + else + lvds->output = lvds_name_to_output(name); + + if (lvds->output < 0) { + DRM_DEV_ERROR(dev, "invalid output type [%s]\n", name); + ret = lvds->output; + goto err_put_remote; + } + + if (of_property_read_string(remote, "data-mapping", &name)) + /* default set it as format vesa 18 */ + lvds->format = LVDS_VESA_18; + else + lvds->format = lvds_name_to_format(name); + + if (lvds->format < 0) { + DRM_DEV_ERROR(dev, "invalid data-mapping format [%s]\n", name); + ret = lvds->format; + goto err_put_remote; + } + + encoder = &lvds->encoder; + encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev, + dev->of_node); + + ret = drm_encoder_init(drm_dev, encoder, &rockchip_lvds_encoder_funcs, + DRM_MODE_ENCODER_LVDS, NULL); + if (ret < 0) { + DRM_DEV_ERROR(drm_dev->dev, + "failed to initialize encoder: %d\n", ret); + goto err_put_remote; + } + + drm_encoder_helper_add(encoder, &rockchip_lvds_encoder_helper_funcs); + + if (lvds->panel) { + connector = &lvds->connector; + connector->dpms = DRM_MODE_DPMS_OFF; + ret = drm_connector_init(drm_dev, connector, + &rockchip_lvds_connector_funcs, + DRM_MODE_CONNECTOR_LVDS); + if (ret < 0) { + DRM_DEV_ERROR(drm_dev->dev, + "failed to initialize connector: %d\n", ret); + goto err_free_encoder; + } + + drm_connector_helper_add(connector, + &rockchip_lvds_connector_helper_funcs); + + ret = drm_mode_connector_attach_encoder(connector, encoder); + if (ret < 0) { + DRM_DEV_ERROR(drm_dev->dev, + "failed to attach encoder: %d\n", ret); + goto err_free_connector; + } + + ret = drm_panel_attach(lvds->panel, connector); + if (ret < 0) { + DRM_DEV_ERROR(drm_dev->dev, + "failed to attach panel: %d\n", ret); + goto err_free_connector; + } + } else { + lvds->bridge->encoder = encoder; + ret = drm_bridge_attach(encoder, lvds->bridge, NULL); + if (ret) { + DRM_DEV_ERROR(drm_dev->dev, + "failed to attach bridge: %d\n", ret); + goto err_free_encoder; + } + encoder->bridge = lvds->bridge; + } + + pm_runtime_enable(dev); + of_node_put(remote); + of_node_put(port); + + return 0; + +err_free_connector: + drm_connector_cleanup(connector); +err_free_encoder: + drm_encoder_cleanup(encoder); +err_put_remote: + of_node_put(remote); +err_put_port: + of_node_put(port); + + return ret; +} + +static void rockchip_lvds_unbind(struct device *dev, struct device *master, + void *data) +{ + struct rockchip_lvds *lvds = dev_get_drvdata(dev); + + rockchip_lvds_encoder_disable(&lvds->encoder); + if (lvds->panel) + drm_panel_detach(lvds->panel); + pm_runtime_disable(dev); + drm_connector_cleanup(&lvds->connector); + drm_encoder_cleanup(&lvds->encoder); +} + +static const struct component_ops rockchip_lvds_component_ops = { + .bind = rockchip_lvds_bind, + .unbind = rockchip_lvds_unbind, +}; + +static int rockchip_lvds_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct rockchip_lvds *lvds; + const struct of_device_id *match; + struct resource *res; + int ret; + + if (!dev->of_node) + return -ENODEV; + + lvds = devm_kzalloc(&pdev->dev, sizeof(*lvds), GFP_KERNEL); + if (!lvds) + return -ENOMEM; + + lvds->dev = dev; + match = of_match_node(rockchip_lvds_dt_ids, dev->of_node); + if (!match) + return -ENODEV; + lvds->soc_data = match->data; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + lvds->regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(lvds->regs)) + return PTR_ERR(lvds->regs); + + lvds->pclk = devm_clk_get(&pdev->dev, "pclk_lvds"); + if (IS_ERR(lvds->pclk)) { + DRM_DEV_ERROR(dev, "could not get pclk_lvds\n"); + return PTR_ERR(lvds->pclk); + } + + lvds->pins = devm_kzalloc(lvds->dev, sizeof(*lvds->pins), + GFP_KERNEL); + if (!lvds->pins) + return -ENOMEM; + + lvds->pins->p = devm_pinctrl_get(lvds->dev); + if (IS_ERR(lvds->pins->p)) { + DRM_DEV_ERROR(dev, "no pinctrl handle\n"); + devm_kfree(lvds->dev, lvds->pins); + lvds->pins = NULL; + } else { + lvds->pins->default_state = + pinctrl_lookup_state(lvds->pins->p, "lcdc"); + if (IS_ERR(lvds->pins->default_state)) { + DRM_DEV_ERROR(dev, "no default pinctrl state\n"); + devm_kfree(lvds->dev, lvds->pins); + lvds->pins = NULL; + } + } + + lvds->grf = syscon_regmap_lookup_by_phandle(dev->of_node, + "rockchip,grf"); + if (IS_ERR(lvds->grf)) { + DRM_DEV_ERROR(dev, "missing rockchip,grf property\n"); + return PTR_ERR(lvds->grf); + } + + dev_set_drvdata(dev, lvds); + + ret = clk_prepare(lvds->pclk); + if (ret < 0) { + DRM_DEV_ERROR(dev, "failed to prepare pclk_lvds\n"); + return ret; + } + ret = component_add(&pdev->dev, &rockchip_lvds_component_ops); + if (ret < 0) { + DRM_DEV_ERROR(dev, "failed to add component\n"); + clk_unprepare(lvds->pclk); + } + + return ret; +} + +static int rockchip_lvds_remove(struct platform_device *pdev) +{ + struct rockchip_lvds *lvds = dev_get_drvdata(&pdev->dev); + + component_del(&pdev->dev, &rockchip_lvds_component_ops); + clk_unprepare(lvds->pclk); + + return 0; +} + +struct platform_driver rockchip_lvds_driver = { + .probe = rockchip_lvds_probe, + .remove = rockchip_lvds_remove, + .driver = { + .name = "rockchip-lvds", + .of_match_table = of_match_ptr(rockchip_lvds_dt_ids), + }, +}; diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.h b/drivers/gpu/drm/rockchip/rockchip_lvds.h new file mode 100644 index 0000000..15810b7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.h @@ -0,0 +1,114 @@ +/* + * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd + * Author: + * Sandy Huang <hjc@rock-chips.com> + * Mark Yao <mark.yao@rock-chips.com> + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _ROCKCHIP_LVDS_ +#define _ROCKCHIP_LVDS_ + +#define RK3288_LVDS_CH0_REG0 0x00 +#define RK3288_LVDS_CH0_REG0_LVDS_EN BIT(7) +#define RK3288_LVDS_CH0_REG0_TTL_EN BIT(6) +#define RK3288_LVDS_CH0_REG0_LANECK_EN BIT(5) +#define RK3288_LVDS_CH0_REG0_LANE4_EN BIT(4) +#define RK3288_LVDS_CH0_REG0_LANE3_EN BIT(3) +#define RK3288_LVDS_CH0_REG0_LANE2_EN BIT(2) +#define RK3288_LVDS_CH0_REG0_LANE1_EN BIT(1) +#define RK3288_LVDS_CH0_REG0_LANE0_EN BIT(0) + +#define RK3288_LVDS_CH0_REG1 0x04 +#define RK3288_LVDS_CH0_REG1_LANECK_BIAS BIT(5) +#define RK3288_LVDS_CH0_REG1_LANE4_BIAS BIT(4) +#define RK3288_LVDS_CH0_REG1_LANE3_BIAS BIT(3) +#define RK3288_LVDS_CH0_REG1_LANE2_BIAS BIT(2) +#define RK3288_LVDS_CH0_REG1_LANE1_BIAS BIT(1) +#define RK3288_LVDS_CH0_REG1_LANE0_BIAS BIT(0) + +#define RK3288_LVDS_CH0_REG2 0x08 +#define RK3288_LVDS_CH0_REG2_RESERVE_ON BIT(7) +#define RK3288_LVDS_CH0_REG2_LANECK_LVDS_MODE BIT(6) +#define RK3288_LVDS_CH0_REG2_LANE4_LVDS_MODE BIT(5) +#define RK3288_LVDS_CH0_REG2_LANE3_LVDS_MODE BIT(4) +#define RK3288_LVDS_CH0_REG2_LANE2_LVDS_MODE BIT(3) +#define RK3288_LVDS_CH0_REG2_LANE1_LVDS_MODE BIT(2) +#define RK3288_LVDS_CH0_REG2_LANE0_LVDS_MODE BIT(1) +#define RK3288_LVDS_CH0_REG2_PLL_FBDIV8 BIT(0) + +#define RK3288_LVDS_CH0_REG3 0x0c +#define RK3288_LVDS_CH0_REG3_PLL_FBDIV_MASK 0xff + +#define RK3288_LVDS_CH0_REG4 0x10 +#define RK3288_LVDS_CH0_REG4_LANECK_TTL_MODE BIT(5) +#define RK3288_LVDS_CH0_REG4_LANE4_TTL_MODE BIT(4) +#define RK3288_LVDS_CH0_REG4_LANE3_TTL_MODE BIT(3) +#define RK3288_LVDS_CH0_REG4_LANE2_TTL_MODE BIT(2) +#define RK3288_LVDS_CH0_REG4_LANE1_TTL_MODE BIT(1) +#define RK3288_LVDS_CH0_REG4_LANE0_TTL_MODE BIT(0) + +#define RK3288_LVDS_CH0_REG5 0x14 +#define RK3288_LVDS_CH0_REG5_LANECK_TTL_DATA BIT(5) +#define RK3288_LVDS_CH0_REG5_LANE4_TTL_DATA BIT(4) +#define RK3288_LVDS_CH0_REG5_LANE3_TTL_DATA BIT(3) +#define RK3288_LVDS_CH0_REG5_LANE2_TTL_DATA BIT(2) +#define RK3288_LVDS_CH0_REG5_LANE1_TTL_DATA BIT(1) +#define RK3288_LVDS_CH0_REG5_LANE0_TTL_DATA BIT(0) + +#define RK3288_LVDS_CFG_REGC 0x30 +#define RK3288_LVDS_CFG_REGC_PLL_ENABLE 0x00 +#define RK3288_LVDS_CFG_REGC_PLL_DISABLE 0xff + +#define RK3288_LVDS_CH0_REGD 0x34 +#define RK3288_LVDS_CH0_REGD_PLL_PREDIV_MASK 0x1f + +#define RK3288_LVDS_CH0_REG20 0x80 +#define RK3288_LVDS_CH0_REG20_MSB 0x45 +#define RK3288_LVDS_CH0_REG20_LSB 0x44 + +#define RK3288_LVDS_CFG_REG21 0x84 +#define RK3288_LVDS_CFG_REG21_TX_ENABLE 0x92 +#define RK3288_LVDS_CFG_REG21_TX_DISABLE 0x00 +#define RK3288_LVDS_CH1_OFFSET 0x100 + +/* fbdiv value is split over 2 registers, with bit8 in reg2 */ +#define RK3288_LVDS_PLL_FBDIV_REG2(_fbd) \ + (_fbd & BIT(8) ? RK3288_LVDS_CH0_REG2_PLL_FBDIV8 : 0) +#define RK3288_LVDS_PLL_FBDIV_REG3(_fbd) \ + (_fbd & RK3288_LVDS_CH0_REG3_PLL_FBDIV_MASK) +#define RK3288_LVDS_PLL_PREDIV_REGD(_pd) \ + (_pd & RK3288_LVDS_CH0_REGD_PLL_PREDIV_MASK) + +#define RK3288_LVDS_SOC_CON6_SEL_VOP_LIT BIT(3) + +#define LVDS_FMT_MASK (0x07 << 16) +#define LVDS_MSB BIT(3) +#define LVDS_DUAL BIT(4) +#define LVDS_FMT_1 BIT(5) +#define LVDS_TTL_EN BIT(6) +#define LVDS_START_PHASE_RST_1 BIT(7) +#define LVDS_DCLK_INV BIT(8) +#define LVDS_CH0_EN BIT(11) +#define LVDS_CH1_EN BIT(12) +#define LVDS_PWRDN BIT(15) + +#define LVDS_24BIT (0 << 1) +#define LVDS_18BIT (1 << 1) +#define LVDS_FORMAT_VESA (0 << 0) +#define LVDS_FORMAT_JEIDA (1 << 0) + +#define LVDS_VESA_24 0 +#define LVDS_JEIDA_24 1 +#define LVDS_VESA_18 2 +#define LVDS_JEIDA_18 3 + +#endif /* _ROCKCHIP_LVDS_ */ -- 2.7.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v8 3/3] drm/rockchip: Add support for Rockchip Soc LVDS 2017-09-02 11:28 ` [PATCH v8 3/3] drm/rockchip: Add support for Rockchip Soc LVDS Sandy Huang @ 2017-09-07 10:16 ` Mark yao 2017-09-07 12:09 ` Heiko Stübner 0 siblings, 1 reply; 12+ messages in thread From: Mark yao @ 2017-09-07 10:16 UTC (permalink / raw) To: linux-arm-kernel Hi Sandy Looks good for me, so: Reviewed-by: Mark Yao <mark.yao@rock-chips.com> I'd like to apply these lvds patches tomorrow if there is no more doubts. Best Regards Mark On 2017?09?02? 19:28, Sandy Huang wrote: > This adds support for Rockchip soc lvds found on rk3288 > Based on the patches from Mark yao and Heiko Stuebner. > > Signed-off-by: Mark Yao <mark.yao@rock-chips.com> > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > Signed-off-by: Sandy Huang <hjc@rock-chips.com> > --- > Change the Signed-off order > > drivers/gpu/drm/rockchip/Kconfig | 8 + > drivers/gpu/drm/rockchip/Makefile | 1 + > drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 + > drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + > drivers/gpu/drm/rockchip/rockchip_lvds.c | 582 ++++++++++++++++++++++++++++ > drivers/gpu/drm/rockchip/rockchip_lvds.h | 114 ++++++ > 6 files changed, 708 insertions(+) > create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.c > create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.h > > diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig > index dcc539b..0c31f0a 100644 > --- a/drivers/gpu/drm/rockchip/Kconfig > +++ b/drivers/gpu/drm/rockchip/Kconfig > @@ -57,4 +57,12 @@ config ROCKCHIP_INNO_HDMI > for the Innosilicon HDMI driver. If you want to enable > HDMI on RK3036 based SoC, you should select this option. > > +config ROCKCHIP_LVDS > + bool "Rockchip LVDS support" > + depends on DRM_ROCKCHIP > + help > + Choose this option to enable support for Rockchip LVDS controllers. > + Rockchip rk3288 SoC has LVDS TX Controller can be used, and it > + support LVDS, rgb, dual LVDS output mode. say Y to enable its > + driver. > endif > diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile > index fa8dc9d..a881d2c 100644 > --- a/drivers/gpu/drm/rockchip/Makefile > +++ b/drivers/gpu/drm/rockchip/Makefile > @@ -12,5 +12,6 @@ rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o > rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o > rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o > rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o > +rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) += rockchip_lvds.o > > obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > index c41f48a..082c251 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > @@ -445,6 +445,8 @@ static int __init rockchip_drm_init(void) > > num_rockchip_sub_drivers = 0; > ADD_ROCKCHIP_SUB_DRIVER(vop_platform_driver, CONFIG_DRM_ROCKCHIP); > + ADD_ROCKCHIP_SUB_DRIVER(rockchip_lvds_driver, > + CONFIG_ROCKCHIP_LVDS); > ADD_ROCKCHIP_SUB_DRIVER(rockchip_dp_driver, > CONFIG_ROCKCHIP_ANALOGIX_DP); > ADD_ROCKCHIP_SUB_DRIVER(cdn_dp_driver, CONFIG_ROCKCHIP_CDN_DP); > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h > index c7e96b8..498dfbc 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h > @@ -69,5 +69,6 @@ extern struct platform_driver dw_hdmi_rockchip_pltfm_driver; > extern struct platform_driver dw_mipi_dsi_driver; > extern struct platform_driver inno_hdmi_driver; > extern struct platform_driver rockchip_dp_driver; > +extern struct platform_driver rockchip_lvds_driver; > extern struct platform_driver vop_platform_driver; > #endif /* _ROCKCHIP_DRM_DRV_H_ */ > diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c > new file mode 100644 > index 0000000..86d9a8c > --- /dev/null > +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c > @@ -0,0 +1,582 @@ > +/* > + * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd > + * Author: > + * Mark Yao <mark.yao@rock-chips.com> > + * Sandy Huang <hjc@rock-chips.com> > + * > + * This software is licensed under the terms of the GNU General Public > + * License version 2, as published by the Free Software Foundation, and > + * may be copied, distributed, and modified under those terms. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + */ > + > +#include <drm/drmP.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_dp_helper.h> > +#include <drm/drm_panel.h> > +#include <drm/drm_of.h> > + > +#include <linux/component.h> > +#include <linux/clk.h> > +#include <linux/mfd/syscon.h> > +#include <linux/of_graph.h> > +#include <linux/pm_runtime.h> > +#include <linux/regmap.h> > +#include <linux/reset.h> > + > +#include "rockchip_drm_drv.h" > +#include "rockchip_drm_vop.h" > +#include "rockchip_lvds.h" > + > +#define DISPLAY_OUTPUT_RGB 0 > +#define DISPLAY_OUTPUT_LVDS 1 > +#define DISPLAY_OUTPUT_DUAL_LVDS 2 > + > +#define connector_to_lvds(c) \ > + container_of(c, struct rockchip_lvds, connector) > + > +#define encoder_to_lvds(c) \ > + container_of(c, struct rockchip_lvds, encoder) > + > +/** > + * rockchip_lvds_soc_data - rockchip lvds Soc private data > + * @ch1_offset: lvds channel 1 registe offset > + * grf_soc_con6: general registe offset for LVDS contrl > + * grf_soc_con7: general registe offset for LVDS contrl > + * has_vop_sel: to indicate whether need to choose from different VOP. > + */ > +struct rockchip_lvds_soc_data { > + u32 ch1_offset; > + int grf_soc_con6; > + int grf_soc_con7; > + bool has_vop_sel; > +}; > + > +struct rockchip_lvds { > + struct device *dev; > + void __iomem *regs; > + struct regmap *grf; > + struct clk *pclk; > + const struct rockchip_lvds_soc_data *soc_data; > + int output; /* rgb lvds or dual lvds output */ > + int format; /* vesa or jeida format */ > + struct drm_device *drm_dev; > + struct drm_panel *panel; > + struct drm_bridge *bridge; > + struct drm_connector connector; > + struct drm_encoder encoder; > + struct dev_pin_info *pins; > +}; > + > +static inline void lvds_writel(struct rockchip_lvds *lvds, u32 offset, u32 val) > +{ > + writel_relaxed(val, lvds->regs + offset); > + if (lvds->output == DISPLAY_OUTPUT_LVDS) > + return; > + writel_relaxed(val, lvds->regs + offset + lvds->soc_data->ch1_offset); > +} > + > +static inline int lvds_name_to_format(const char *s) > +{ > + if (strncmp(s, "jeida-18", 8) == 0) > + return LVDS_JEIDA_18; > + else if (strncmp(s, "jeida-24", 8) == 0) > + return LVDS_JEIDA_24; > + else if (strncmp(s, "vesa-24", 7) == 0) > + return LVDS_VESA_24; > + > + return -EINVAL; > +} > + > +static inline int lvds_name_to_output(const char *s) > +{ > + if (strncmp(s, "rgb", 3) == 0) > + return DISPLAY_OUTPUT_RGB; > + else if (strncmp(s, "lvds", 4) == 0) > + return DISPLAY_OUTPUT_LVDS; > + else if (strncmp(s, "duallvds", 8) == 0) > + return DISPLAY_OUTPUT_DUAL_LVDS; > + > + return -EINVAL; > +} > + > +static int rockchip_lvds_poweron(struct rockchip_lvds *lvds) > +{ > + int ret; > + u32 val; > + > + ret = clk_enable(lvds->pclk); > + if (ret < 0) { > + DRM_DEV_ERROR(lvds->dev, "failed to enable lvds pclk %d\n", ret); > + return ret; > + } > + ret = pm_runtime_get_sync(lvds->dev); > + if (ret < 0) { > + DRM_DEV_ERROR(lvds->dev, "failed to get pm runtime: %d\n", ret); > + clk_disable(lvds->pclk); > + return ret; > + } > + val = RK3288_LVDS_CH0_REG0_LANE4_EN | RK3288_LVDS_CH0_REG0_LANE3_EN | > + RK3288_LVDS_CH0_REG0_LANE2_EN | RK3288_LVDS_CH0_REG0_LANE1_EN | > + RK3288_LVDS_CH0_REG0_LANE0_EN; > + if (lvds->output == DISPLAY_OUTPUT_RGB) { > + val |= RK3288_LVDS_CH0_REG0_TTL_EN | > + RK3288_LVDS_CH0_REG0_LANECK_EN; > + lvds_writel(lvds, RK3288_LVDS_CH0_REG0, val); > + lvds_writel(lvds, RK3288_LVDS_CH0_REG2, > + RK3288_LVDS_PLL_FBDIV_REG2(0x46)); > + lvds_writel(lvds, RK3288_LVDS_CH0_REG4, > + RK3288_LVDS_CH0_REG4_LANECK_TTL_MODE | > + RK3288_LVDS_CH0_REG4_LANE4_TTL_MODE | > + RK3288_LVDS_CH0_REG4_LANE3_TTL_MODE | > + RK3288_LVDS_CH0_REG4_LANE2_TTL_MODE | > + RK3288_LVDS_CH0_REG4_LANE1_TTL_MODE | > + RK3288_LVDS_CH0_REG4_LANE0_TTL_MODE); > + lvds_writel(lvds, RK3288_LVDS_CH0_REG5, > + RK3288_LVDS_CH0_REG5_LANECK_TTL_DATA | > + RK3288_LVDS_CH0_REG5_LANE4_TTL_DATA | > + RK3288_LVDS_CH0_REG5_LANE3_TTL_DATA | > + RK3288_LVDS_CH0_REG5_LANE2_TTL_DATA | > + RK3288_LVDS_CH0_REG5_LANE1_TTL_DATA | > + RK3288_LVDS_CH0_REG5_LANE0_TTL_DATA); > + } else { > + val |= RK3288_LVDS_CH0_REG0_LVDS_EN | > + RK3288_LVDS_CH0_REG0_LANECK_EN; > + lvds_writel(lvds, RK3288_LVDS_CH0_REG0, val); > + lvds_writel(lvds, RK3288_LVDS_CH0_REG1, > + RK3288_LVDS_CH0_REG1_LANECK_BIAS | > + RK3288_LVDS_CH0_REG1_LANE4_BIAS | > + RK3288_LVDS_CH0_REG1_LANE3_BIAS | > + RK3288_LVDS_CH0_REG1_LANE2_BIAS | > + RK3288_LVDS_CH0_REG1_LANE1_BIAS | > + RK3288_LVDS_CH0_REG1_LANE0_BIAS); > + lvds_writel(lvds, RK3288_LVDS_CH0_REG2, > + RK3288_LVDS_CH0_REG2_RESERVE_ON | > + RK3288_LVDS_CH0_REG2_LANECK_LVDS_MODE | > + RK3288_LVDS_CH0_REG2_LANE4_LVDS_MODE | > + RK3288_LVDS_CH0_REG2_LANE3_LVDS_MODE | > + RK3288_LVDS_CH0_REG2_LANE2_LVDS_MODE | > + RK3288_LVDS_CH0_REG2_LANE1_LVDS_MODE | > + RK3288_LVDS_CH0_REG2_LANE0_LVDS_MODE | > + RK3288_LVDS_PLL_FBDIV_REG2(0x46)); > + lvds_writel(lvds, RK3288_LVDS_CH0_REG4, 0x00); > + lvds_writel(lvds, RK3288_LVDS_CH0_REG5, 0x00); > + } > + lvds_writel(lvds, RK3288_LVDS_CH0_REG3, RK3288_LVDS_PLL_FBDIV_REG3(0x46)); > + lvds_writel(lvds, RK3288_LVDS_CH0_REGD, RK3288_LVDS_PLL_PREDIV_REGD(0x0a)); > + lvds_writel(lvds, RK3288_LVDS_CH0_REG20, RK3288_LVDS_CH0_REG20_LSB); > + > + lvds_writel(lvds, RK3288_LVDS_CFG_REGC, RK3288_LVDS_CFG_REGC_PLL_ENABLE); > + lvds_writel(lvds, RK3288_LVDS_CFG_REG21, RK3288_LVDS_CFG_REG21_TX_ENABLE); > + > + return 0; > +} > + > +static void rockchip_lvds_poweroff(struct rockchip_lvds *lvds) > +{ > + int ret; > + u32 val; > + > + lvds_writel(lvds, RK3288_LVDS_CFG_REG21, RK3288_LVDS_CFG_REG21_TX_ENABLE); > + lvds_writel(lvds, RK3288_LVDS_CFG_REGC, RK3288_LVDS_CFG_REGC_PLL_ENABLE); > + val = LVDS_DUAL | LVDS_TTL_EN | LVDS_CH0_EN | LVDS_CH1_EN | LVDS_PWRDN; > + val |= val << 16; > + ret = regmap_write(lvds->grf, lvds->soc_data->grf_soc_con7, val); > + if (ret != 0) > + DRM_DEV_ERROR(lvds->dev, "Could not write to GRF: %d\n", ret); > + > + pm_runtime_put(lvds->dev); > + clk_disable(lvds->pclk); > +} > + > +static const struct drm_connector_funcs rockchip_lvds_connector_funcs = { > + .dpms = drm_atomic_helper_connector_dpms, > + .fill_modes = drm_helper_probe_single_connector_modes, > + .destroy = drm_connector_cleanup, > + .reset = drm_atomic_helper_connector_reset, > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > +}; > + > +static int rockchip_lvds_connector_get_modes(struct drm_connector *connector) > +{ > + struct rockchip_lvds *lvds = connector_to_lvds(connector); > + struct drm_panel *panel = lvds->panel; > + > + return drm_panel_get_modes(panel); > +} > + > +static const > +struct drm_connector_helper_funcs rockchip_lvds_connector_helper_funcs = { > + .get_modes = rockchip_lvds_connector_get_modes, > +}; > + > +static void rockchip_lvds_grf_config(struct drm_encoder *encoder, > + struct drm_display_mode *mode) > +{ > + struct rockchip_lvds *lvds = encoder_to_lvds(encoder); > + u8 pin_hsync = (mode->flags & DRM_MODE_FLAG_PHSYNC) ? 1 : 0; > + u8 pin_dclk = (mode->flags & DRM_MODE_FLAG_PCSYNC) ? 1 : 0; > + u32 val; > + int ret; > + > + /* iomux to LCD data/sync mode */ > + if (lvds->output == DISPLAY_OUTPUT_RGB) > + if (lvds->pins && !IS_ERR(lvds->pins->default_state)) > + pinctrl_select_state(lvds->pins->p, > + lvds->pins->default_state); > + val = lvds->format | LVDS_CH0_EN; > + if (lvds->output == DISPLAY_OUTPUT_RGB) > + val |= LVDS_TTL_EN | LVDS_CH1_EN; > + else if (lvds->output == DISPLAY_OUTPUT_DUAL_LVDS) > + val |= LVDS_DUAL | LVDS_CH1_EN; > + > + if ((mode->htotal - mode->hsync_start) & 0x01) > + val |= LVDS_START_PHASE_RST_1; > + > + val |= (pin_dclk << 8) | (pin_hsync << 9); > + val |= (0xffff << 16); > + ret = regmap_write(lvds->grf, lvds->soc_data->grf_soc_con7, val); > + if (ret != 0) { > + DRM_DEV_ERROR(lvds->dev, "Could not write to GRF: %d\n", ret); > + return; > + } > +} > + > +static int rockchip_lvds_set_vop_source(struct rockchip_lvds *lvds, > + struct drm_encoder *encoder) > +{ > + u32 val; > + int ret; > + > + if (!lvds->soc_data->has_vop_sel) > + return 0; > + > + ret = drm_of_encoder_active_endpoint_id(lvds->dev->of_node, encoder); > + if (ret < 0) > + return ret; > + > + val = RK3288_LVDS_SOC_CON6_SEL_VOP_LIT << 16; > + if (ret) > + val |= RK3288_LVDS_SOC_CON6_SEL_VOP_LIT; > + > + ret = regmap_write(lvds->grf, lvds->soc_data->grf_soc_con6, val); > + if (ret < 0) > + return ret; > + > + return 0; > +} > + > +static int > +rockchip_lvds_encoder_atomic_check(struct drm_encoder *encoder, > + struct drm_crtc_state *crtc_state, > + struct drm_connector_state *conn_state) > +{ > + struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state); > + > + s->output_mode = ROCKCHIP_OUT_MODE_P888; > + s->output_type = DRM_MODE_CONNECTOR_LVDS; > + > + return 0; > +} > + > +static void rockchip_lvds_encoder_enable(struct drm_encoder *encoder) > +{ > + struct rockchip_lvds *lvds = encoder_to_lvds(encoder); > + struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > + int ret; > + > + drm_panel_prepare(lvds->panel); > + ret = rockchip_lvds_poweron(lvds); > + if (ret < 0) { > + DRM_DEV_ERROR(lvds->dev, "failed to power on lvds: %d\n", ret); > + drm_panel_unprepare(lvds->panel); > + } > + rockchip_lvds_grf_config(encoder, mode); > + rockchip_lvds_set_vop_source(lvds, encoder); > + drm_panel_enable(lvds->panel); > +} > + > +static void rockchip_lvds_encoder_disable(struct drm_encoder *encoder) > +{ > + struct rockchip_lvds *lvds = encoder_to_lvds(encoder); > + > + drm_panel_disable(lvds->panel); > + rockchip_lvds_poweroff(lvds); > + drm_panel_unprepare(lvds->panel); > +} > + > +static const > +struct drm_encoder_helper_funcs rockchip_lvds_encoder_helper_funcs = { > + .enable = rockchip_lvds_encoder_enable, > + .disable = rockchip_lvds_encoder_disable, > + .atomic_check = rockchip_lvds_encoder_atomic_check, > +}; > + > +static const struct drm_encoder_funcs rockchip_lvds_encoder_funcs = { > + .destroy = drm_encoder_cleanup, > +}; > + > +static const struct rockchip_lvds_soc_data rk3288_lvds_data = { > + .ch1_offset = 0x100, > + .grf_soc_con6 = 0x025c, > + .grf_soc_con7 = 0x0260, > + .has_vop_sel = true, > +}; > + > +static const struct of_device_id rockchip_lvds_dt_ids[] = { > + { > + .compatible = "rockchip,rk3288-lvds", > + .data = &rk3288_lvds_data > + }, > + {} > +}; > +MODULE_DEVICE_TABLE(of, rockchip_lvds_dt_ids); > + > +static int rockchip_lvds_bind(struct device *dev, struct device *master, > + void *data) > +{ > + struct rockchip_lvds *lvds = dev_get_drvdata(dev); > + struct drm_device *drm_dev = data; > + struct drm_encoder *encoder; > + struct drm_connector *connector; > + struct device_node *remote = NULL; > + struct device_node *port, *endpoint; > + int ret; > + const char *name; > + u32 endpoint_id; > + > + lvds->drm_dev = drm_dev; > + port = of_graph_get_port_by_id(dev->of_node, 1); > + if (!port) { > + DRM_DEV_ERROR(dev, > + "can't found port point, please init lvds panel port!\n"); > + return -EINVAL; > + } > + for_each_child_of_node(port, endpoint) { > + of_property_read_u32(endpoint, "reg", &endpoint_id); > + ret = drm_of_find_panel_or_bridge(dev->of_node, 1, endpoint_id, > + &lvds->panel, &lvds->bridge); > + if (!ret) > + break; > + } > + if (ret) { > + DRM_DEV_ERROR(dev, "failed to find panel and bridge node\n"); > + ret = -EPROBE_DEFER; > + goto err_put_port; > + } > + if (lvds->panel) > + remote = lvds->panel->dev->of_node; > + else > + remote = lvds->bridge->of_node; > + if (of_property_read_string(dev->of_node, "rockchip,output", &name)) > + /* default set it as output rgb */ > + lvds->output = DISPLAY_OUTPUT_RGB; > + else > + lvds->output = lvds_name_to_output(name); > + > + if (lvds->output < 0) { > + DRM_DEV_ERROR(dev, "invalid output type [%s]\n", name); > + ret = lvds->output; > + goto err_put_remote; > + } > + > + if (of_property_read_string(remote, "data-mapping", &name)) > + /* default set it as format vesa 18 */ > + lvds->format = LVDS_VESA_18; > + else > + lvds->format = lvds_name_to_format(name); > + > + if (lvds->format < 0) { > + DRM_DEV_ERROR(dev, "invalid data-mapping format [%s]\n", name); > + ret = lvds->format; > + goto err_put_remote; > + } > + > + encoder = &lvds->encoder; > + encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev, > + dev->of_node); > + > + ret = drm_encoder_init(drm_dev, encoder, &rockchip_lvds_encoder_funcs, > + DRM_MODE_ENCODER_LVDS, NULL); > + if (ret < 0) { > + DRM_DEV_ERROR(drm_dev->dev, > + "failed to initialize encoder: %d\n", ret); > + goto err_put_remote; > + } > + > + drm_encoder_helper_add(encoder, &rockchip_lvds_encoder_helper_funcs); > + > + if (lvds->panel) { > + connector = &lvds->connector; > + connector->dpms = DRM_MODE_DPMS_OFF; > + ret = drm_connector_init(drm_dev, connector, > + &rockchip_lvds_connector_funcs, > + DRM_MODE_CONNECTOR_LVDS); > + if (ret < 0) { > + DRM_DEV_ERROR(drm_dev->dev, > + "failed to initialize connector: %d\n", ret); > + goto err_free_encoder; > + } > + > + drm_connector_helper_add(connector, > + &rockchip_lvds_connector_helper_funcs); > + > + ret = drm_mode_connector_attach_encoder(connector, encoder); > + if (ret < 0) { > + DRM_DEV_ERROR(drm_dev->dev, > + "failed to attach encoder: %d\n", ret); > + goto err_free_connector; > + } > + > + ret = drm_panel_attach(lvds->panel, connector); > + if (ret < 0) { > + DRM_DEV_ERROR(drm_dev->dev, > + "failed to attach panel: %d\n", ret); > + goto err_free_connector; > + } > + } else { > + lvds->bridge->encoder = encoder; > + ret = drm_bridge_attach(encoder, lvds->bridge, NULL); > + if (ret) { > + DRM_DEV_ERROR(drm_dev->dev, > + "failed to attach bridge: %d\n", ret); > + goto err_free_encoder; > + } > + encoder->bridge = lvds->bridge; > + } > + > + pm_runtime_enable(dev); > + of_node_put(remote); > + of_node_put(port); > + > + return 0; > + > +err_free_connector: > + drm_connector_cleanup(connector); > +err_free_encoder: > + drm_encoder_cleanup(encoder); > +err_put_remote: > + of_node_put(remote); > +err_put_port: > + of_node_put(port); > + > + return ret; > +} > + > +static void rockchip_lvds_unbind(struct device *dev, struct device *master, > + void *data) > +{ > + struct rockchip_lvds *lvds = dev_get_drvdata(dev); > + > + rockchip_lvds_encoder_disable(&lvds->encoder); > + if (lvds->panel) > + drm_panel_detach(lvds->panel); > + pm_runtime_disable(dev); > + drm_connector_cleanup(&lvds->connector); > + drm_encoder_cleanup(&lvds->encoder); > +} > + > +static const struct component_ops rockchip_lvds_component_ops = { > + .bind = rockchip_lvds_bind, > + .unbind = rockchip_lvds_unbind, > +}; > + > +static int rockchip_lvds_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct rockchip_lvds *lvds; > + const struct of_device_id *match; > + struct resource *res; > + int ret; > + > + if (!dev->of_node) > + return -ENODEV; > + > + lvds = devm_kzalloc(&pdev->dev, sizeof(*lvds), GFP_KERNEL); > + if (!lvds) > + return -ENOMEM; > + > + lvds->dev = dev; > + match = of_match_node(rockchip_lvds_dt_ids, dev->of_node); > + if (!match) > + return -ENODEV; > + lvds->soc_data = match->data; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + lvds->regs = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(lvds->regs)) > + return PTR_ERR(lvds->regs); > + > + lvds->pclk = devm_clk_get(&pdev->dev, "pclk_lvds"); > + if (IS_ERR(lvds->pclk)) { > + DRM_DEV_ERROR(dev, "could not get pclk_lvds\n"); > + return PTR_ERR(lvds->pclk); > + } > + > + lvds->pins = devm_kzalloc(lvds->dev, sizeof(*lvds->pins), > + GFP_KERNEL); > + if (!lvds->pins) > + return -ENOMEM; > + > + lvds->pins->p = devm_pinctrl_get(lvds->dev); > + if (IS_ERR(lvds->pins->p)) { > + DRM_DEV_ERROR(dev, "no pinctrl handle\n"); > + devm_kfree(lvds->dev, lvds->pins); > + lvds->pins = NULL; > + } else { > + lvds->pins->default_state = > + pinctrl_lookup_state(lvds->pins->p, "lcdc"); > + if (IS_ERR(lvds->pins->default_state)) { > + DRM_DEV_ERROR(dev, "no default pinctrl state\n"); > + devm_kfree(lvds->dev, lvds->pins); > + lvds->pins = NULL; > + } > + } > + > + lvds->grf = syscon_regmap_lookup_by_phandle(dev->of_node, > + "rockchip,grf"); > + if (IS_ERR(lvds->grf)) { > + DRM_DEV_ERROR(dev, "missing rockchip,grf property\n"); > + return PTR_ERR(lvds->grf); > + } > + > + dev_set_drvdata(dev, lvds); > + > + ret = clk_prepare(lvds->pclk); > + if (ret < 0) { > + DRM_DEV_ERROR(dev, "failed to prepare pclk_lvds\n"); > + return ret; > + } > + ret = component_add(&pdev->dev, &rockchip_lvds_component_ops); > + if (ret < 0) { > + DRM_DEV_ERROR(dev, "failed to add component\n"); > + clk_unprepare(lvds->pclk); > + } > + > + return ret; > +} > + > +static int rockchip_lvds_remove(struct platform_device *pdev) > +{ > + struct rockchip_lvds *lvds = dev_get_drvdata(&pdev->dev); > + > + component_del(&pdev->dev, &rockchip_lvds_component_ops); > + clk_unprepare(lvds->pclk); > + > + return 0; > +} > + > +struct platform_driver rockchip_lvds_driver = { > + .probe = rockchip_lvds_probe, > + .remove = rockchip_lvds_remove, > + .driver = { > + .name = "rockchip-lvds", > + .of_match_table = of_match_ptr(rockchip_lvds_dt_ids), > + }, > +}; > diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.h b/drivers/gpu/drm/rockchip/rockchip_lvds.h > new file mode 100644 > index 0000000..15810b7 > --- /dev/null > +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.h > @@ -0,0 +1,114 @@ > +/* > + * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd > + * Author: > + * Sandy Huang <hjc@rock-chips.com> > + * Mark Yao <mark.yao@rock-chips.com> > + * > + * This software is licensed under the terms of the GNU General Public > + * License version 2, as published by the Free Software Foundation, and > + * may be copied, distributed, and modified under those terms. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + */ > + > +#ifndef _ROCKCHIP_LVDS_ > +#define _ROCKCHIP_LVDS_ > + > +#define RK3288_LVDS_CH0_REG0 0x00 > +#define RK3288_LVDS_CH0_REG0_LVDS_EN BIT(7) > +#define RK3288_LVDS_CH0_REG0_TTL_EN BIT(6) > +#define RK3288_LVDS_CH0_REG0_LANECK_EN BIT(5) > +#define RK3288_LVDS_CH0_REG0_LANE4_EN BIT(4) > +#define RK3288_LVDS_CH0_REG0_LANE3_EN BIT(3) > +#define RK3288_LVDS_CH0_REG0_LANE2_EN BIT(2) > +#define RK3288_LVDS_CH0_REG0_LANE1_EN BIT(1) > +#define RK3288_LVDS_CH0_REG0_LANE0_EN BIT(0) > + > +#define RK3288_LVDS_CH0_REG1 0x04 > +#define RK3288_LVDS_CH0_REG1_LANECK_BIAS BIT(5) > +#define RK3288_LVDS_CH0_REG1_LANE4_BIAS BIT(4) > +#define RK3288_LVDS_CH0_REG1_LANE3_BIAS BIT(3) > +#define RK3288_LVDS_CH0_REG1_LANE2_BIAS BIT(2) > +#define RK3288_LVDS_CH0_REG1_LANE1_BIAS BIT(1) > +#define RK3288_LVDS_CH0_REG1_LANE0_BIAS BIT(0) > + > +#define RK3288_LVDS_CH0_REG2 0x08 > +#define RK3288_LVDS_CH0_REG2_RESERVE_ON BIT(7) > +#define RK3288_LVDS_CH0_REG2_LANECK_LVDS_MODE BIT(6) > +#define RK3288_LVDS_CH0_REG2_LANE4_LVDS_MODE BIT(5) > +#define RK3288_LVDS_CH0_REG2_LANE3_LVDS_MODE BIT(4) > +#define RK3288_LVDS_CH0_REG2_LANE2_LVDS_MODE BIT(3) > +#define RK3288_LVDS_CH0_REG2_LANE1_LVDS_MODE BIT(2) > +#define RK3288_LVDS_CH0_REG2_LANE0_LVDS_MODE BIT(1) > +#define RK3288_LVDS_CH0_REG2_PLL_FBDIV8 BIT(0) > + > +#define RK3288_LVDS_CH0_REG3 0x0c > +#define RK3288_LVDS_CH0_REG3_PLL_FBDIV_MASK 0xff > + > +#define RK3288_LVDS_CH0_REG4 0x10 > +#define RK3288_LVDS_CH0_REG4_LANECK_TTL_MODE BIT(5) > +#define RK3288_LVDS_CH0_REG4_LANE4_TTL_MODE BIT(4) > +#define RK3288_LVDS_CH0_REG4_LANE3_TTL_MODE BIT(3) > +#define RK3288_LVDS_CH0_REG4_LANE2_TTL_MODE BIT(2) > +#define RK3288_LVDS_CH0_REG4_LANE1_TTL_MODE BIT(1) > +#define RK3288_LVDS_CH0_REG4_LANE0_TTL_MODE BIT(0) > + > +#define RK3288_LVDS_CH0_REG5 0x14 > +#define RK3288_LVDS_CH0_REG5_LANECK_TTL_DATA BIT(5) > +#define RK3288_LVDS_CH0_REG5_LANE4_TTL_DATA BIT(4) > +#define RK3288_LVDS_CH0_REG5_LANE3_TTL_DATA BIT(3) > +#define RK3288_LVDS_CH0_REG5_LANE2_TTL_DATA BIT(2) > +#define RK3288_LVDS_CH0_REG5_LANE1_TTL_DATA BIT(1) > +#define RK3288_LVDS_CH0_REG5_LANE0_TTL_DATA BIT(0) > + > +#define RK3288_LVDS_CFG_REGC 0x30 > +#define RK3288_LVDS_CFG_REGC_PLL_ENABLE 0x00 > +#define RK3288_LVDS_CFG_REGC_PLL_DISABLE 0xff > + > +#define RK3288_LVDS_CH0_REGD 0x34 > +#define RK3288_LVDS_CH0_REGD_PLL_PREDIV_MASK 0x1f > + > +#define RK3288_LVDS_CH0_REG20 0x80 > +#define RK3288_LVDS_CH0_REG20_MSB 0x45 > +#define RK3288_LVDS_CH0_REG20_LSB 0x44 > + > +#define RK3288_LVDS_CFG_REG21 0x84 > +#define RK3288_LVDS_CFG_REG21_TX_ENABLE 0x92 > +#define RK3288_LVDS_CFG_REG21_TX_DISABLE 0x00 > +#define RK3288_LVDS_CH1_OFFSET 0x100 > + > +/* fbdiv value is split over 2 registers, with bit8 in reg2 */ > +#define RK3288_LVDS_PLL_FBDIV_REG2(_fbd) \ > + (_fbd & BIT(8) ? RK3288_LVDS_CH0_REG2_PLL_FBDIV8 : 0) > +#define RK3288_LVDS_PLL_FBDIV_REG3(_fbd) \ > + (_fbd & RK3288_LVDS_CH0_REG3_PLL_FBDIV_MASK) > +#define RK3288_LVDS_PLL_PREDIV_REGD(_pd) \ > + (_pd & RK3288_LVDS_CH0_REGD_PLL_PREDIV_MASK) > + > +#define RK3288_LVDS_SOC_CON6_SEL_VOP_LIT BIT(3) > + > +#define LVDS_FMT_MASK (0x07 << 16) > +#define LVDS_MSB BIT(3) > +#define LVDS_DUAL BIT(4) > +#define LVDS_FMT_1 BIT(5) > +#define LVDS_TTL_EN BIT(6) > +#define LVDS_START_PHASE_RST_1 BIT(7) > +#define LVDS_DCLK_INV BIT(8) > +#define LVDS_CH0_EN BIT(11) > +#define LVDS_CH1_EN BIT(12) > +#define LVDS_PWRDN BIT(15) > + > +#define LVDS_24BIT (0 << 1) > +#define LVDS_18BIT (1 << 1) > +#define LVDS_FORMAT_VESA (0 << 0) > +#define LVDS_FORMAT_JEIDA (1 << 0) > + > +#define LVDS_VESA_24 0 > +#define LVDS_JEIDA_24 1 > +#define LVDS_VESA_18 2 > +#define LVDS_JEIDA_18 3 > + > +#endif /* _ROCKCHIP_LVDS_ */ ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v8 3/3] drm/rockchip: Add support for Rockchip Soc LVDS 2017-09-07 10:16 ` Mark yao @ 2017-09-07 12:09 ` Heiko Stübner 2017-09-08 1:23 ` Mark yao 0 siblings, 1 reply; 12+ messages in thread From: Heiko Stübner @ 2017-09-07 12:09 UTC (permalink / raw) To: linux-arm-kernel Hi Mark, Am Donnerstag, 7. September 2017, 18:16:29 CEST schrieb Mark yao: > Looks good for me, so: > Reviewed-by: Mark Yao <mark.yao@rock-chips.com> > > I'd like to apply these lvds patches tomorrow if there is no more doubts. Rob had some minor comments on v7 of the dt-binding, so you may want to give him a bit more time to Ack the hopefully updated binding. Otherwise no doubts from me, just a reminder that you should take patches 1+3 and I'll pick patch 2 with the dts changes after that. Thanks Heiko ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v8 3/3] drm/rockchip: Add support for Rockchip Soc LVDS 2017-09-07 12:09 ` Heiko Stübner @ 2017-09-08 1:23 ` Mark yao 2017-09-08 5:04 ` Heiko Stuebner 0 siblings, 1 reply; 12+ messages in thread From: Mark yao @ 2017-09-08 1:23 UTC (permalink / raw) To: linux-arm-kernel On 2017?09?07? 20:09, Heiko St?bner wrote: > Hi Mark, > > Am Donnerstag, 7. September 2017, 18:16:29 CEST schrieb Mark yao: >> Looks good for me, so: >> Reviewed-by: Mark Yao <mark.yao@rock-chips.com> >> >> I'd like to apply these lvds patches tomorrow if there is no more doubts. > Rob had some minor comments on v7 of the dt-binding, so you may want > to give him a bit more time to Ack the hopefully updated binding. Rob already gave a Reviewed-by on v7 dt-binding, but maybe it has some doubts for his Ack. Ok, let's wait some more time. > Otherwise no doubts from me, just a reminder that you should take > patches 1+3 and I'll pick patch 2 with the dts changes after that. > > > Thanks > Heiko > > > > -- ?ark Yao ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v8 3/3] drm/rockchip: Add support for Rockchip Soc LVDS 2017-09-08 1:23 ` Mark yao @ 2017-09-08 5:04 ` Heiko Stuebner 2017-09-08 6:12 ` Mark yao 0 siblings, 1 reply; 12+ messages in thread From: Heiko Stuebner @ 2017-09-08 5:04 UTC (permalink / raw) To: linux-arm-kernel Am Freitag, 8. September 2017, 09:23:09 CEST schrieb Mark yao: > On 2017?09?07? 20:09, Heiko St?bner wrote: > > Hi Mark, > > > > Am Donnerstag, 7. September 2017, 18:16:29 CEST schrieb Mark yao: > >> Looks good for me, so: > >> Reviewed-by: Mark Yao <mark.yao@rock-chips.com> > >> > >> I'd like to apply these lvds patches tomorrow if there is no more doubts. > > Rob had some minor comments on v7 of the dt-binding, so you may want > > to give him a bit more time to Ack the hopefully updated binding. > > Rob already gave a Reviewed-by on v7 dt-binding, but maybe it has some doubts for his Ack. > > Ok, let's wait some more time. ah, I looked at v6 and found the comments, not v7 and v7 is not in my archive because I likely accidentially deleted it. So Sandy just forgot to carry over the Ack/Review tag. So I guess there is no need to wait anymore and you just need to pick up Rob's tag from v7 then. Heiko ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v8 3/3] drm/rockchip: Add support for Rockchip Soc LVDS 2017-09-08 5:04 ` Heiko Stuebner @ 2017-09-08 6:12 ` Mark yao 2017-09-08 7:05 ` Mark yao 0 siblings, 1 reply; 12+ messages in thread From: Mark yao @ 2017-09-08 6:12 UTC (permalink / raw) To: linux-arm-kernel On 2017?09?08? 13:04, Heiko Stuebner wrote: > Am Freitag, 8. September 2017, 09:23:09 CEST schrieb Mark yao: >> On 2017?09?07? 20:09, Heiko St?bner wrote: >>> Hi Mark, >>> >>> Am Donnerstag, 7. September 2017, 18:16:29 CEST schrieb Mark yao: >>>> Looks good for me, so: >>>> Reviewed-by: Mark Yao <mark.yao@rock-chips.com> >>>> >>>> I'd like to apply these lvds patches tomorrow if there is no more doubts. >>> Rob had some minor comments on v7 of the dt-binding, so you may want >>> to give him a bit more time to Ack the hopefully updated binding. >> Rob already gave a Reviewed-by on v7 dt-binding, but maybe it has some doubts for his Ack. >> >> Ok, let's wait some more time. > ah, I looked at v6 and found the comments, not v7 and v7 is not in my > archive because I likely accidentially deleted it. > So Sandy just forgot to carry over the Ack/Review tag. So I guess there is > no need to wait anymore and you just need to pick up Rob's tag from v7 then. Right, Sandy forgot to carry those tag on new patchset, I will carry those tag: Tested-by on v5, Reviewed-by on v6 and v7 Thanks. > > Heiko > > _______________________________________________ > Linux-rockchip mailing list > Linux-rockchip at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-rockchip -- ?ark Yao ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v8 3/3] drm/rockchip: Add support for Rockchip Soc LVDS 2017-09-08 6:12 ` Mark yao @ 2017-09-08 7:05 ` Mark yao 0 siblings, 0 replies; 12+ messages in thread From: Mark yao @ 2017-09-08 7:05 UTC (permalink / raw) To: linux-arm-kernel On 2017?09?08? 14:12, Mark yao wrote: > On 2017?09?08? 13:04, Heiko Stuebner wrote: >> Am Freitag, 8. September 2017, 09:23:09 CEST schrieb Mark yao: >>> On 2017?09?07? 20:09, Heiko St?bner wrote: >>>> Hi Mark, >>>> >>>> Am Donnerstag, 7. September 2017, 18:16:29 CEST schrieb Mark yao: >>>>> Looks good for me, so: >>>>> Reviewed-by: Mark Yao <mark.yao@rock-chips.com> >>>>> >>>>> I'd like to apply these lvds patches tomorrow if there is no more doubts. >>>> Rob had some minor comments on v7 of the dt-binding, so you may want >>>> to give him a bit more time to Ack the hopefully updated binding. >>> Rob already gave a Reviewed-by on v7 dt-binding, but maybe it has some doubts for his Ack. >>> >>> Ok, let's wait some more time. >> ah, I looked at v6 and found the comments, not v7 and v7 is not in my >> archive because I likely accidentially deleted it. >> So Sandy just forgot to carry over the Ack/Review tag. So I guess there is >> no need to wait anymore and you just need to pick up Rob's tag from v7 then. > > Right, Sandy forgot to carry those tag on new patchset, I will carry those tag: > Tested-by on v5, Reviewed-by on v6 and v7 > > Thanks. > Pushed patches 1+3 to drm-misc-next. Best Regards Mark >> >> Heiko >> >> _______________________________________________ >> Linux-rockchip mailing list >> Linux-rockchip at lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-rockchip > > ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-09-11 20:13 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-09-02 11:28 [PATCH v8 0/3] Add support Rockchip Soc LVDS Sandy Huang 2017-09-02 11:28 ` [PATCH v8 1/3] dt-bindings: display: Add Document for " Sandy Huang 2017-09-11 20:13 ` Rob Herring 2017-09-02 11:28 ` [PATCH v8 2/3] ARM: dts: Add LVDS info for rk3288 Sandy Huang 2017-09-08 23:45 ` Heiko Stuebner 2017-09-02 11:28 ` [PATCH v8 3/3] drm/rockchip: Add support for Rockchip Soc LVDS Sandy Huang 2017-09-07 10:16 ` Mark yao 2017-09-07 12:09 ` Heiko Stübner 2017-09-08 1:23 ` Mark yao 2017-09-08 5:04 ` Heiko Stuebner 2017-09-08 6:12 ` Mark yao 2017-09-08 7:05 ` Mark yao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).