video: omap: enable LCD clock domain through DM API
Subsystems (4)
PATCH 27/31 video: omap: enable LCD clock domain through DM API
The patch enables/disables the LCD domain clock when the device is probed/removed.
To get the LCD domain clock, the device tree had to be changed. In the Beaglebone device tree of the most recent Linux kernels, the LCD controller node is the child of a node that the documentation explains to be an interconnect module with one or more devices connected to it, which manages, among other things, even the clocks.
target-module at e000 { /* 0x4830e000, ap 72 4a.0 */
compatible = "ti,sysc-omap4", "ti,sysc";
reg = <0xe000 0x4>,
<0xe054 0x4>;
reg-names = "rev", "sysc";
ti,sysc-midle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>;
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>;
/* Domains (P, C): per_pwrdm, lcdc_clkdm */
clocks = <&lcdc_clkctrl AM3_LCDC_LCDC_CLKCTRL 0>;
clock-names = "fck";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0xe000 0x1000>;
lcdc: lcdc at 0 {
compatible = "ti,am33xx-tilcdc";
reg = <0x0 0x1000>;
interrupts = <36>;
status = "disabled";
};
};This shows that the domain clock reference is missing in the U-Boot device tree and that replicating the most recent kernels structure in U-Boot is now to be avoided. Since the LCD controller node is not the child of any interconnection node in the current device tree, I added the domain clock reference inside the LCD controller node. I think getting the domain clock from the device tree and using the driver model API is still an improvement. In the future, when possible, we can move the domain clock in the interconnection module created for the LCD controller node.
---
arch/arm/dts/am33xx.dtsi | 3 +++ arch/arm/mach-omap2/am33xx/clock_am33xx.c | 2 +- drivers/video/am335x-fb.c | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-)
arch/arm/dts/am33xx.dtsi +3 -0
@@ -946,6 +946,9 @@ reg = <0x4830e000 0x1000>; interrupts = <36>; ti,hwmods = "lcdc"; + clocks = <&l4_per_clkctrl AM3_LCDC_CLKCTRL 0>; + clock-names = "fck"; + status = "disabled"; };
arch/arm/mach-omap2/am33xx/clock_am33xx.c +1 -1
@@ -226,7 +226,7 @@ void enable_basic_clocks(void) &cmper->usb0clkctrl, &cmper->emiffwclkctrl, &cmper->emifclkctrl, -#if CONFIG_IS_ENABLED(AM335X_LCD) +#if CONFIG_IS_ENABLED(AM335X_LCD) && !CONFIG_IS_ENABLED(DM_VIDEO) &cmper->lcdclkctrl, &cmper->lcdcclkstctrl, #endif
drivers/video/am335x-fb.c +16 -0
@@ -12,6 +12,7 @@* - starts output DMA from gd->fb_base buffer */ #include <common.h> +#include <clk.h> #include <dm.h> #include <lcd.h> #include <log.h>
@@ -335,14 +336,17 @@ enum {struct am335x_fb_priv {struct am335x_lcdhw *regs; +struct clk clkdm; };static int am335x_fb_remove (struct udevice *dev) {struct video_uc_platdata *uc_plat =dev_get_uclass_platdata (dev); +struct am335x_fb_priv *priv =dev_get_priv (dev); uc_plat->base -=0x20 ; uc_plat->size +=0x20 ; +clk_release_all (&priv->clkdm,1 );return 0 ; }
@@ -416,6 +420,18 @@ static int am335x_fb_probe(struct udevice *dev)return -EINVAL ; } + err =clk_get_by_name (dev,"fck" , &priv->clkdm); +if (err) { +dev_err (dev,"%s: failed to get clock domain\n" , __func__); +return err; + } + + err =clk_enable (&priv->clkdm); +if (err) { +dev_err (dev,"%s: failed to enable clock domain\n" , __func__); +return err; + } +am335x_fb_set_pixel_clk_rate (regs, timing.pixelclock.typ);/* clock source for LCDC from dispPLL M2 */
Signature · 1 line
2.17.1
PATCH 28/31 video: omap: set LCD clock rate through DM API
The patch configures the display DPLL using the functions provided by the driver model API for the clock. The device tree contains everything needed to get the DPLL clock. The round rate function developed for calculating the DPLL multiplier and divisor and the platform routines for accessing the DPLL registers are removed from the LCD driver code because they are implemented inside the DPLL clock driver.
---
drivers/video/am335x-fb.c | 127 ++++++++++++++++++++++++++++++-------- 1 file changed, 101 insertions(+), 26 deletions(-)
drivers/video/am335x-fb.c +101 -26
@@ -113,6 +113,27 @@ struct am335x_lcdhw {unsigned int clkc_reset;/* 0x70 */ }; +DECLARE_GLOBAL_DATA_PTR ; + +#if !CONFIG_IS_ENABLED(DM_VIDEO) + +#if !defined(LCD_CNTL_BASE) +#error "hw-base address of LCD-Controller (LCD_CNTL_BASE) not defined!" +#endif + +/* Macro definitions */ +#define FBSIZE(x) (((x)->hactive * (x)->vactive * (x)->bpp) >> 3) + +#define LCDC_RASTER_TIMING_2_INVMASK(x) ((x) & GENMASK(25, 20)) + +static struct am335x_lcdhw *lcdhw = (void *)LCD_CNTL_BASE; + +int lcd_get_size(int *line_length) +{ + *line_length = (panel_info.vl_col * NBITS(panel_info.vl_bpix)) / 8; + return *line_length * panel_info.vl_row + 0x20; +} + struct dpll_data { unsigned long rounded_rate; u16 rounded_m;
@@ -120,8 +141,6 @@ struct dpll_data {u8 rounded_div; }; -DECLARE_GLOBAL_DATA_PTR ; -/** * am335x_dpll_round_rate() - Round a target rate for an OMAP DPLL *
@@ -200,25 +219,6 @@ static ulong am335x_fb_set_pixel_clk_rate(struct am335x_lcdhw *regs, ulong rate)return round_rate; } -#if !CONFIG_IS_ENABLED (DM_VIDEO ) - -#if !defined(LCD_CNTL_BASE ) -#error "hw-base address of LCD-Controller (LCD_CNTL_BASE) not defined!" -#endif - -/* Macro definitions */ -#define FBSIZE (x) (((x)->hactive * (x)->vactive * (x)->bpp) >> 3) - -#define LCDC_RASTER_TIMING_2_INVMASK (x) ((x) & GENMASK(25, 20)) - -static struct am335x_lcdhw *lcdhw = (void *)LCD_CNTL_BASE ; - -int lcd_get_size (int *line_length) -{ - *line_length = (panel_info.vl_col *NBITS (panel_info.vl_bpix)) /8 ; -return *line_length * panel_info.vl_row +0x20 ; -} -int am335xfb_init (struct am335x_lcdpanel *panel) {u32 raster_ctrl =0 ;
@@ -337,8 +337,49 @@ enum {struct am335x_fb_priv {struct am335x_lcdhw *regs;struct clk clkdm; +struct clk gclk; +struct clk dpll_m2_clk; }; +static ulong tilcdc_set_pixel_clk_rate (struct udevice *dev,ulong rate) +{ +struct am335x_fb_priv *priv =dev_get_priv (dev); +struct am335x_lcdhw *regs = priv->regs; +ulong mult_rate, mult_round_rate, best_err, err; +u32 v; +int div, i; + + best_err = rate; + div =0 ; +for (i =2 ; i <=255 ; i++) { + mult_rate = rate * i; + mult_round_rate =clk_round_rate (&priv->gclk, mult_rate); +if (IS_ERR_VALUE (mult_round_rate)) +return mult_round_rate; + + err = mult_rate - mult_round_rate; +if (err < best_err) { + best_err = err; + div = i; +if (err ==0 ) +break ; + } + } + +if (div ==0 ) { +dev_err (dev,"failed to find a divisor\n" ); +return -EFAULT ; + } + + mult_rate =clk_set_rate (&priv->gclk, rate * div); + v =readl (®s->ctrl) & ~LCDC_CTRL_CLK_DIVISOR_MASK ; + v |=LCDC_CTRL_CLK_DIVISOR (div); +writel (v, ®s->ctrl); + rate = mult_rate / div; +dev_dbg (dev,"rate=%ld, div=%d, err=%ld\n" , rate, div, err); +return rate; +} +static int am335x_fb_remove (struct udevice *dev) {struct video_uc_platdata *uc_plat =dev_get_uclass_platdata (dev);
@@ -346,6 +387,8 @@ static int am335x_fb_remove(struct udevice *dev) uc_plat->base -=0x20 ; uc_plat->size +=0x20 ; +clk_release_all (&priv->gclk,1 ); +clk_release_all (&priv->dpll_m2_clk,1 );clk_release_all (&priv->clkdm,1 );return 0 ; }
@@ -356,10 +399,10 @@ static int am335x_fb_probe(struct udevice *dev)struct video_priv *uc_priv =dev_get_uclass_priv (dev);struct am335x_fb_priv *priv =dev_get_priv (dev);struct am335x_lcdhw *regs = priv->regs; -struct udevice *panel; +struct udevice *panel, *clk_dev;struct tilcdc_panel_info info;struct display_timing timing; -struct cm_dpll *const cmdpll = (struct cm_dpll *)CM_DPLL ; +ulong rate;u32 reg;int err;
@@ -432,10 +475,42 @@ static int am335x_fb_probe(struct udevice *dev)return err; } -am335x_fb_set_pixel_clk_rate (regs, timing.pixelclock.typ); + err =uclass_get_device_by_name (UCLASS_CLK ,"lcd_gclk at 534" , &clk_dev); +if (err) { +dev_err (dev,"failed to get lcd_gclk device\n" ); +return err; + } + + err =clk_request (clk_dev, &priv->gclk); +if (err) { +dev_err (dev,"failed to get %s clock\n" , clk_dev->name); +return err; + } -/* clock source for LCDC from dispPLL M2 */ -writel (0 , &cmdpll->clklcdcpixelclk); + rate =tilcdc_set_pixel_clk_rate (dev, timing.pixelclock.typ); +if (IS_ERR_VALUE (rate)) { +dev_err (dev,"failed to set pixel clock rate\n" ); +return rate; + } + + err =uclass_get_device_by_name (UCLASS_CLK ,"dpll_disp_m2_ck at 4a4" , &clk_dev); +if (err) { +dev_err (dev,"failed to get dpll_disp_m2 clock device\n" ); +return err; + } + + err =clk_request (clk_dev, &priv->dpll_m2_clk); +if (err) { +dev_err (dev,"failed to get %s clock\n" , clk_dev->name); +return err; + } + + err =clk_set_parent (&priv->gclk, &priv->dpll_m2_clk); +if (err) { +dev_err (dev,"failed to set %s clock as %s's parent\n" , + priv->dpll_m2_clk.dev->name, priv->gclk.dev->name); +return err; + }/* palette default entry */ memset ((void *)uc_plat->base,0 ,0x20 );
Signature · 1 line
2.17.1
PATCH 29/31 video: omap: split the legacy code from the DM code
In reply to Dario BinacchiThe schedule for deprecating the features of the pre-driver-model puts 2019.17 as the deadline for the video subsystem. Furthermore, the latest patches applied to the am335x-fb.c module have decreased the amount of code shared with the pre-driver-model implementation. Splitting the two implementations into two modules improves the readability of the code and will make it easier to drop the pre-driver-model code.
I have not created a header file with the data structures and the constants for accessing the LCD controller registers, but I preferred to keep them inside the two c modules. This is a code replication until the pre-driver-model version is dropped.
---
drivers/video/Makefile | 5 +- drivers/video/am335x-fb.c | 350 ---------------------------- drivers/video/am335x-fb.h | 35 --- drivers/video/tilcdc-panel.c | 2 +- drivers/video/tilcdc-panel.h | 2 +- drivers/video/tilcdc.c | 438 +++++++++++++++++++++++++++++++++++ drivers/video/tilcdc.h | 38 +++ 7 files changed, 481 insertions(+), 389 deletions(-) create mode 100644 drivers/video/tilcdc.c create mode 100644 drivers/video/tilcdc.h
drivers/video/Makefile +3 -2
@@ -16,7 +16,9 @@ obj-$(CONFIG_DM_VIDEO) += video-uclass.o vidconsole-uclass.o obj-$(CONFIG_DM_VIDEO) += video_bmp.o obj-$(CONFIG_PANEL) += panel-uclass.o obj-$(CONFIG_SIMPLE_PANEL) += simple_panel.o -obj-$(CONFIG_AM335X_LCD) += tilcdc-panel.o +obj-$(CONFIG_AM335X_LCD) += tilcdc.o tilcdc-panel.o +else +obj-$(CONFIG_AM335X_LCD) += am335x-fb.o endif obj-${CONFIG_EXYNOS_FB} += exynos/
@@ -24,7 +26,6 @@ obj-${CONFIG_VIDEO_ROCKCHIP} += rockchip/ obj-${CONFIG_VIDEO_STM32} += stm32/ obj-${CONFIG_VIDEO_TEGRA124} += tegra124/ -obj-$(CONFIG_AM335X_LCD) += am335x-fb.o obj-$(CONFIG_ATI_RADEON_FB) += ati_radeon_fb.o videomodes.o obj-$(CONFIG_ATMEL_HLCD) += atmel_hlcdfb.o obj-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o
drivers/video/am335x-fb.c +0 -350
374 lines not on this page · raw message
drivers/video/am335x-fb.h +0 -35
@@ -7,8 +7,6 @@#ifndef AM335X_FB_H #define AM335X_FB_H -#if !CONFIG_IS_ENABLED (DM_VIDEO ) -#define HSVS_CONTROL BIT(25)/* * 0 = lcd_lp and lcd_fp are driven on * opposite edges of pixel clock than
@@ -70,37 +68,4 @@ struct am335x_lcdpanel {int am335xfb_init (struct am335x_lcdpanel *panel); -#else /* CONFIG_DM_VIDEO */ - -/** -* tilcdc_panel_info: Panel parameters -* -* @ac_bias: AC Bias Pin Frequency -* @ac_bias_intrpt: AC Bias Pin Transitions per Interrupt -* @dma_burst_sz: DMA burst size -* @bpp: Bits per pixel -* @fdd: FIFO DMA Request Delay -* @tft_alt_mode: TFT Alternative Signal Mapping (Only for active) -* @invert_pxl_clk: Invert pixel clock -* @sync_edge: Horizontal and Vertical Sync Edge: 0=rising 1=falling -* @sync_ctrl: Horizontal and Vertical Sync: Control: 0=ignore -* @raster_order: Raster Data Order Select: 1=Most-to-least 0=Least-to-most -* @fifo_th: DMA FIFO threshold -*/ -struct tilcdc_panel_info { -u32 ac_bias; -u32 ac_bias_intrpt; -u32 dma_burst_sz; -u32 bpp; -u32 fdd; -bool tft_alt_mode; -bool invert_pxl_clk; -u32 sync_edge; -u32 sync_ctrl; -u32 raster_order; -u32 fifo_th; -}; - -#endif /* CONFIG_DM_VIDEO */ -#endif /* AM335X_FB_H */
drivers/video/tilcdc-panel.c +1 -1
@@ -14,7 +14,7 @@#include <panel.h> #include <asm/gpio.h> #include <linux/err.h> -#include "am335x-fb.h" +#include "tilcdc.h" struct tilcdc_panel_priv {struct tilcdc_panel_info info;
drivers/video/tilcdc-panel.h +1 -1
@@ -6,7 +6,7 @@#ifndef _TILCDC_PANEL_H#define _TILCDC_PANEL_H -#include "am335x-fb.h" +#include "tilcdc.h" int tilcdc_panel_get_display_info (struct udevice *dev,struct tilcdc_panel_info *info);
drivers/video/tilcdc.c new file +438 -0
438 lines not on this page · raw message
drivers/video/tilcdc.h new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) 2020 Dario Binacchi <[email protected]> +*/ + +#ifndef _TILCDC_H +#define _TILCDC_H + +/** +* tilcdc_panel_info: Panel parameters +* +* @ac_bias: AC Bias Pin Frequency +* @ac_bias_intrpt: AC Bias Pin Transitions per Interrupt +* @dma_burst_sz: DMA burst size +* @bpp: Bits per pixel +* @fdd: FIFO DMA Request Delay +* @tft_alt_mode: TFT Alternative Signal Mapping (Only for active) +* @invert_pxl_clk: Invert pixel clock +* @sync_edge: Horizontal and Vertical Sync Edge: 0=rising 1=falling +* @sync_ctrl: Horizontal and Vertical Sync: Control: 0=ignore +* @raster_order: Raster Data Order Select: 1=Most-to-least 0=Least-to-most +* @fifo_th: DMA FIFO threshold +*/ +struct tilcdc_panel_info { +u32 ac_bias; +u32 ac_bias_intrpt; +u32 dma_burst_sz; +u32 bpp; +u32 fdd; +bool tft_alt_mode; +bool invert_pxl_clk; +u32 sync_edge; +u32 sync_ctrl; +u32 raster_order; +u32 fifo_th; +}; + +#endif /* _TILCDC_H */
Signature · 1 line
2.17.1
PATCH 30/31 video: omap: move drivers to 'ti' directory
In reply to Dario BinacchiAdd drivers/video/ti/ folder and move all TI's code in this folder for better maintenance.
---
drivers/video/Kconfig | 5 +----
drivers/video/Makefile | 4 +---
drivers/video/ti/Kconfig | 8 ++++++++
drivers/video/ti/Makefile | 10 ++++++++++
drivers/video/{ => ti}/am335x-fb.c | 0
drivers/video/{ => ti}/am335x-fb.h | 0
drivers/video/{ => ti}/tilcdc-panel.c | 0
drivers/video/{ => ti}/tilcdc-panel.h | 0
drivers/video/{ => ti}/tilcdc.c | 0
drivers/video/{ => ti}/tilcdc.h | 0
10 files changed, 20 insertions(+), 7 deletions(-)
create mode 100644 drivers/video/ti/Kconfig
create mode 100644 drivers/video/ti/Makefile
rename drivers/video/{ => ti}/am335x-fb.c (100%)
rename drivers/video/{ => ti}/am335x-fb.h (100%)
rename drivers/video/{ => ti}/tilcdc-panel.c (100%)
rename drivers/video/{ => ti}/tilcdc-panel.h (100%)
rename drivers/video/{ => ti}/tilcdc.c (100%)
rename drivers/video/{ => ti}/tilcdc.h (100%)drivers/video/Kconfig +1 -4
@@ -546,10 +546,7 @@ config ATMEL_HLCD help HLCDC supports video output to an attached LCD panel. -config AM335X_LCD - bool "Enable AM335x video support" - help - Supports video output to an attached LCD panel. +source "drivers/video/ti/Kconfig" config LOGICORE_DP_TX bool "Enable Logicore DP TX driver"
drivers/video/Makefile +1 -3
@@ -16,15 +16,13 @@ obj-$(CONFIG_DM_VIDEO) += video-uclass.o vidconsole-uclass.o obj-$(CONFIG_DM_VIDEO) += video_bmp.o obj-$(CONFIG_PANEL) += panel-uclass.o obj-$(CONFIG_SIMPLE_PANEL) += simple_panel.o -obj-$(CONFIG_AM335X_LCD) += tilcdc.o tilcdc-panel.o -else -obj-$(CONFIG_AM335X_LCD) += am335x-fb.o endif obj-${CONFIG_EXYNOS_FB} += exynos/ obj-${CONFIG_VIDEO_ROCKCHIP} += rockchip/ obj-${CONFIG_VIDEO_STM32} += stm32/ obj-${CONFIG_VIDEO_TEGRA124} += tegra124/ +obj-${CONFIG_AM335X_LCD} += ti/ obj-$(CONFIG_ATI_RADEON_FB) += ati_radeon_fb.o videomodes.o obj-$(CONFIG_ATMEL_HLCD) += atmel_hlcdfb.o
drivers/video/ti/Kconfig new file +8 -0
@@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2020 Dario Binacchi <[email protected]> +# +config AM335X_LCD + bool "Enable AM335x video support" + help + Supports video output to an attached LCD panel.
drivers/video/ti/Makefile new file +10 -0
@@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2020 Dario Binacchi <[email protected]> +# + +ifdef CONFIG_DM +obj-$(CONFIG_AM335X_LCD) += tilcdc.o tilcdc-panel.o +else +obj-$(CONFIG_AM335X_LCD) += am335x-fb.o +endif
drivers/video/ti/am335x-fb.c renamed from drivers/video/am335x-fb.c +0 -0
drivers/video/ti/am335x-fb.h renamed from drivers/video/am335x-fb.h +0 -0
drivers/video/ti/tilcdc-panel.c renamed from drivers/video/tilcdc-panel.c +0 -0
drivers/video/ti/tilcdc-panel.h renamed from drivers/video/tilcdc-panel.h +0 -0
drivers/video/ti/tilcdc.c renamed from drivers/video/tilcdc.c +0 -0
drivers/video/ti/tilcdc.h renamed from drivers/video/tilcdc.h +0 -0
Signature · 1 line
2.17.1
PATCH 31/31 board: ti: am335x-ice: get CDCE913 clock device
In reply to Dario BinacchiWith support for other clock drivers, the potentially supported CDCE913 device can no longer be probed without specifying its DT node name.
---
board/ti/am335x/board.c | 2 +- board/ti/am43xx/board.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
board/ti/am335x/board.c +1 -1
@@ -879,7 +879,7 @@ int board_late_init(void) }/* Just probe the potentially supported cdce913 device */ -uclass_get_device (UCLASS_CLK ,0 , &dev); +uclass_get_device_by_name (UCLASS_CLK ,"cdce913 at 65" , &dev);return 0 ; }
board/ti/am43xx/board.c +1 -1
@@ -744,7 +744,7 @@ int board_late_init(void)#endif /* Just probe the potentially supported cdce913 device */ -uclass_get_device (UCLASS_CLK ,0 , &dev); +uclass_get_device_by_name (UCLASS_CLK ,"cdce913 at 65" , &dev);return 0 ; }
Signature · 1 line
2.17.1