Add T114 video support
Subsystems (3)
v2 cover Add T114 video support
T114 is not that different from T30 and all T30 drivers will work on T114 as well with some adjustments.
Patches propose general improvements for existing Tegra DC and DSI drivers as well Tegra 114 video support (experimentl).
Commits pass buildman for tegra.
Svyatoslav Ryhel (9):
video: tegra20: dc: diverge DC per-SOC
video: tegra20: consolidate DC header
video: tegra20: dc: pass DC id to internal devices
video: tegra20: dc: add PLLD2 parent support
video: tegra20: dc: add reset support
video: tegra20: dc: add powergate
video: tegra20: add MIPI calibration driver
video: tegra20: dsi: add T114 support
video: tegra20: dsi: add reset support
arch/arm/dts/tegra114-u-boot.dtsi | 13 ++ arch/arm/dts/tegra114.dtsi | 4 +- arch/arm/dts/tegra30-u-boot.dtsi | 4 + arch/arm/dts/tegra30.dtsi | 2 +- arch/arm/include/asm/arch-tegra/dc.h | 8 - arch/arm/include/asm/arch-tegra114/pwm.h | 13 ++ arch/arm/include/asm/arch-tegra20/display.h | 28 --- arch/arm/include/asm/arch-tegra30/display.h | 28 --- drivers/video/tegra20/Makefile | 2 +- drivers/video/tegra20/tegra-dc.c | 166 ++++++++++++---- drivers/video/tegra20/tegra-dc.h | 44 ++++ drivers/video/tegra20/tegra-dsi.c | 94 ++++++++- .../video/tegra20/tegra-dsi.h | 24 ++- drivers/video/tegra20/tegra-mipi.c | 188 ++++++++++++++++++ drivers/video/tegra20/tegra-pwm-backlight.c | 3 +- 15 files changed, 509 insertions(+), 112 deletions(-) create mode 100644 arch/arm/include/asm/arch-tegra114/pwm.h delete mode 100644 arch/arm/include/asm/arch-tegra20/display.h delete mode 100644 arch/arm/include/asm/arch-tegra30/display.h create mode 100644 drivers/video/tegra20/tegra-dc.h rename arch/arm/include/asm/arch-tegra30/dsi.h => drivers/video/tegra20/tegra-dsi.h (90%) create mode 100644 drivers/video/tegra20/tegra-mipi.c
Signature · 1 line
2.40.1
PATCH v2 1/9 video: tegra20: dc: diverge DC per-SOC
Diverge DC driver setup to better fit each of supported generations of Tegra SOC.
--- arch/arm/dts/tegra114-u-boot.dtsi | 13 +++ arch/arm/dts/tegra114.dtsi | 4 +- arch/arm/dts/tegra30-u-boot.dtsi | 4 + arch/arm/dts/tegra30.dtsi | 2 +- arch/arm/include/asm/arch-tegra114/display.h | 28 +++++ arch/arm/include/asm/arch-tegra114/pwm.h | 13 +++ drivers/video/tegra20/tegra-dc.c | 107 +++++++++++++------ 7 files changed, 133 insertions(+), 38 deletions(-) create mode 100644 arch/arm/include/asm/arch-tegra114/display.h create mode 100644 arch/arm/include/asm/arch-tegra114/pwm.h
arch/arm/dts/tegra114-u-boot.dtsi +13 -0
@@ -1,3 +1,16 @@ #include <config.h> #include "tegra-u-boot.dtsi" + +/ { + host1x@50000000 { + bootph-all; + dc@54200000 { + bootph-all; + }; + + dc@54240000 { + bootph-all; + }; + }; +};
arch/arm/dts/tegra114.dtsi +2 -2
@@ -42,7 +42,7 @@ }; dc@54200000 { - compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc"; + compatible = "nvidia,tegra114-dc"; reg = <0x54200000 0x00040000>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; clocks = <&tegra_car TEGRA114_CLK_DISP1>,
@@ -61,7 +61,7 @@ }; dc@54240000 { - compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc"; + compatible = "nvidia,tegra114-dc"; reg = <0x54240000 0x00040000>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; clocks = <&tegra_car TEGRA114_CLK_DISP2>,
arch/arm/dts/tegra30-u-boot.dtsi +4 -0
@@ -8,5 +8,9 @@ dc@54200000 { bootph-all; }; + + dc@54240000 { + bootph-all; + }; }; };
arch/arm/dts/tegra30.dtsi +1 -1
@@ -158,7 +158,7 @@ }; dc@54200000 { - compatible = "nvidia,tegra30-dc", "nvidia,tegra20-dc"; + compatible = "nvidia,tegra30-dc"; reg = <0x54200000 0x00040000>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; clocks = <&tegra_car TEGRA30_CLK_DISP1>,
arch/arm/include/asm/arch-tegra114/display.h new file +28 -0
@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2010 +* NVIDIA Corporation <www.nvidia.com> +*/ + +#ifndef __ASM_ARCH_TEGRA_DISPLAY_H +#define __ASM_ARCH_TEGRA_DISPLAY_H + +#include <asm/arch-tegra/dc.h> + +/* This holds information about a window which can be displayed */ +struct disp_ctl_win { +enum win_color_depth_id fmt;/* Color depth/format */ +unsigned int bpp;/* Bits per pixel */ +phys_addr_t phys_addr;/* Physical address in memory */ +unsigned int x;/* Horizontal address offset (bytes) */ +unsigned int y;/* Veritical address offset (bytes) */ +unsigned int w;/* Width of source window */ +unsigned int h;/* Height of source window */ +unsigned int stride;/* Number of bytes per line */ +unsigned int out_x;/* Left edge of output window (col) */ +unsigned int out_y;/* Top edge of output window (row) */ +unsigned int out_w;/* Width of output window in pixels */ +unsigned int out_h;/* Height of output window in pixels */ +}; + +#endif /*__ASM_ARCH_TEGRA_DISPLAY_H*/
arch/arm/include/asm/arch-tegra114/pwm.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Tegra pulse width frequency modulator definitions +* +* Copyright (c) 2011 The Chromium OS Authors. +*/ + +#ifndef __ASM_ARCH_TEGRA114_PWM_H +#define __ASM_ARCH_TEGRA114_PWM_H + +#include <asm/arch-tegra/pwm.h> + +#endif /* __ASM_ARCH_TEGRA114_PWM_H */
drivers/video/tegra20/tegra-dc.c +72 -35
219 lines not on this page · raw message
Signature · 1 line
2.40.1
PATCH v2 2/9 video: tegra20: consolidate DC header
In reply to Svyatoslav RyhelConsolidate HD headers and place the result into video/tegra20 since it is used only by devices from this directory.
--- arch/arm/include/asm/arch-tegra/dc.h | 8 ---- arch/arm/include/asm/arch-tegra114/display.h | 28 ------------- arch/arm/include/asm/arch-tegra20/display.h | 28 ------------- arch/arm/include/asm/arch-tegra30/display.h | 28 ------------- drivers/video/tegra20/tegra-dc.c | 3 +- drivers/video/tegra20/tegra-dc.h | 41 ++++++++++++++++++++ drivers/video/tegra20/tegra-dsi.c | 2 +- drivers/video/tegra20/tegra-pwm-backlight.c | 3 +- 8 files changed, 46 insertions(+), 95 deletions(-) delete mode 100644 arch/arm/include/asm/arch-tegra114/display.h delete mode 100644 arch/arm/include/asm/arch-tegra20/display.h delete mode 100644 arch/arm/include/asm/arch-tegra30/display.h create mode 100644 drivers/video/tegra20/tegra-dc.h
arch/arm/include/asm/arch-tegra/dc.h +0 -8
@@ -569,12 +569,4 @@ enum {#define DC_N_WINDOWS 5#define DC_REG_SAVE_SPACE (DC_N_WINDOWS + 5) -#define TEGRA_DSI_A "dsi@54300000" -#define TEGRA_DSI_B "dsi@54400000" - -struct tegra_dc_plat { -struct udevice *dev;/* Display controller device */ -struct dc_ctlr *dc;/* Display controller regmap */ -}; -#endif /* __ASM_ARCH_TEGRA_DC_H */
arch/arm/include/asm/arch-tegra114/display.h deleted +0 -28
@@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* (C) Copyright 2010 -* NVIDIA Corporation <www.nvidia.com> -*/ - -#ifndef __ASM_ARCH_TEGRA_DISPLAY_H -#define __ASM_ARCH_TEGRA_DISPLAY_H - -#include <asm/arch-tegra/dc.h> - -/* This holds information about a window which can be displayed */ -struct disp_ctl_win { -enum win_color_depth_id fmt;/* Color depth/format */ -unsigned int bpp;/* Bits per pixel */ -phys_addr_t phys_addr;/* Physical address in memory */ -unsigned int x;/* Horizontal address offset (bytes) */ -unsigned int y;/* Veritical address offset (bytes) */ -unsigned int w;/* Width of source window */ -unsigned int h;/* Height of source window */ -unsigned int stride;/* Number of bytes per line */ -unsigned int out_x;/* Left edge of output window (col) */ -unsigned int out_y;/* Top edge of output window (row) */ -unsigned int out_w;/* Width of output window in pixels */ -unsigned int out_h;/* Height of output window in pixels */ -}; - -#endif /*__ASM_ARCH_TEGRA_DISPLAY_H*/
arch/arm/include/asm/arch-tegra20/display.h deleted +0 -28
@@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* (C) Copyright 2010 -* NVIDIA Corporation <www.nvidia.com> -*/ - -#ifndef __ASM_ARCH_TEGRA_DISPLAY_H -#define __ASM_ARCH_TEGRA_DISPLAY_H - -#include <asm/arch-tegra/dc.h> - -/* This holds information about a window which can be displayed */ -struct disp_ctl_win { -enum win_color_depth_id fmt;/* Color depth/format */ -unsigned bpp;/* Bits per pixel */ -phys_addr_t phys_addr;/* Physical address in memory */ -unsigned x;/* Horizontal address offset (bytes) */ -unsigned y;/* Veritical address offset (bytes) */ -unsigned w;/* Width of source window */ -unsigned h;/* Height of source window */ -unsigned stride;/* Number of bytes per line */ -unsigned out_x;/* Left edge of output window (col) */ -unsigned out_y;/* Top edge of output window (row) */ -unsigned out_w;/* Width of output window in pixels */ -unsigned out_h;/* Height of output window in pixels */ -}; - -#endif /*__ASM_ARCH_TEGRA_DISPLAY_H*/
arch/arm/include/asm/arch-tegra30/display.h deleted +0 -28
@@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* (C) Copyright 2010 -* NVIDIA Corporation <www.nvidia.com> -*/ - -#ifndef __ASM_ARCH_TEGRA_DISPLAY_H -#define __ASM_ARCH_TEGRA_DISPLAY_H - -#include <asm/arch-tegra/dc.h> - -/* This holds information about a window which can be displayed */ -struct disp_ctl_win { -enum win_color_depth_id fmt;/* Color depth/format */ -unsigned int bpp;/* Bits per pixel */ -phys_addr_t phys_addr;/* Physical address in memory */ -unsigned int x;/* Horizontal address offset (bytes) */ -unsigned int y;/* Veritical address offset (bytes) */ -unsigned int w;/* Width of source window */ -unsigned int h;/* Height of source window */ -unsigned int stride;/* Number of bytes per line */ -unsigned int out_x;/* Left edge of output window (col) */ -unsigned int out_y;/* Top edge of output window (row) */ -unsigned int out_w;/* Width of output window in pixels */ -unsigned int out_h;/* Height of output window in pixels */ -}; - -#endif /*__ASM_ARCH_TEGRA_DISPLAY_H*/
drivers/video/tegra20/tegra-dc.c +2 -1
@@ -21,7 +21,8 @@#include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> #include <asm/arch/pwm.h> -#include <asm/arch/display.h> + +#include "tegra-dc.h" DECLARE_GLOBAL_DATA_PTR ;
drivers/video/tegra20/tegra-dc.h new file +41 -0
41 lines not on this page · raw message
drivers/video/tegra20/tegra-dsi.c +1 -1
@@ -20,9 +20,9 @@#include <asm/gpio.h> #include <asm/io.h> #include <asm/arch/clock.h> -#include <asm/arch/display.h> #include <asm/arch-tegra30/dsi.h> +#include "tegra-dc.h" #include "mipi-phy.h" struct tegra_dsi_priv {
drivers/video/tegra20/tegra-pwm-backlight.c +2 -1
@@ -15,7 +15,8 @@#include <asm/io.h> #include <asm/gpio.h> -#include <asm/arch/display.h> + +#include "tegra-dc.h" #define TEGRA_DISPLAY_A_BASE 0x54200000#define TEGRA_DISPLAY_B_BASE 0x54240000
Signature · 1 line
2.40.1
PATCH v2 3/9 video: tegra20: dc: pass DC id to internal devices
In reply to Svyatoslav RyhelTegra SoC has 2 independent display controllers called DC_A and DC_B, they are handled differently by internal video devices like DSI and HDMI controllers so it is important for last to know which display controller is used to properly set up registers. To achieve this, a pipe field was added to pdata to pass display controller id to internal Tegra SoC devices.
--- drivers/video/tegra20/tegra-dc.c | 6 ++++++ drivers/video/tegra20/tegra-dc.h | 3 +++ 2 files changed, 9 insertions(+)
drivers/video/tegra20/tegra-dc.c +6 -0
@@ -45,6 +45,7 @@ struct tegra_lcd_priv {unsigned pixel_clock;/* Pixel clock in Hz */ int dc_clk[2 ];/* Contains clk and its parent */ bool rotation;/* 180 degree panel turn */ +bool pipe;/* DC controller: 0 for A, 1 for B */ };enum {
@@ -406,6 +407,9 @@ static int tegra_lcd_of_to_plat(struct udevice *dev) priv->rotation =dev_read_bool (dev,"nvidia,180-rotation" ); +if (!strcmp (dev->name,TEGRA_DC_B )) + priv->pipe =1 ; + rgb =fdt_subnode_offset (blob, node,"rgb" );if (rgb <0 ) { debug("%s: Cannot find rgb subnode for '%s' (ret=%d)\n",
@@ -431,12 +435,14 @@ static int tegra_lcd_of_to_plat(struct udevice *dev)return ret; } +/* Fill the platform data for internal devices */ if (!strcmp (priv->panel->name,TEGRA_DSI_A ) || !strcmp (priv->panel->name,TEGRA_DSI_B )) {struct tegra_dc_plat *dc_plat =dev_get_plat (priv->panel); dc_plat->dev = dev; dc_plat->dc = priv->dc; + dc_plat->pipe = priv->pipe; } ret =panel_get_display_timing (priv->panel, &priv->timing);
drivers/video/tegra20/tegra-dc.h +3 -0
@@ -14,12 +14,15 @@/* arch-tegra/dc exists only because T124 uses it */ #include <asm/arch-tegra/dc.h> +#define TEGRA_DC_A "dc@54200000" +#define TEGRA_DC_B "dc@54240000"#define TEGRA_DSI_A "dsi@54300000"#define TEGRA_DSI_B "dsi@54400000"struct tegra_dc_plat {struct udevice *dev;/* Display controller device */ struct dc_ctlr *dc;/* Display controller regmap */ +bool pipe;/* DC number: 0 for A, 1 for B */ };/* This holds information about a window which can be displayed */
Signature · 1 line
2.40.1
PATCH v2 4/9 video: tegra20: dc: add PLLD2 parent support
In reply to Svyatoslav RyhelT30+ SOC have second PLLD - PLLD2 which can be actively used by DC and act as main DISP1/2 clock parent.
--- drivers/video/tegra20/tegra-dc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/video/tegra20/tegra-dc.c +6 -0
@@ -304,6 +304,12 @@ static int tegra_display_probe(struct tegra_lcd_priv *priv,if (priv->dc_clk[1 ] ==CLOCK_ID_DISPLAY ) rate /=2 ; +#ifndef CONFIG_TEGRA20 +/* PLLD2 obeys same rules as PLLD but it is present only on T30+ */ +if (priv->dc_clk[1 ] ==CLOCK_ID_DISPLAY2 ) + rate /=2 ; +#endif +/* * HOST1X is init by default at 150MHz with PLLC as parent */
Signature · 1 line
2.40.1
PATCH v2 5/9 video: tegra20: dc: add reset support
In reply to Svyatoslav RyhelImplement reset use to discard any changes which could have been applied to DC before and can interfere with current configuration.
--- drivers/video/tegra20/tegra-dc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/video/tegra20/tegra-dc.c +17 -0
@@ -10,7 +10,9 @@#include <panel.h> #include <part.h> #include <pwm.h> +#include <reset.h> #include <video.h> +#include <linux/delay.h> #include <asm/cache.h> #include <asm/global_data.h> #include <asm/system.h>
@@ -342,6 +344,7 @@ static int tegra_lcd_probe(struct udevice *dev)struct video_uc_plat *plat =dev_get_uclass_plat (dev);struct video_priv *uc_priv =dev_get_uclass_priv (dev);struct tegra_lcd_priv *priv =dev_get_priv (dev); +struct reset_ctl reset_ctl;int ret;/* Initialize the Tegra display controller */
@@ -349,6 +352,20 @@ static int tegra_lcd_probe(struct udevice *dev)funcmux_select (PERIPH_ID_DISP1 ,FUNCMUX_DEFAULT );#endif + ret =reset_get_by_name (dev,"dc" , &reset_ctl); +if (ret) { +log_err ("reset_get_by_name() failed: %d\n" , ret); +return ret; + } + +clock_disable (priv->dc_clk[0 ]); + +/* Reset everything set before */ +reset_assert (&reset_ctl); +mdelay (4 ); +reset_deassert (&reset_ctl); +mdelay (4 ); +if (tegra_display_probe (priv, (void *)plat->base)) {debug ("%s: Failed to probe display driver\n" , __func__);return -1 ;
Signature · 1 line
2.40.1
PATCH v2 6/9 video: tegra20: dc: add powergate
In reply to Svyatoslav RyhelAdd powergate use on T114 to complete resetting of DC.
--- drivers/video/tegra20/tegra-dc.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/video/tegra20/tegra-dc.c +27 -0
@@ -22,6 +22,7 @@#include <asm/arch/clock.h> #include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> +#include <asm/arch/powergate.h> #include <asm/arch/pwm.h> #include "tegra-dc.h"
@@ -32,6 +33,7 @@ DECLARE_GLOBAL_DATA_PTR;struct tegra_dc_soc_info {bool has_timer;bool has_rgb; +bool has_pgate; };/* Information about the display controller */
@@ -360,6 +362,28 @@ static int tegra_lcd_probe(struct udevice *dev)clock_disable (priv->dc_clk[0 ]); +if (priv->soc->has_pgate) { +uint powergate; + +if (priv->pipe) + powergate =TEGRA_POWERGATE_DISB ; +else + powergate =TEGRA_POWERGATE_DIS ; + + ret =tegra_powergate_power_off (powergate); +if (ret <0 ) { +log_err ("failed to power off DISP gate: %d" , ret); +return ret; + } + + ret =tegra_powergate_sequence_power_up (powergate, + priv->dc_clk[0 ]); +if (ret <0 ) { +log_err ("failed to power up DISP gate: %d" , ret); +return ret; + } + } +/* Reset everything set before */ reset_assert (&reset_ctl);mdelay (4 );
@@ -510,16 +534,19 @@ static const struct video_ops tegra_lcd_ops = {static const struct tegra_dc_soc_info tegra20_dc_soc_info = { .has_timer = true, .has_rgb = true, + .has_pgate = false, };static const struct tegra_dc_soc_info tegra30_dc_soc_info = { .has_timer = false, .has_rgb = true, + .has_pgate = false, };static const struct tegra_dc_soc_info tegra114_dc_soc_info = { .has_timer = false, .has_rgb = false, + .has_pgate = true, };static const struct udevice_id tegra_lcd_ids[] = {
Signature · 1 line
2.40.1
PATCH v2 7/9 video: tegra20: add MIPI calibration driver
In reply to Svyatoslav RyhelDedicated MIPI calibration driver is used on T114 and newer. Before T114 MIPI calibration registers were part of VI and CSI.
--- drivers/video/tegra20/Makefile | 2 +- drivers/video/tegra20/tegra-mipi.c | 188 +++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+), 1 deletion(-) create mode 100644 drivers/video/tegra20/tegra-mipi.c
drivers/video/tegra20/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0+ obj-$(CONFIG_VIDEO_TEGRA20) += tegra-dc.o -obj-$(CONFIG_VIDEO_DSI_TEGRA30) += tegra-dsi.o mipi-phy.o +obj-$(CONFIG_VIDEO_DSI_TEGRA30) += tegra-dsi.o tegra-mipi.o mipi-phy.o obj-$(CONFIG_TEGRA_BACKLIGHT_PWM) += tegra-pwm-backlight.o
drivers/video/tegra20/tegra-mipi.c new file +188 -0
188 lines not on this page · raw message
Signature · 1 line
2.40.1
PATCH v2 8/9 video: tegra20: dsi: add T114 support
In reply to Svyatoslav RyhelExisting Tegra DSI driver mostly fits T114 apart MIPI calibration which on T114 has dedicated driver. To resolve this MIPI calibration logic was split for pre-T114 and T114+ devices.
--- drivers/video/tegra20/tegra-dsi.c | 78 ++++++++++++++++++- .../video/tegra20/tegra-dsi.h | 24 +++++- 2 files changed, 96 insertions(+), 6 deletions(-) rename arch/arm/include/asm/arch-tegra30/dsi.h => drivers/video/tegra20/tegra-dsi.h (90%)
drivers/video/tegra20/tegra-dsi.c +75 -3
@@ -20,17 +20,24 @@#include <asm/gpio.h> #include <asm/io.h> #include <asm/arch/clock.h> -#include <asm/arch-tegra30/dsi.h> #include "tegra-dc.h" +#include "tegra-dsi.h" #include "mipi-phy.h" +/* List of supported DSI bridges */ +enum { +DSI_V0 , +DSI_V1 , +}; +struct tegra_dsi_priv {struct mipi_dsi_host host;struct mipi_dsi_device device;struct mipi_dphy_timing dphy_timing;struct udevice *panel; +struct udevice *mipi;struct display_timing timing;struct dsi_ctlr *dsi;
@@ -41,6 +48,8 @@ struct tegra_dsi_priv {int dsi_clk;int video_fifo_depth;int host_fifo_depth; + +u32 version; };static void tegra_dc_enable_controller (struct udevice *dev)
@@ -501,6 +510,41 @@ static void tegra_dsi_pad_calibrate(struct dsi_pad_ctrl_reg *pad)writel (value,TEGRA_VI_BASE + (CSI_CIL_PAD_CONFIG <<2 )); } +static void tegra_dsi_mipi_calibrate (struct tegra_dsi_priv *priv) +{ +struct dsi_pad_ctrl_reg *pad = &priv->dsi->pad; +u32 value; +int ret; + + ret =misc_set_enabled (priv->mipi, true); +if (ret) +log_debug ("%s: failed to enable MIPI calibration: %d\n" , + __func__, ret); + +writel (0 , &pad->pad_ctrl); +writel (0 , &pad->pad_ctrl_1); +writel (0 , &pad->pad_ctrl_2); +writel (0 , &pad->pad_ctrl_3); +writel (0 , &pad->pad_ctrl_4); + +/* DSI pad enable */ + value =DSI_PAD_CONTROL_VS1_PULLDN (0 ) |DSI_PAD_CONTROL_VS1_PDIO (0 ); +writel (value, &pad->pad_ctrl); + + value =DSI_PAD_SLEW_UP (0x7 ) |DSI_PAD_SLEW_DN (0x7 ) | +DSI_PAD_LP_UP (0x1 ) |DSI_PAD_LP_DN (0x1 ) | +DSI_PAD_OUT_CLK (0x0 ); +writel (value, &pad->pad_ctrl_2); + + value =DSI_PAD_PREEMP_PD_CLK (0x3 ) |DSI_PAD_PREEMP_PU_CLK (0x3 ) | +DSI_PAD_PREEMP_PD (0x03 ) |DSI_PAD_PREEMP_PU (0x3 ); +writel (value, &pad->pad_ctrl_3); + + ret =misc_write (priv->mipi,0 ,NULL ,0 ); +if (ret) +log_debug ("%s: MIPI calibration failed %d\n" , __func__, ret); +} +static void tegra_dsi_set_timeout (struct dsi_timeout_reg *rtimeout,unsigned long bclk,unsigned int vrefresh)
@@ -664,10 +708,25 @@ static int tegra_dsi_encoder_enable(struct udevice *dev)u32 value;int ret; +/* If for some reasone DSI is enabled then it needs to +* be disabled in order for the panel initialization +* commands to be properly sent. +*/ + value =readl (&misc->dsi_pwr_ctrl); + +if (value &DSI_POWER_CONTROL_ENABLE ) { + value =readl (&misc->dsi_pwr_ctrl); + value &= ~DSI_POWER_CONTROL_ENABLE ; +writel (value, &misc->dsi_pwr_ctrl); + } +/* Disable interrupt */ writel (0 , &misc->int_enable); -tegra_dsi_pad_calibrate (&priv->dsi->pad); +if (priv->version) +tegra_dsi_mipi_calibrate (priv); +else +tegra_dsi_pad_calibrate (&priv->dsi->pad);tegra_dsi_get_muldiv (device->format, &mul, &div);
@@ -792,6 +851,8 @@ static int tegra_dsi_bridge_probe(struct udevice *dev)struct mipi_dsi_panel_plat *mipi_plat;int ret; + priv->version =dev_get_driver_data (dev); + priv->dsi = (struct dsi_ctlr *)dev_read_addr_ptr (dev);if (!priv->dsi) {printf ("%s: No display controller address\n" , __func__);
@@ -814,6 +875,16 @@ static int tegra_dsi_bridge_probe(struct udevice *dev)return log_ret (ret); } +if (priv->version) { + ret =uclass_get_device_by_phandle (UCLASS_MISC , dev, +"nvidia,mipi-calibrate" , + &priv->mipi); +if (ret) { +log_debug ("%s: cannot get MIPI: error %d\n" , __func__, ret); +return ret; + } + } +panel_get_display_timing (priv->panel, &priv->timing); mipi_plat =dev_get_plat (priv->panel);
@@ -845,7 +916,8 @@ static const struct panel_ops tegra_dsi_bridge_ops = { };static const struct udevice_id tegra_dsi_bridge_ids[] = { - { .compatible ="nvidia,tegra30-dsi" }, + { .compatible ="nvidia,tegra30-dsi" , .data =DSI_V0 }, + { .compatible ="nvidia,tegra114-dsi" , .data =DSI_V1 }, { } };
drivers/video/tegra20/tegra-dsi.h renamed from arch/arm/include/asm/arch-tegra30/dsi.h +21 -3
@@ -4,8 +4,8 @@* NVIDIA Corporation <www.nvidia.com> */ -#ifndef __ASM_ARCH_TEGRA_DSI_H -#define __ASM_ARCH_TEGRA_DSI_H +#ifndef _TEGRA_DSI_H +#define _TEGRA_DSI_H#ifndef __ASSEMBLY__#include <linux/bitops.h>
@@ -105,6 +105,10 @@ struct dsi_pad_ctrl_reg {uint pad_ctrl_cd;/* _PAD_CONTROL_CD_0 */ uint pad_cd_status;/* _PAD_CD_STATUS_0 */ uint dsi_vid_mode_control;/* _DSI_VID_MODE_CONTROL_0 */ +uint pad_ctrl_1;/* _PAD_CONTROL_1 */ +uint pad_ctrl_2;/* _PAD_CONTROL_2 */ +uint pad_ctrl_3;/* _PAD_CONTROL_3 */ +uint pad_ctrl_4;/* _PAD_CONTROL_4 */ };/* Display Serial Interface (DSI_) regs */
@@ -184,6 +188,20 @@ struct dsi_ctlr {#define DSI_PAD_CONTROL_PAD_LPUPADJ (x) (((x) & 0x3) << 14)#define DSI_PAD_CONTROL_PAD_LPDNADJ (x) (((x) & 0x3) << 12) +#define DSI_PAD_CONTROL_VS1_PDIO (x) (((x) & 0xf) << 0) +#define DSI_PAD_CONTROL_VS1_PULLDN (x) (((x) & 0xf) << 16) + +#define DSI_PAD_OUT_CLK (x) (((x) & 0x7) << 0) +#define DSI_PAD_LP_DN (x) (((x) & 0x7) << 4) +#define DSI_PAD_LP_UP (x) (((x) & 0x7) << 8) +#define DSI_PAD_SLEW_DN (x) (((x) & 0x7) << 12) +#define DSI_PAD_SLEW_UP (x) (((x) & 0x7) << 16) + +#define DSI_PAD_PREEMP_PD_CLK (x) (((x) & 0x3) << 12) +#define DSI_PAD_PREEMP_PU_CLK (x) (((x) & 0x3) << 8) +#define DSI_PAD_PREEMP_PD (x) (((x) & 0x3) << 4) +#define DSI_PAD_PREEMP_PU (x) (((x) & 0x3) << 0) +/* * pixel format as used in the DSI_CONTROL_FORMAT field */
@@ -214,4 +232,4 @@ enum tegra_dsi_format {#define PAD_DRIV_DN_REF (x) (((x) & 0x7) << 16)#define PAD_DRIV_UP_REF (x) (((x) & 0x7) << 8) -#endif /* __ASM_ARCH_TEGRA_DSI_H */ +#endif /* _TEGRA_DSI_H */
Signature · 1 line
2.40.1
PATCH v2 9/9 video: tegra20: dsi: add reset support
In reply to Svyatoslav RyhelImplement reset use to discard any changes which could have been applied to DSI before and can interfere with current configuration.
--- drivers/video/tegra20/tegra-dsi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/video/tegra20/tegra-dsi.c +14 -0
@@ -12,6 +12,7 @@#include <mipi_dsi.h> #include <backlight.h> #include <panel.h> +#include <reset.h> #include <linux/delay.h> #include <linux/err.h> #include <linux/time.h>
@@ -849,6 +850,7 @@ static int tegra_dsi_bridge_probe(struct udevice *dev)struct tegra_dsi_priv *priv =dev_get_priv (dev);struct mipi_dsi_device *device = &priv->device;struct mipi_dsi_panel_plat *mipi_plat; +struct reset_ctl reset_ctl;int ret; priv->version =dev_get_driver_data (dev);
@@ -862,6 +864,13 @@ static int tegra_dsi_bridge_probe(struct udevice *dev) priv->video_fifo_depth =480 ; priv->host_fifo_depth =64 ; + ret =reset_get_by_name (dev,"dsi" , &reset_ctl); +if (ret) { +log_debug ("%s: reset_get_by_name() failed: %d\n" , + __func__, ret); +return ret; + } + ret =uclass_get_device_by_phandle (UCLASS_REGULATOR , dev,"avdd-dsi-csi-supply" , &priv->avdd);if (ret)
@@ -900,12 +909,17 @@ static int tegra_dsi_bridge_probe(struct udevice *dev)tegra_dsi_get_format (device->format, &priv->format); +reset_assert (&reset_ctl); + ret =regulator_set_enable_if_allowed (priv->avdd, true);if (ret && ret != -ENOSYS )return ret;tegra_dsi_init_clocks (dev); +mdelay (2 ); +reset_deassert (&reset_ctl); +return 0 ; }
Signature · 1 line
2.40.1