Re: [PATCH v6 00/19] Move PMC clocks into Tegra PMC driver

From: Dmitry Osipenko
Date: Tue Jan 07 2020 - 20:01:22 EST


08.01.2020 03:02, Sowjanya Komatineni ÐÐÑÐÑ:
>
> On 1/7/20 3:28 PM, Dmitry Osipenko wrote:
>> 08.01.2020 02:24, Sowjanya Komatineni ÐÐÑÐÑ:
>>> On 1/7/20 3:01 PM, Dmitry Osipenko wrote:
>>>> Hello Sowjanya,
>>>>
>>>> 07.01.2020 07:13, Sowjanya Komatineni ÐÐÑÐÑ:
>>>>> This patch series moves Tegra PMC clocks from clock driver to pmc
>>>>> driver
>>>>> along with the device trees changes and audio driver which uses one of
>>>>> the pmc clock for audio mclk.
>>>>>
>>>>> Tegra PMC has clk_out_1, clk_out_2, clk_out_3 and blink controls which
>>>>> are currently registered by Tegra clock driver using
>>>>> clk_regiser_mux and
>>>>> clk_register_gate which performs direct Tegra PMC register access.
>>>>>
>>>>> When Tegra PMC is in secure mode, any access from non-secure world
>>>>> will
>>>>> not go through.
>>>>>
>>>>> This patch series adds these Tegra PMC clocks and blink controls to
>>>>> Tegra
>>>>> PMC driver with PMC as clock provider and removes them from Tegra
>>>>> clock
>>>>> driver.
>>>>>
>>>>> PMC clock clk_out_1 is dedicated for audio mclk from Tegra30 thru
>>>>> Tegra210
>>>>> and clock driver does inital parent configuration for it and enables
>>>>> them.
>>>>> But this clock should be taken care by audio driver as there is no
>>>>> need
>>>>> to have this clock pre enabled.
>>>>>
>>>>> So, this series also includes patch that updates ASoC driver to take
>>>>> care of parent configuration for mclk if device tree don't specify
>>>>> initial parent configuration using assigned-clock-parents and controls
>>>>> audio mclk enable/disable during ASoC machine startup and shutdown.
>>>>>
>>>>> DTs are also updated to use clk_out_1 as audio mclk rather than
>>>>> extern1.
>>>>>
>>>>> This series also includes a patch for mclk fallback to extern1 when
>>>>> retrieving mclk fails to have this backward compatible of new DT with
>>>>> old kernels.
>>>>>
>>>>> [v6]:ÂÂÂ Changes between v5 and v6 are
>>>>> ÂÂÂÂÂ- v5 feedback
>>>>> ÂÂÂÂÂ- Added ASoC machine startup and shutdown callbacks to control
>>>>> audio
>>>>> ÂÂÂÂÂÂ mclk enable/disable and removed default mclk enable from clock
>>>>> driver.
>>>>> ÂÂÂÂÂ- Updated tegra_asoc_utils_set_rate to disable mclk only
>>>>> during PLLA
>>>>> ÂÂÂÂÂÂ rate change and removed disabling PLLA as its already taken
>>>>> care by
>>>>> ÂÂÂÂÂÂ pll clock driver.
>>>>> ÂÂÂÂÂ- Removed tegra_asoc_utils_set_rate call from utils_init as
>>>>> set_rate
>>>>> ÂÂÂÂÂÂ is set during machine hw_params and during utils_init mclk is
>>>>> ÂÂÂÂÂÂ already in disabled state and this causes warning during mclk
>>>>> disable
>>>>> ÂÂÂÂÂÂ in utils_set_rate.
>>>>>
>>>>> [v5]:ÂÂÂ Changes between v4 and v5 are
>>>>> ÂÂÂÂÂ- v4 feedback
>>>>> ÂÂÂÂÂ- updated dt-binding pmc YAML schema with more description on
>>>>> power
>>>>> ÂÂÂÂÂÂ gate nodes and pad configuration state nodes.
>>>>> ÂÂÂÂÂ- update tegra_asoc_utils_set_rate to disable audio mclk only if
>>>>> ÂÂÂÂÂÂ its in enable state.
>>>>>
>>>>> [v4]:ÂÂÂ Changes between v3 and v4 are
>>>>> ÂÂÂÂÂ- v3 Feedback
>>>>> ÂÂÂÂÂ- Updated clocks clk_m_div2 and clk_m_div4 as osc_div2 and
>>>>> osc_div4.
>>>>> ÂÂÂÂÂÂ Tegra don't have clk_m_div2, clk_m_div4 and they should
>>>>> actually
>>>>> ÂÂÂÂÂÂ be osc_div2 and osc_div4 clocks from osc pads.
>>>>> ÂÂÂÂÂ- Fixed PMC clock parents to use osc, osc_div2, osc_div4.
>>>>> ÂÂÂÂÂ- Register each PMC clock as single clock rather than separate
>>>>> ÂÂÂÂÂÂ mux and gate clocks.
>>>>> ÂÂÂÂÂ- Update ASoC utils to use resource managed APIs rather than
>>>>> ÂÂÂÂÂÂ using clk_get and clk_put.
>>>>> ÂÂÂÂÂ- Updated device tree and ASoC driver to use clk_out_1 instead of
>>>>> ÂÂÂÂÂÂ clk_out_1_mux as PMC clocks are registered as single clock.
>>>>> ÂÂÂÂÂ- Update clock driver init_table to not enable audio related
>>>>> clocks
>>>>> ÂÂÂÂÂÂ as ASoC utils will do audio clock enables.
>>>>>
>>>>> [v3]:ÂÂÂ Changes between v2 and v3 are
>>>>> ÂÂÂÂÂ- Removes set parent of clk_out_1_mux to extern1 and enabling
>>>>> ÂÂÂÂÂÂ extern1 from the clock driver.
>>>>> ÂÂÂÂÂ- Doesn't enable clk_out_1 and blink by default in pmc driver
>>>>> ÂÂÂÂÂ- Updates ASoC driver to take care of audio mclk parent
>>>>> ÂÂÂÂÂÂ configuration incase if device tree don't specify assigned
>>>>> ÂÂÂÂÂÂ clock parent properties and enables mclk using both clk_out_1
>>>>> ÂÂÂÂÂÂ and extern1.
>>>>> ÂÂÂÂÂ- updates all device trees using extern1 as mclk in sound node
>>>>> ÂÂÂÂÂÂ to use clk_out_1 from pmc.
>>>>> ÂÂÂÂÂ- patch for YAML format pmc dt-binding
>>>>> ÂÂÂÂÂ- Includes v2 feedback
>>>>>
>>>>> [v2]:ÂÂÂ Changes between v1 and v2 are
>>>>> ÂÂÂÂÂ- v2 includes patches for adding clk_out_1, clk_out_2, clk_out_3,
>>>>> ÂÂÂÂÂÂ blink controls to Tegra PMC driver and removing clk-tegra-pmc.
>>>>> ÂÂÂÂÂ- feedback related to pmc clocks in Tegra PMC driver from v1
>>>>> ÂÂÂÂÂ- Removed patches for WB0 PLLM overrides and PLLE IDDQ PMC
>>>>> programming
>>>>> ÂÂÂÂÂÂ by the clock driver using helper functions from Tegra PMC.
>>>>>
>>>>> ÂÂÂÂÂÂÂÂ Note:
>>>>> ÂÂÂÂÂÂ To use helper functions from PMC driver, PMC early init need to
>>>>> ÂÂÂÂÂÂ happen prior to using helper functions and these helper
>>>>> functions are
>>>>> ÂÂÂÂÂÂ for PLLM Override and PLLE IDDQ programming in PMC during
>>>>> PLLM/PLLE
>>>>> ÂÂÂÂÂÂ clock registration which happen in clock_init prior to Tegra
>>>>> PMC
>>>>> ÂÂÂÂÂÂ probe.
>>>>> ÂÂÂÂÂÂ Moving PLLM/PLLE clocks registration to happen after Tegra PMC
>>>>> ÂÂÂÂÂÂ impacts other clocks EMC, MC and corresponding
>>>>> tegra_emc_init and
>>>>> ÂÂÂÂÂÂ tegra_mc_init.
>>>>> ÂÂÂÂÂÂ This implementation of configuring PMC registers thru helper
>>>>> ÂÂÂÂÂÂ functions in clock driver needs proper changes across PMC,
>>>>> Clock,
>>>>> ÂÂÂÂÂÂ EMC and MC inits to have it work across all Tegra platforms.
>>>>>
>>>>> ÂÂÂÂÂÂ Currently PLLM Override is not enabled in the bootloader so
>>>>> proper
>>>>> ÂÂÂÂÂÂ patches for this fix will be taken care separately.
>>>>>
>>>>> [v1]:ÂÂÂ v1 includes patches for below fixes.
>>>>> ÂÂÂÂÂ- adding clk_out_1, clk_out_2, clk_out_3, blink controls to Tegra
>>>>> PMC
>>>>> ÂÂÂÂÂÂ driver and removing clk-tegra-pmc.
>>>>> ÂÂÂÂÂ- updated clock provider from tegra_car to pmc in the device tree
>>>>> ÂÂÂÂÂÂ tegra210-smaug.dts that uses clk_out_2.
>>>>> ÂÂÂÂÂ- Added helper functions in PMC driver for WB0 PLLM overrides and
>>>>> PLLE
>>>>> ÂÂÂÂÂÂ IDDQ programming to use by clock driver and updated clock
>>>>> driver to
>>>>> ÂÂÂÂÂÂ use these helper functions and removed direct PMC access from
>>>>> clock
>>>>> ÂÂÂÂÂÂ driver and all pmc base address references in clock driver.
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> Sowjanya Komatineni (19):
>>>>> ÂÂÂ dt-bindings: clock: tegra: Change CLK_M_DIV to OSC_DIV clocks
>>>>> ÂÂÂ clk: tegra: Change CLK_M_DIV clocks to OSC_DIV clocks
>>>>> ÂÂÂ clk: tegra: Fix Tegra PMC clock out parents
>>>>> ÂÂÂ dt-bindings: tegra: Convert Tegra PMC bindings to YAML
>>>>> ÂÂÂ dt-bindings: soc: tegra-pmc: Add Tegra PMC clock bindings
>>>>> ÂÂÂ soc: tegra: Add Tegra PMC clocks registration into PMC driver
>>>>> ÂÂÂ dt-bindings: soc: tegra-pmc: Add id for Tegra PMC 32KHz blink
>>>>> clock
>>>>> ÂÂÂ soc: tegra: Add support for 32KHz blink clock
>>>>> ÂÂÂ clk: tegra: Remove tegra_pmc_clk_init along with clk ids
>>>>> ÂÂÂ dt-bindings: clock: tegra: Remove pmc clock ids from clock
>>>>> dt-bindings
>>>>> ÂÂÂ ASoC: tegra: Use device managed resource APIs to get the clock
>>>>> ÂÂÂ ASoC: tegra: Add audio mclk configuration
>>>>> ÂÂÂ ASoC: tegra: Add fallback implementation for audio mclk
>>>>> ÂÂÂ clk: tegra: Remove audio related clock enables from init_table
>>>>> ÂÂÂ ARM: dts: tegra: Add clock-cells property to pmc
>>>>> ÂÂÂ arm64: tegra: Add clock-cells property to Tegra PMC node
>>>>> ÂÂÂ ARM: tegra: Update sound node clocks in device tree
>>>>> ÂÂÂ arm64: tegra: smaug: Change clk_out_2 provider to pmc
>>>>> ÂÂÂ ASoC: nau8825: change Tegra clk_out_2 provider from tegra_car
>>>>> to pmc
>>>>>
>>>>> ÂÂ .../bindings/arm/tegra/nvidia,tegra20-pmc.txtÂÂÂÂÂ | 300
>>>>> -----------------
>>>>> ÂÂ .../bindings/arm/tegra/nvidia,tegra20-pmc.yamlÂÂÂÂ | 354
>>>>> +++++++++++++++++++++
>>>>> ÂÂ .../devicetree/bindings/sound/nau8825.txtÂÂÂÂÂÂÂÂÂ |ÂÂ 2 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra114-dalmore.dtsÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 8 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra114.dtsiÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 4 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra124-apalis-v1.2.dtsiÂÂÂÂÂÂÂ |ÂÂ 8 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra124-apalis.dtsiÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 8 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra124-jetson-tk1.dtsÂÂÂÂÂÂÂÂÂ |ÂÂ 8 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra124-nyan.dtsiÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 8 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra124-venice2.dtsÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 8 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra124.dtsiÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 4 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra20.dtsiÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 4 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra30-apalis-v1.1.dtsiÂÂÂÂÂÂÂÂ |ÂÂ 8 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra30-apalis.dtsiÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 8 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra30-beaver.dtsÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 8 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra30-cardhu.dtsiÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 8 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra30-colibri.dtsiÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 8 +-
>>>>> ÂÂ arch/arm/boot/dts/tegra30.dtsiÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 4 +-
>>>>> ÂÂ arch/arm64/boot/dts/nvidia/tegra132.dtsiÂÂÂÂÂÂÂÂÂÂ |ÂÂ 4 +-
>>>>> ÂÂ arch/arm64/boot/dts/nvidia/tegra210-smaug.dtsÂÂÂÂÂ |ÂÂ 2 +-
>>>>> ÂÂ arch/arm64/boot/dts/nvidia/tegra210.dtsiÂÂÂÂÂÂÂÂÂÂ |ÂÂ 6 +-
>>>>> ÂÂ drivers/clk/tegra/MakefileÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 1 -
>>>>> ÂÂ drivers/clk/tegra/clk-id.hÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 11 +-
>>>>> ÂÂ drivers/clk/tegra/clk-tegra-fixed.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 32 +-
>>>>> ÂÂ drivers/clk/tegra/clk-tegra-pmc.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ | 122 -------
>>>>> ÂÂ drivers/clk/tegra/clk-tegra114.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 41 +--
>>>>> ÂÂ drivers/clk/tegra/clk-tegra124.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 46 +--
>>>>> ÂÂ drivers/clk/tegra/clk-tegra20.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 9 +-
>>>>> ÂÂ drivers/clk/tegra/clk-tegra210.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 30 +-
>>>>> ÂÂ drivers/clk/tegra/clk-tegra30.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 31 +-
>>>>> ÂÂ drivers/clk/tegra/clk.hÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 1 -
>>>>> ÂÂ drivers/soc/tegra/pmc.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ | 352
>>>>> ++++++++++++++++++++
>>>>> ÂÂ include/dt-bindings/clock/tegra114-car.hÂÂÂÂÂÂÂÂÂÂ |Â 18 +-
>>>>> ÂÂ include/dt-bindings/clock/tegra124-car-common.hÂÂÂ |Â 18 +-
>>>>> ÂÂ include/dt-bindings/clock/tegra20-car.hÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 2 +-
>>>>> ÂÂ include/dt-bindings/clock/tegra210-car.hÂÂÂÂÂÂÂÂÂÂ |Â 18 +-
>>>>> ÂÂ include/dt-bindings/clock/tegra30-car.hÂÂÂÂÂÂÂÂÂÂÂ |Â 18 +-
>>>>> ÂÂ include/dt-bindings/soc/tegra-pmc.hÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 16 +
>>>>> ÂÂ sound/soc/tegra/tegra_alc5632.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 28 +-
>>>>> ÂÂ sound/soc/tegra/tegra_asoc_utils.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ | 125 ++++----
>>>>> ÂÂ sound/soc/tegra/tegra_asoc_utils.hÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 3 +-
>>>>> ÂÂ sound/soc/tegra/tegra_max98090.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 43 ++-
>>>>> ÂÂ sound/soc/tegra/tegra_rt5640.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 43 ++-
>>>>> ÂÂ sound/soc/tegra/tegra_rt5677.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 28 +-
>>>>> ÂÂ sound/soc/tegra/tegra_sgtl5000.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 28 +-
>>>>> ÂÂ sound/soc/tegra/tegra_wm8753.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 43 ++-
>>>>> ÂÂ sound/soc/tegra/tegra_wm8903.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 43 ++-
>>>>> ÂÂ sound/soc/tegra/tegra_wm9712.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 8 +-
>>>>> ÂÂ sound/soc/tegra/trimslice.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 39 ++-
>>>>> ÂÂ 49 files changed, 1192 insertions(+), 777 deletions(-)
>>>>> ÂÂ delete mode 100644
>>>>> Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt
>>>>> ÂÂ create mode 100644
>>>>> Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml
>>>>> ÂÂ delete mode 100644 drivers/clk/tegra/clk-tegra-pmc.c
>>>>> ÂÂ create mode 100644 include/dt-bindings/soc/tegra-pmc.h
>>>>>
>>>> I briefly looked through the patches and tested them in all possible
>>>> configurations. For now everything looks and works well.
>>>>
>>>> You could add this to all patches:
>>>>
>>>> Tested-by: Dmitry Osipenko <digetx@xxxxxxxxx>
>>>> Reviewed-by: Dmitry Osipenko <digetx@xxxxxxxxx>
>>> Thanks Dmitry
>> Actually, it will be more accurate if you will add my t-b only to the
>> T20/30 patches. I only looked through the T114+ patches without testing
>> them, thanks.
>
> Most of patches has changes to t20 through t210.
>
> Just to be clear, do you meant to add Tested-by to patches 6, 8, 11, 12,
> 13 and Reviewed-by tag to all patches?
>

You could add t-b to the patches 1-15 (I ran dtbs_check), 17. The r-b is
for all patches.