clk: ti: omap4: add clock manager driver
Subsystems (9)
PATCH v4 14/27 clk: ti: omap4: add clock manager driver
This minimal driver is only used to bind child devices.
For DT binding details see Linux doc:
- Documentation/devicetree/bindings/arm/omap/prcm.txt
---
(no changes since v3)
Changes in v3:
- doc/device-tree-bindings/arm/omap,prcm.txt.
- Add to commit message the references to linux kernel dt binding documentation.
drivers/clk/ti/Makefile | 2 +- drivers/clk/ti/omap4-cm.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/ti/omap4-cm.c
drivers/clk/ti/Makefile +1 -1
@@ -3,7 +3,7 @@ # Copyright (C) 2020 Dario Binacchi <[email protected]> # -obj-$(CONFIG_ARCH_OMAP2PLUS) += clk.o +obj-$(CONFIG_ARCH_OMAP2PLUS) += clk.o omap4-cm.o obj-$(CONFIG_CLK_TI_AM3_DPLL) += clk-am3-dpll.o clk-am3-dpll-x2.o obj-$(CONFIG_CLK_TI_CTRL) += clk-ctrl.o obj-$(CONFIG_CLK_TI_DIVIDER) += clk-divider.o
drivers/clk/ti/omap4-cm.c new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* OMAP4 clock manager (cm) +* +* Copyright (C) 2020 Dario Binacchi <[email protected]> +*/ + +#include <common.h> +#include <dm.h> +#include <dm/lists.h> + +static const struct udevice_id ti_omap4_cm_ids[] = { + {.compatible ="ti,omap4-cm" }, + {} +}; + +U_BOOT_DRIVER (ti_omap4_cm) = { + .name ="ti_omap4_cm" , + .id =UCLASS_SIMPLE_BUS , + .of_match = ti_omap4_cm_ids, + .bind = dm_scan_fdt_dev, +};
Signature · 1 line
2.17.1
PATCH v4 15/27 clk: ti: am335x: add clock manager driver
The implementation of this driver was needed to bind the sub-nodes of the 'clocks' node. In fact, the lack of the compatible property in the 'clocks' node does not allow the generic 'simple-bus' driver to bind the 'clocks' node and in turn its sub-nodes.
The 'prcm at 200000' node is therefore the node closest to the 'clocks' node whose driver can bind all the 'clocks' sub-nodes. In this way, the address translation functions are able to walk along the device tree towards the upper nodes until the address composition is completed.
prcm: prcm at 200000 {
compatible = "ti,am3-prcm", "simple-bus";
reg = <0x200000 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0x200000 0x4000>;
prcm_clocks: clocks {
#address-cells = <1>;
#size-cells = <0>;
};
prcm_clockdomains: clockdomains {
};
};&prcm_clocks {
...
dpll_core_ck: dpll_core_ck at 490 {
#clock-cells = <0>;
compatible = "ti,am3-dpll-core-clock";
clocks = <&sys_clkin_ck>, <&sys_clkin_ck>;
reg = <0x0490>, <0x045c>, <0x0468>;
};
...
};For DT binding details see Linux doc:
- Documentation/devicetree/bindings/arm/omap/prcm.txt
---
Changes in v4:
- Include device_compat.h header for dev_xxx macros.
Changes in v3:
- Add to commit message the references to linux kernel dt binding documentation.
Changes in v2:
- Remove the 'ti_am3_prcm_clocks' driver. Handle 'prcm_clocks' node in the 'ti_am3_prcm' driver.
- Update the commit message.
drivers/clk/ti/Makefile | 8 ++++- drivers/clk/ti/am3-prcm.c | 66 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/ti/am3-prcm.c
drivers/clk/ti/Makefile +7 -1
@@ -3,7 +3,13 @@ # Copyright (C) 2020 Dario Binacchi <[email protected]> # -obj-$(CONFIG_ARCH_OMAP2PLUS) += clk.o omap4-cm.o +ifeq ($(CONFIG_ARCH_OMAP2PLUS), y) + +obj-y += clk.o omap4-cm.o +obj-$(CONFIG_AM33XX) += am3-prcm.o + +endif # CONFIG_ARCH_OMAP2PLUS + obj-$(CONFIG_CLK_TI_AM3_DPLL) += clk-am3-dpll.o clk-am3-dpll-x2.o obj-$(CONFIG_CLK_TI_CTRL) += clk-ctrl.o obj-$(CONFIG_CLK_TI_DIVIDER) += clk-divider.o
drivers/clk/ti/am3-prcm.c new file +66 -0
66 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v4 16/27 fdt: translate address if #size-cells = <0>
In reply to Dario BinacchiThe __of_translate_address routine translates an address from the device tree into a CPU physical address. A note in the description of the routine explains that the crossing of any level with #size-cells = <0> is to be considered an error not by specification but since inherited from IBM. This does not happen for Texas Instruments, or at least for the beaglebone device tree. Without this patch, in fact, the translation into physical addresses of the registers contained in the am33xx-clocks.dtsi nodes would not be possible. They all have a parent with #size-cells = <0>.
The CONFIG_OF_TRANSLATE_ZERO_SIZE_CELLS symbol makes translation possible even in the case of crossing levels with #size-cells = <0>.
The patch acts conservatively on address translation, except for removing a check within the of_translate_one function in the drivers/core/of_addr.c file:
+
ranges = of_get_property(parent, rprop, &rlen);
- if (ranges == NULL && !of_empty_ranges_quirk(parent)) {
- debug("no ranges; cannot translate\n");
- return 1;
- }
if (ranges == NULL || rlen == 0) {
offset = of_read_number(addr, na);
memset(addr, 0, pna * 4);
debug("empty ranges; 1:1 translation\n");There are two reasons:
1 The function of_empty_ranges_quirk always returns false, invalidating
the following if statement in case of null ranges. Therefore one of the two checks is useless.
2 The implementation of the of_translate_one function found in the
common/fdt_support.c file has removed this check while keeping the one about the 1:1 translation.
The patch adds a test and modifies a check for the correctness of an address in the case of enabling translation also for zero size cells. The added test checks translations of addresses generated by nodes of a device tree similar to those you can find in the files am33xx.dtsi and am33xx-clocks.dtsi for which the patch was created.
The patch was also tested on a beaglebone black board. The addresses generated for the registers of the loaded drivers are those specified by the AM335x reference manual.
---
Changes in v4:
- Add Sphinx documentation for dm_flags.
- Convert GD_DM_FLG_* to enum.
- Include device_compat.h header in test/dm/test-fdt.c for dev_xxx macros.
Changes in v3:
- Comment dm_flags field in the global_data structure.
Changes in v2:
- Fix a missing line in the commit message.
- Add dm_flags to global_data structure and GD_DM_FLG_SIZE_CELLS_0 macro to test without recompiling.
- Update the OF_CHECK_COUNTS macro in order to have just one #define by bringing the GD_DM_FLG_SIZE_CELLS_0 into the expression.
- Lower-case the 0xC019 hex number.
arch/sandbox/dts/test.dts | 21 ++++++++++ common/fdt_support.c | 6 ++- drivers/core/Kconfig | 12 ++++++ drivers/core/fdtaddr.c | 2 +- drivers/core/of_addr.c | 14 ++----- drivers/core/ofnode.c | 7 +++- drivers/core/root.c | 3 ++ include/asm-generic/global_data.h | 18 ++++++++ test/dm/test-fdt.c | 69 ++++++++++++++++++++++++++++++- 9 files changed, 136 insertions(+), 16 deletions(-)
arch/sandbox/dts/test.dts +21 -0
@@ -40,6 +40,7 @@ fdt-dummy1 = "/translation-test at 8000/dev at 1,100"; fdt-dummy2 = "/translation-test at 8000/dev at 2,200"; fdt-dummy3 = "/translation-test at 8000/noxlatebus at 3,300/dev at 42"; + fdt-dummy4 = "/translation-test at 8000/xlatebus at 4,400/devs/dev at 19"; usb0 = &usb_0; usb1 = &usb_1; usb2 = &usb_2;
@@ -1028,6 +1029,7 @@ 1 0x100 0x9000 0x1000 2 0x200 0xA000 0x1000 3 0x300 0xB000 0x1000 + 4 0x400 0xC000 0x1000 >; dma-ranges = <0 0x000 0x10000000 0x1000
@@ -1064,6 +1066,25 @@ reg = <0x42>; }; }; + + xlatebus at 4,400 { + compatible = "sandbox,zero-size-cells-bus"; + reg = <4 0x400 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 4 0x400 0x1000>; + + devs { + #address-cells = <1>; + #size-cells = <0>; + + dev at 19 { + compatible = "denx,u-boot-fdt-dummy"; + reg = <0x19>; + }; + }; + }; + }; osd {
common/fdt_support.c +4 -2
@@ -20,6 +20,8 @@#include <exports.h> #include <fdtdec.h> +DECLARE_GLOBAL_DATA_PTR ; +/** * fdt_getprop_u32_default_node - Return a node's property or a default *
@@ -1001,8 +1003,8 @@ void fdt_del_node_and_alias(void *blob, const char *alias)/* Max address size we deal with */ #define OF_MAX_ADDR_CELLS 4#define OF_BAD_ADDR FDT_ADDR_T_NONE -#define OF_CHECK_COUNTS (na, ns) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS && \ - (ns) > 0) +#define OF_CHECK_COUNTS (na, ns) (((na) > 0 && (na) <= OF_MAX_ADDR_CELLS) && \ + ((ns) > 0 || (gd->dm_flags & GD_DM_FLG_SIZE_CELLS_0)))/* Debug utility */ #ifdef DEBUG
drivers/core/Kconfig +12 -0
@@ -217,6 +217,18 @@ config OF_TRANSLATE used for the address translation. This function is faster and smaller in size than fdt_translate_address(). +config OF_TRANSLATE_ZERO_SIZE_CELLS + bool "Enable translation for zero size cells" + depends on OF_TRANSLATE + default n + help + The routine used to translate an FDT address into a physical CPU + address was developed by IBM. It considers that crossing any level + with #size-cells = <0> makes translation impossible, even if it is + not the way it was specified. + Enabling this option makes translation possible even in the case + of crossing levels with #size-cells = <0>. + config SPL_OF_TRANSLATE bool "Translate addresses using fdt_translate_address in SPL" depends on SPL_DM && SPL_OF_CONTROL
drivers/core/fdtaddr.c +1 -1
@@ -49,7 +49,7 @@ fdt_addr_t devfdt_get_addr_index(const struct udevice *dev, int index) reg += index * (na + ns); -if (ns) { +if (ns || (gd->dm_flags &GD_DM_FLG_SIZE_CELLS_0 )) {/* * Use the full-fledged translate function for complex * bus setups.
drivers/core/of_addr.c +4 -10
@@ -18,7 +18,9 @@/* Max address size we deal with */ #define OF_MAX_ADDR_CELLS 4#define OF_CHECK_ADDR_COUNT (na) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS) -#define OF_CHECK_COUNTS (na, ns) (OF_CHECK_ADDR_COUNT(na) && (ns) > 0) +#define OF_CHECK_COUNTS (na, ns) (OF_CHECK_ADDR_COUNT(na) && \ + ((ns) > 0 || \ + (gd->dm_flags & GD_DM_FLG_SIZE_CELLS_0)))static struct of_bus *of_match_bus (struct device_node *np);
@@ -162,11 +164,6 @@ const __be32 *of_get_address(const struct device_node *dev, int index, }EXPORT_SYMBOL (of_get_address); -static int of_empty_ranges_quirk (const struct device_node *np) -{ -return false; -} - static int of_translate_one(const struct device_node *parent, struct of_bus *bus, struct of_bus *pbus, __be32 *addr, int na, int ns, int pna,
@@ -193,11 +190,8 @@ static int of_translate_one(const struct device_node *parent,* As far as we know, this damage only exists on Apple machines, so * This code is only enabled on powerpc. --gcl */ + ranges =of_get_property (parent, rprop, &rlen); -if (ranges ==NULL && !of_empty_ranges_quirk (parent)) { -debug ("no ranges; cannot translate\n" ); -return 1 ; - }if (ranges ==NULL || rlen ==0 ) { offset =of_read_number (addr, na);memset (addr,0 , pna *4 );
drivers/core/ofnode.c +5 -2
@@ -304,7 +304,8 @@ fdt_addr_t ofnode_get_addr_size_index(ofnode node, int index, fdt_size_t *size) ns =of_n_size_cells (ofnode_to_np (node)); -if (IS_ENABLED (CONFIG_OF_TRANSLATE ) && ns >0 ) { +if (IS_ENABLED (CONFIG_OF_TRANSLATE ) && + (ns >0 || (gd->dm_flags &GD_DM_FLG_SIZE_CELLS_0 ))) {return of_translate_address (ofnode_to_np (node), prop_val); }else { na =of_n_addr_cells (ofnode_to_np (node));
@@ -656,8 +657,10 @@ fdt_addr_t ofnode_get_addr_size(ofnode node, const char *property, ns =of_n_size_cells (np); *sizep =of_read_number (prop + na, ns); -if (CONFIG_IS_ENABLED (OF_TRANSLATE ) && ns >0 ) +if (CONFIG_IS_ENABLED (OF_TRANSLATE ) && + (ns >0 || (gd->dm_flags &GD_DM_FLG_SIZE_CELLS_0 ))) {return of_translate_address (np, prop); + }else return of_read_number (prop, na); }else {
drivers/core/root.c +3 -0
@@ -135,6 +135,9 @@ int dm_init(bool of_live) {int ret; +if (IS_ENABLED (CONFIG_OF_TRANSLATE_ZERO_SIZE_CELLS )) + gd->dm_flags |=GD_DM_FLG_SIZE_CELLS_0 ; +if (gd->dm_root) {dm_warn ("Virtual root driver already exists!\n" );return -EINVAL ;
include/asm-generic/global_data.h +18 -0
@@ -180,6 +180,12 @@ struct global_data {struct global_data *new_gd;#ifdef CONFIG_DM +/** +* @dm_flags: additional flags for Driver Model +* +* See &enum gd_dm_flags +*/ +unsigned long dm_flags;/** * @dm_root: root instance for Driver Model */
@@ -491,6 +497,18 @@ enum gd_flags { GD_FLG_SMP_READY = 0x40000, }; +/** +* enum gd_dm_flags - global data flags for Driver Model +* +* See field dm_flags of &struct global_data. +*/ +enum gd_dm_flags { +/** +* @GD_DM_FLG_SIZE_CELLS_0: Enable #size-cells=<0> translation +*/ +GD_DM_FLG_SIZE_CELLS_0 =0x00001 , +}; +#endif /* __ASSEMBLY__ */ #endif /* __ASM_GENERIC_GBL_DATA_H */
test/dm/test-fdt.c +68 -1
91 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v4 17/27 omap: timer: fix the rate setting
In reply to Dario BinacchiThe prescaler (PTV) setting must be taken into account even when the timer input clock frequency has been set.
---
(no changes since v1)
drivers/timer/omap-timer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/timer/omap-timer.c +3 -3
@@ -19,8 +19,6 @@#define TCLR_PRE_EN BIT(5)/* Pre-scaler enable */ #define TCLR_PTV_SHIFT (2)/* Pre-scaler shift value */ -#define TIMER_CLOCK (V_SCLK / (2 << CONFIG_SYS_PTV)) -struct omap_gptimer_regs {unsigned int tidr;/* offset 0x00 */ unsigned char res1[12 ];
@@ -63,7 +61,9 @@ static int omap_timer_probe(struct udevice *dev)struct omap_timer_priv *priv =dev_get_priv (dev);if (!uc_priv->clock_rate) - uc_priv->clock_rate =TIMER_CLOCK ; + uc_priv->clock_rate =V_SCLK ; + + uc_priv->clock_rate /= (2 <<CONFIG_SYS_PTV );/* start the counter ticking up, reload value on overflow */ writel (0 , &priv->regs->tldr);
Signature · 1 line
2.17.1
PATCH v4 18/27 misc: am33xx: add control module driver
In reply to Dario BinacchiThe implementation of this driver was needed to bind the device tree sub-nodes of the 'clocks' node. In fact, the lack of the compatible property in the 'clocks' node does not allow the generic 'syscon' or 'simple-bus' drivers linked to the 'scm_conf at 0' node to bind the 'clocks' node and in turn its sub-nodes.
The 'scm at 210000' node is therefore the node closest to the 'clocks' node whose driver can bind all the 'clocks' sub-nodes. In this way, the address translation functions are able to walk along the device tree towards the upper nodes until the address composition is completed.
scm: scm at 210000 {
compatible = "ti,am3-scm", "simple-bus";
...
scm_conf: scm_conf at 0 {
compatible = "syscon", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0 0x800>;
scm_clocks: clocks {
#address-cells = <1>;
#size-cells = <0>;
};
};
};For DT binding details see Linux doc:
- Documentation/devicetree/bindings/arm/omap/ctrl.txt
---
Changes in v4:
- Include device_compat.h header for dev_xxx macros.
Changes in v3:
- Remove doc/device-tree-bindings/arm/omap,ctrl.txt.
- Remove doc/device-tree-bindings/pinctrl/pinctrl-single.txt.
- Add to commit message the references to linux kernel dt binding documentation.
Changes in v2:
- Remove the 'ti_am3_scm_clocks' driver. Handle 'scm_clocks' node in the 'ti_am3_scm' driver.
- Update the commit message.
drivers/misc/Kconfig | 7 ++++ drivers/misc/Makefile | 1 + drivers/misc/ti-am3-scm.c | 82 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 drivers/misc/ti-am3-scm.c
drivers/misc/Kconfig +7 -0
@@ -500,4 +500,11 @@ config ESM_PMIC Support ESM (Error Signal Monitor) on PMIC devices. ESM is used typically to reboot the board in error condition. +config TI_AM3_SCM + bool "AM33XX specific control module support (SCM)" + depends on ARCH_OMAP2PLUS + help + The control module includes status and control logic not addressed + within the peripherals or the rest of the device infrastructure. + endmenu
drivers/misc/Makefile +1 -0
@@ -75,3 +75,4 @@ obj-$(CONFIG_MICROCHIP_FLEXCOM) += microchip_flexcom.o obj-$(CONFIG_K3_AVS0) += k3_avs.o obj-$(CONFIG_ESM_K3) += k3_esm.o obj-$(CONFIG_ESM_PMIC) += esm_pmic.o +obj-$(CONFIG_TI_AM3_SCM) += ti-am3-scm.o
drivers/misc/ti-am3-scm.c new file +82 -0
82 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v4 19/27 pwm: ti: am33xx: add enhanced pwm driver
In reply to Dario BinacchiEnhanced high resolution PWM module (EHRPWM) hardware can be used to generate PWM output over 2 channels. This commit adds PWM driver support for EHRPWM device present on AM33XX SOC.
The code is based on the drivers/pwm/pwm-tiehrpwm.c driver of the Linux kernel version 5.9-rc7.
For DT binding details see:
- Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
---
Changes in v4:
- Include device_compat.h header for dev_xxx macros.
Changes in v3:
- Adds PWM_TI_EHRPWM dependency on ARCH_OMAP2PLUS in Kconfig.
- Add error message in case of invalid address.
- Remove doc/device-tree-bindings/pwm/ti,ehrpwm.txt.
- Add to commit message the references to linux kernel dt binding documentation.
drivers/pwm/Kconfig | 7 + drivers/pwm/Makefile | 1 + drivers/pwm/pwm-ti-ehrpwm.c | 468 ++++++++++++++++++++++++++++++++++++ 3 files changed, 476 insertions(+) create mode 100644 drivers/pwm/pwm-ti-ehrpwm.c
drivers/pwm/Kconfig +7 -0
@@ -75,3 +75,10 @@ config PWM_SUNXI help This PWM is found on H3, A64 and other Allwinner SoCs. It supports a programmable period and duty cycle. A 16-bit counter is used. + +config PWM_TI_EHRPWM + bool "Enable support for EHRPWM PWM" + depends on DM_PWM && ARCH_OMAP2PLUS + default y + help + PWM driver support for the EHRPWM controller found on TI SOCs.
drivers/pwm/Makefile +1 -0
@@ -19,3 +19,4 @@ obj-$(CONFIG_PWM_SANDBOX) += sandbox_pwm.o obj-$(CONFIG_PWM_SIFIVE) += pwm-sifive.o obj-$(CONFIG_PWM_TEGRA) += tegra_pwm.o obj-$(CONFIG_PWM_SUNXI) += sunxi_pwm.o +obj-$(CONFIG_PWM_TI_EHRPWM) += pwm-ti-ehrpwm.o
drivers/pwm/pwm-ti-ehrpwm.c new file +468 -0
468 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v4 20/27 bus: ti: am33xx: add pwm subsystem driver
In reply to Dario BinacchiThe TI PWMSS driver is a simple bus driver for providing clock and power management for the PWM peripherals on TI AM33xx SoCs, namely eCAP, eHRPWM and eQEP.
For DT binding details see Linux doc:
- Documentation/devicetree/bindings/pwm/pwm-tipwmss.txt
---
(no changes since v3)
Changes in v3:
- Move Kconfig symbol from drivers/pwm to drivers/bus.
- Remove the domain clock reference from the pwmss nodes of the device tree in am33xx.dtsi. The resync of am33xx.dtsi with Linux 5.9-rc7 already contains such references.
- Remove domain clock enabling/disabling. Enabling the domain clock is performed by the sysc interconnect target module driver during the pwm device probing.
- Remove doc/device-tree-bindings/pwm/ti,pwmss.txt.
- Add to commit message the references to linux kernel dt binding documentation.
drivers/bus/Kconfig | 6 ++++++ drivers/bus/Makefile | 1 + drivers/bus/ti-pwmss.c | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 drivers/bus/ti-pwmss.c
drivers/bus/Kconfig +6 -0
@@ -5,6 +5,12 @@ menu "Bus devices" +config TI_PWMSS + bool + default y if ARCH_OMAP2PLUS && PWM_TI_EHRPWM + help + PWM Subsystem driver support for AM33xx SOC. + config TI_SYSC bool "TI sysc interconnect target module driver" depends on ARCH_OMAP2PLUS
drivers/bus/Makefile +1 -0
@@ -3,5 +3,6 @@ # Makefile for the bus drivers. # +obj-$(CONFIG_TI_PWMSS) += ti-pwmss.o obj-$(CONFIG_TI_SYSC) += ti-sysc.o obj-$(CONFIG_UNIPHIER_SYSTEM_BUS) += uniphier-system-bus.o
drivers/bus/ti-pwmss.c new file +21 -0
@@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Pulse-Width Modulation Subsystem (pwmss) +* +* Copyright (C) 2020 Dario Binacchi <[email protected]> +*/ + +#include <common.h> +#include <dm.h> + +static const struct udevice_id ti_pwmss_ids[] = { + {.compatible ="ti,am33xx-pwmss" }, + {} +}; + +U_BOOT_DRIVER (ti_pwmss) = { + .name ="ti_pwmss" , + .id =UCLASS_SIMPLE_BUS , + .of_match = ti_pwmss_ids, + .bind = dm_scan_fdt_dev, +};
Signature · 1 line
2.17.1
PATCH v4 21/27 dm: core: add a function to decode display timings
In reply to Dario BinacchiThe patch adds a function to get display timings from the device tree node attached to the device.
---
(no changes since v1)
arch/sandbox/dts/test.dts | 46 ++++++++++++++++++++++ drivers/core/read.c | 6 +++ include/dm/read.h | 24 ++++++++++++ test/dm/test-fdt.c | 80 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 156 insertions(+)
arch/sandbox/dts/test.dts +46 -0
@@ -134,6 +134,52 @@ interrupts-extended = <&irq 3 0>; acpi,name = "GHIJ"; phandle-value = <&gpio_c 10>, <0xFFFFFFFF 20>, <&gpio_a 30>; + display-timings { + timing0: 240x320 { + clock-frequency = <6500000>; + hactive = <240>; + vactive = <320>; + hfront-porch = <6>; + hback-porch = <7>; + hsync-len = <1>; + vback-porch = <5>; + vfront-porch = <8>; + vsync-len = <2>; + hsync-active = <1>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; + interlaced; + doublescan; + doubleclk; + }; + timing1: 480x800 { + clock-frequency = <9000000>; + hactive = <480>; + vactive = <800>; + hfront-porch = <10>; + hback-porch = <59>; + hsync-len = <12>; + vback-porch = <15>; + vfront-porch = <17>; + vsync-len = <16>; + hsync-active = <0>; + vsync-active = <1>; + de-active = <0>; + pixelclk-active = <0>; + }; + timing2: 800x480 { + clock-frequency = <33500000>; + hactive = <800>; + vactive = <480>; + hback-porch = <89>; + hfront-porch = <164>; + vback-porch = <23>; + vfront-porch = <10>; + hsync-len = <11>; + vsync-len = <13>; + }; + }; }; junk {
drivers/core/read.c +6 -0
@@ -377,3 +377,9 @@ int dev_read_pci_bus_range(const struct udevice *dev,return 0 ; } + +int dev_decode_display_timing (const struct udevice *dev,int index, +struct display_timing *config) +{ +return ofnode_decode_display_timing (dev_ofnode (dev), index, config); +}
include/dm/read.h +24 -0
@@ -694,6 +694,23 @@ int dev_get_child_count(const struct udevice *dev);*/ int dev_read_pci_bus_range (const struct udevice *dev,struct resource *res); +/** +* dev_decode_display_timing() - decode display timings +* +* Decode display timings from the supplied 'display-timings' node. +* See doc/device-tree-bindings/video/display-timing.txt for binding +* information. +* +* @dev: device to read DT display timings from. The node linked to the device +* contains a child node called 'display-timings' which in turn contains +* one or more display timing nodes. +* @index: index number to read (0=first timing subnode) +* @config: place to put timings +* @return 0 if OK, -FDT_ERR_NOTFOUND if not found +*/ +int dev_decode_display_timing (const struct udevice *dev,int index, +struct display_timing *config); +#else /* CONFIG_DM_DEV_READ_INLINE is enabled */ static inline int dev_read_u32(const struct udevice *dev,
@@ -1016,6 +1033,13 @@ static inline int dev_get_child_count(const struct udevice *dev) return ofnode_get_child_count(dev_ofnode(dev)); } +static inline int dev_decode_display_timing (const struct udevice *dev, +int index, +struct display_timing *config) +{ +return ofnode_decode_display_timing (dev_ofnode (dev), index, config); +} +#endif /* CONFIG_DM_DEV_READ_INLINE */ /**
test/dm/test-fdt.c +80 -0
83 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v4 22/27 video: omap: add panel driver
In reply to Dario BinacchiThe previous version of am335x-fb.c contained the functionalities of two drivers that this patch has split. It was a video type driver that used the same registration compatible string that now registers a panel type driver. The proof of this is that two compatible strings were referred to within the same driver.
There are now two drivers, each with its own compatible string, functions and API.
Furthermore, the panel driver, in addition to decoding the display timings, is now also able to manage the backlight.
---
Changes in v4:
- Include device_compat.h header for dev_xxx macros.
- Add Simon Glass review.
Changes in v3:
- Update the DTS lcdc node of the am335x boards because of the am33xx.dtsi resynced with Linux 5.9-rc7.
arch/arm/dts/am335x-brppt1-mmc.dts | 17 +- arch/arm/dts/am335x-brppt1-nand.dts | 17 +- arch/arm/dts/am335x-brppt1-spi.dts | 17 +- arch/arm/dts/am335x-brsmarc1.dts | 20 +- arch/arm/dts/am335x-brxre1.dts | 21 +- arch/arm/dts/am335x-evm-u-boot.dtsi | 15 +- arch/arm/dts/am335x-evmsk-u-boot.dtsi | 14 +- arch/arm/dts/am335x-guardian-u-boot.dtsi | 18 +- arch/arm/dts/am335x-pdu001-u-boot.dtsi | 18 +- arch/arm/dts/am335x-pxm50-u-boot.dtsi | 14 +- arch/arm/dts/am335x-rut-u-boot.dtsi | 14 +- arch/arm/dts/da850-evm-u-boot.dtsi | 18 +- drivers/video/Makefile | 1 + drivers/video/am335x-fb.c | 255 ++++++++++------------- drivers/video/am335x-fb.h | 31 +++ drivers/video/tilcdc-panel.c | 172 +++++++++++++++ drivers/video/tilcdc-panel.h | 14 ++ 17 files changed, 478 insertions(+), 198 deletions(-) create mode 100644 drivers/video/tilcdc-panel.c create mode 100644 drivers/video/tilcdc-panel.h
arch/arm/dts/am335x-brppt1-mmc.dts +13 -4
@@ -53,8 +53,6 @@ bkl-pwm = <&pwmbacklight>; bkl-tps = <&tps_bl>; - u-boot,dm-pre-reloc; - panel-info { ac-bias = <255>; ac-bias-intrpt = <0>;
@@ -238,8 +236,19 @@ status = "okay"; }; -&lcdc { - status = "disabled"; +&l4_per { + + segment at 300000 { + + target-module at e000 { + u-boot,dm-pre-reloc; + + lcdc: lcdc at 0 { + u-boot,dm-pre-reloc; + status = "disabled"; + }; + }; + }; }; &elm {
arch/arm/dts/am335x-brppt1-nand.dts +13 -4
@@ -53,8 +53,6 @@ bkl-pwm = <&pwmbacklight>; bkl-tps = <&tps_bl>; - u-boot,dm-pre-reloc; - panel-info { ac-bias = <255>; ac-bias-intrpt = <0>;
@@ -228,8 +226,19 @@ status = "disabled"; }; -&lcdc { - status = "disabled"; +&l4_per { + + segment at 300000 { + + target-module at e000 { + u-boot,dm-pre-reloc; + + lcdc: lcdc at 0 { + u-boot,dm-pre-reloc; + status = "disabled"; + }; + }; + }; }; &elm {
arch/arm/dts/am335x-brppt1-spi.dts +13 -4
@@ -54,8 +54,6 @@ bkl-pwm = <&pwmbacklight>; bkl-tps = <&tps_bl>; - u-boot,dm-pre-reloc; - panel-info { ac-bias = <255>; ac-bias-intrpt = <0>;
@@ -259,8 +257,19 @@ status = "okay"; }; -&lcdc { - status = "disabled"; +&l4_per { + + segment at 300000 { + + target-module at e000 { + u-boot,dm-pre-reloc; + + lcdc: lcdc at 0 { + u-boot,dm-pre-reloc; + status = "disabled"; + }; + }; + }; }; &elm {
arch/arm/dts/am335x-brsmarc1.dts +15 -5
@@ -59,7 +59,6 @@ /*backlight = <&tps_bl>; */ compatible = "ti,tilcdc,panel"; status = "okay"; - u-boot,dm-pre-reloc; panel-info { ac-bias = <255>;
@@ -298,10 +297,21 @@ status = "okay"; }; -&lcdc { - status = "okay"; - ti,no-reset-on-init; - ti,no-idle-on-init; +&l4_per { + + segment at 300000 { + + target-module at e000 { + u-boot,dm-pre-reloc; + + lcdc: lcdc at 0 { + u-boot,dm-pre-reloc; + status = "okay"; + ti,no-reset-on-init; + ti,no-idle-on-init; + }; + }; + }; }; &elm {
arch/arm/dts/am335x-brxre1.dts +15 -6
@@ -79,8 +79,6 @@ backlight = <&tps_bl>; - u-boot,dm-pre-reloc; - panel-info { ac-bias = <255>; ac-bias-intrpt = <0>;
@@ -254,10 +252,21 @@ status = "okay"; }; -&lcdc { - status = "okay"; - ti,no-reset-on-init; - ti,no-idle-on-init; +&l4_per { + + segment at 300000 { + + target-module at e000 { + u-boot,dm-pre-reloc; + + lcdc: lcdc at 0 { + u-boot,dm-pre-reloc; + status = "okay"; + ti,no-reset-on-init; + ti,no-idle-on-init; + }; + }; + }; }; &elm {
arch/arm/dts/am335x-evm-u-boot.dtsi +11 -4
@@ -3,13 +3,20 @@ * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ */ -/ { - panel { - u-boot,dm-pre-reloc; +&l4_per { + + segment at 300000 { + + target-module at e000 { + u-boot,dm-pre-reloc; + + lcdc: lcdc at 0 { + u-boot,dm-pre-reloc; + }; + }; }; }; - &mmc3 { status = "disabled"; };
arch/arm/dts/am335x-evmsk-u-boot.dtsi +11 -3
@@ -5,8 +5,16 @@ * Copyright (C) 2020 Dario Binacchi <[email protected]> */ -/ { - panel { - u-boot,dm-pre-reloc; +&l4_per { + + segment at 300000 { + + target-module at e000 { + u-boot,dm-pre-reloc; + + lcdc: lcdc at 0 { + u-boot,dm-pre-reloc; + }; + }; }; };
arch/arm/dts/am335x-guardian-u-boot.dtsi +14 -4
@@ -8,16 +8,26 @@ ocp { u-boot,dm-pre-reloc; }; - - panel { - u-boot,dm-pre-reloc; - }; }; &l4_wkup { u-boot,dm-pre-reloc; }; +&l4_per { + + segment at 300000 { + + target-module at e000 { + u-boot,dm-pre-reloc; + + lcdc: lcdc at 0 { + u-boot,dm-pre-reloc; + }; + }; + }; +}; + &mmc1 { u-boot,dm-pre-reloc; };
arch/arm/dts/am335x-pdu001-u-boot.dtsi +14 -4
@@ -7,16 +7,26 @@ ocp { u-boot,dm-pre-reloc; }; - - panel { - u-boot,dm-pre-reloc; - }; }; &l4_wkup { u-boot,dm-pre-reloc; }; +&l4_per { + + segment at 300000 { + + target-module at e000 { + u-boot,dm-pre-reloc; + + lcdc: lcdc at 0 { + u-boot,dm-pre-reloc; + }; + }; + }; +}; + &scm { u-boot,dm-pre-reloc; };
arch/arm/dts/am335x-pxm50-u-boot.dtsi +11 -3
@@ -5,8 +5,16 @@ * Copyright (C) 2020 Dario Binacchi <[email protected]> */ -/ { - panel { - u-boot,dm-pre-reloc; +&l4_per { + + segment at 300000 { + + target-module at e000 { + u-boot,dm-pre-reloc; + + lcdc: lcdc at 0 { + u-boot,dm-pre-reloc; + }; + }; }; };
arch/arm/dts/am335x-rut-u-boot.dtsi +11 -3
@@ -5,8 +5,16 @@ * Copyright (C) 2020 Dario Binacchi <[email protected]> */ -/ { - panel { - u-boot,dm-pre-reloc; +&l4_per { + + segment at 300000 { + + target-module at e000 { + u-boot,dm-pre-reloc; + + lcdc: lcdc at 0 { + u-boot,dm-pre-reloc; + }; + }; }; };
arch/arm/dts/da850-evm-u-boot.dtsi +14 -4
@@ -14,10 +14,6 @@ nand { compatible = "ti,davinci-nand"; }; - - panel { - u-boot,dm-pre-reloc; - }; }; ð0 {
@@ -28,6 +24,20 @@ compatible = "m25p64", "jedec,spi-nor"; }; +&l4_per { + + segment at 300000 { + + target-module at e000 { + u-boot,dm-pre-reloc; + + lcdc: lcdc at 0 { + u-boot,dm-pre-reloc; + }; + }; + }; +}; + &mmc0 { u-boot,dm-spl; };
drivers/video/Makefile +1 -0
@@ -16,6 +16,7 @@ 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 endif obj-${CONFIG_EXYNOS_FB} += exynos/
drivers/video/am335x-fb.c +105 -150
355 lines not on this page · raw message
drivers/video/am335x-fb.h +31 -0
@@ -70,6 +70,37 @@ 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 new file +172 -0
172 lines not on this page · raw message
drivers/video/tilcdc-panel.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) 2020 Dario Binacchi <[email protected]> +*/ + +#ifndef _TILCDC_PANEL_H +#define _TILCDC_PANEL_H + +#include "am335x-fb.h" + +int tilcdc_panel_get_display_info (struct udevice *dev, +struct tilcdc_panel_info *info); + +#endif /* _TILCDC_PANEL_H */
Signature · 1 line
2.17.1
PATCH v4 23/27 video: omap: drop domain clock enabling by SOC api
In reply to Dario BinacchiEnabling the domain clock is performed by the sysc interconnect target module driver during the video device probing.
---
(no changes since v3)
Changes in v3:
- Remove clock domain enabling/disabling.
- Update the commit message.
arch/arm/mach-omap2/am33xx/clock_am33xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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
Signature · 1 line
2.17.1
PATCH v4 23/27 video: omap: drop domain clock enabling by SOC api
Quoted 21 lines · Dario Binacchi
Enabling the domain clock is performed by the sysc interconnect target module driver during the video device probing.
Signed-off-by Dario Binacchi <[email protected]>---
(no changes since v3)
Changes in v3:
- Remove clock domain enabling/disabling.
- Update the commit message.arch/arm/mach-omap2/am33xx/clock_am33xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/mach-omap2/am33xx/clock_am33xx.c +0
-0
arch/arm/mach-omap2/am33xx/clock_am33xx.c void enable_basic_clocks(void) · line 231
Quoted 7 lines
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,
Now that we are enabling clocks from DT, can we drop this hunk all together?
Thanks and regards,
Lokesh
Quoted 2 lines
arch/arm/mach-omap2/am33xx/clock_am33xx.c +0
-0#endif
PATCH v4 23/27 video: omap: drop domain clock enabling by SOC api
Hi Lokesh,
Quoted 20 lines
Il 20/10/2020 08:31 Lokesh Vutla <[email protected]> ha scritto:
Quoted 16 lines · Dario Binacchi
Enabling the domain clock is performed by the sysc interconnect target module driver during the video device probing.
Signed-off-by Dario Binacchi <[email protected]>---
(no changes since v3)
Changes in v3:
- Remove clock domain enabling/disabling.
- Update the commit message.arch/arm/mach-omap2/am33xx/clock_am33xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines
arch/arm/mach-omap2/am33xx/clock_am33xx.c void enable_basic_clocks(void) · line 231
Quoted 12 lines
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,Now that we are enabling clocks from DT, can we drop this hunk all together?
Yes. Actually, the device tree only references the lcdclkctrl register (<&lcdc_clkctrl AM3_LCDC_LCDC_CLKCTRL 0>;) The lcdcclkstctrl register is not referenced by any device tree node. It is also not found in the include/dt-bindings/clock/am3.h file. Nevertheless, the display works.
Regards,
Dario
Quoted 6 lines
Thanks and regards,
LokeshQuoted 2 lines
arch/arm/mach-omap2/am33xx/clock_am33xx.c +0
-0#endif
PATCH v4 24/27 video: omap: set LCD clock rate through DM API
In reply to Dario BinacchiThe 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.
---
(no changes since v3)
Changes in v3:
- Add clk.h header.
- Fix an error code returned by the probe function.
drivers/video/am335x-fb.c | 129 ++++++++++++++++++++++++++++++-------- 1 file changed, 103 insertions(+), 26 deletions(-)
drivers/video/am335x-fb.c +103 -26
@@ -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>
@@ -112,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;
@@ -119,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 *
@@ -199,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 ;
@@ -335,14 +336,58 @@ enum {struct am335x_fb_priv {struct am335x_lcdhw *regs; +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); +struct am335x_fb_priv *priv =dev_get_priv (dev); uc_plat->base -=0x20 ; uc_plat->size +=0x20 ; +clk_release_all (&priv->gclk,1 ); +clk_release_all (&priv->dpll_m2_clk,1 );return 0 ; }
@@ -352,10 +397,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;
@@ -416,10 +461,42 @@ static int am335x_fb_probe(struct udevice *dev)return -EINVAL ; } -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; + } -/* clock source for LCDC from dispPLL M2 */ -writel (0 , &cmdpll->clklcdcpixelclk); + err =clk_request (clk_dev, &priv->gclk); +if (err) { +dev_err (dev,"failed to get %s clock\n" , clk_dev->name); +return err; + } + + 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 v4 25/27 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.
---
Changes in v4:
- Include device_compat.h header for dev_xxx macros.
drivers/video/Makefile | 5 +- drivers/video/am335x-fb.c | 336 --------------------------- drivers/video/am335x-fb.h | 35 --- drivers/video/tilcdc-panel.c | 2 +- drivers/video/tilcdc-panel.h | 2 +- drivers/video/tilcdc.c | 425 +++++++++++++++++++++++++++++++++++ drivers/video/tilcdc.h | 38 ++++ 7 files changed, 468 insertions(+), 375 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 -336
360 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
@@ -15,7 +15,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 +425 -0
425 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 v4 26/27 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.
---
(no changes since v1)
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 v4 27/27 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.
---
(no changes since v1)
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