Merge branch 'CR_1584_pwmdac_11025_compatible_issue_minda' into 'jh7110-5.15.y-devel'

CR_1584 pwmdac:sound: support 11025hz sample rate.

See merge request sdk/linux!275

Merge branch 'CR_1649_7110_evb_5.15_vout_retbug_shengyang.chen' into 'jh7110-5.15.y-devel'

CR_1649_5.15-evb_vout: fix failure problem of vout while startup

See merge request sdk/linux!299

pwmdac:sound: support 11025hz play mode.

1. set the correct clock rate and sample cnt.
2. using aplay 11.025kz wave file can pass.
3. fix issue redmine 1584

Signed-off-by: minda.chen <minda.chen@starfivetech.com>

Merge branch 'CR_1422_V4L2_515_mason.huo' into 'jh7110-5.15.y-devel'

Cr 1422 v4 l2 515 mason.huo

See merge request sdk/linux!316

Merge branch 'CR_1667_TDM_change_reset_interface_walker.chen' into 'jh7110-5.15.y-devel'

CR_1667_TDM_change_reset_interface

See merge request sdk/linux!304

Merge branch 'CR_1541_PDM_Increase_walker.chen' into 'jh7110-5.15.y-devel'

CR_1541_PDM: support more data width and sample rate

See merge request sdk/linux!310

Merge branch 'CR_1661_Watchdog_api_Xingyu.Wu' into 'jh7110-5.15.y-devel'

CR_1661 watchdog:starfive:Update reset api

See merge request sdk/linux!308

Merge branch 'CR_1600_v4l2_reset_515_changhuang.liang' into 'jh7110-5.15.y-devel'

CR_1600_v4l2_reset_515_changhuang.liang

See merge request sdk/linux!282

Merge branch 'CR_1657_clock_tree_api_Xingyu.Wu' into 'jh7110-5.15.y-devel'

CR_1657 clock tree api xingyu.wu

See merge request sdk/linux!305

Merge branch 'CR_1658_I2S_515_curry.zhang' into 'jh7110-5.15.y-devel'

CR_1658_I2S [Audio: I2S] Updated the reset API

See merge request sdk/linux!301

Merge branch 'CR_1656_RTC_hal.feng' into 'jh7110-5.15.y-devel'

Cr 1656 rtc hal.feng

See merge request sdk/linux!292

TDM:change reset interface

1.Modify reset interface with devm_reset_control_array_get_exclusive
2.Support more sample rate: 11025, 22050, 32000, 44100, 48000

Signed-off-by: Walker Chen <walker.chen@starfivetech.com>

media: starfive: Fix v4l2 compliance test issues

To get the v4l2 compliance test passed:
Add some v4l2 operations which are needed.
Improve the ioctl operations of sensor too.

Signed-off-by: mason.huo <mason.huo@starfivetech.com>

media: starfive: Add video format debug information

Add some debug log for set/get video format,
so that we can check if the v4l2 driver accepts
or not the format set by user.
Signed-off-by: mason.huo <mason.huo@starfivetech.com>

v4l2: fixed v4l2 compliance issue

imx219 add set/get frameintervals

Signed-off-by: changhuang.liang <changhuang.liang@starfivetech.com>

PDM: support more data width and sample rate

PDM driver: support data width 16, 32 bits, sample rate 8000, 11025,
16000 Hz

Signed-off-by: Walker Chen <walker.chen@starfivetech.com>

[Audio: I2S] Updated the reset API

changed the standard reset API

Signed-off-by: curry.zhang <curry.zhang@starfivetech.com>

Merge branch 'CR_1582_evb_515_DRM_RGB_keith.zhao' into 'jh7110-5.15.y-devel'

riscv:linux:vout:rgb

See merge request sdk/linux!278

rtc: starfive: Change reset api

Use devm_reset_control_array_get_exclusive() to get reset

Signed-off-by: Hal Feng <hal.feng@starfivetech.com>

riscv: dts: starfive: Modify order of reset in rtc node

For changing reset api used in rtc driver

Signed-off-by: Hal Feng <hal.feng@starfivetech.com>

clk:starfive:Update clk and reset api about vout

Use 'clk_bulk_get' api to replace 'clk_get' and use
'share' replace 'exclusive' about reset.

Signed-off-by: xingyu.wu <xingyu.wu@starfivetech.com>

clk:starfive:Update clk and reset api about isp

Use 'clk_bulk_get' and 'devm_reset_control_array_get' api
to replace 'clk_get' and 'devm_reset_control_get' api.

Signed-off-by: xingyu.wu <xingyu.wu@starfivetech.com>

v4l2: modify reset api

modify reset api

Signed-off-by: changhuang.liang <changhuang.liang@starfivetech.com>

Merge branch 'CR_1176_CLOCK_TREE_PLL_Xingyu.Wu' into 'jh7110-5.15.y-devel'

CR 1176 clock tree pll xingyu.wu

See merge request sdk/linux!280

watchdog:starfive:Update reset api

Use 'devm_reset_control_array_get_exclusive' api to
get reset controllers.

Signed-off-by: xingyu.wu <xingyu.wu@starfivetech.com>

clk:starfive:Modify function format about 'jh7110_pll_data_from'

Modify function format about 'jh7110_pll_data_from'

Signed-off-by: xingyu.wu <xingyu.wu@starfivetech.com>

defconfig:Add CONFIG_CLK_STARFIVE_JH7110_PLL

Add CONFIG_CLK_STARFIVE_JH7110_PLL

Signed-off-by: xingyu.wu <xingyu.wu@starfivetech.com>

clk:starfive:Set PLL2 frequency when clock tree registering

In the file drivers/clk/starfive/clk-starfive-jh7110-pll.h,
If set PLL2_DEFAULT_FREQ NULL of 0 , then PLL2 frequency is original.
If set PLL2_DEFAULT_FREQ one of 'starfive_pll2_freq_value', then PLL2
frequency will be set the new rate during clock tree registering.

Signed-off-by: xingyu.wu <xingyu.wu@starfivetech.com>

clk:starfive:Add PLL2 frequency controller

If enable CONFIG_CLK_STARFIVE_JH7110_PLL, also could read or set PLL1 clock's
rate by reading or setting syscon registers.

Signed-off-by: xingyu.wu <xingyu.wu@starfivetech.com>

clk:starfive:Add PLL0 frequency controller

If enable CONFIG_CLK_STARFIVE_JH7110_PLL, could read or set PLL0 clock's
rate by reading or setting syscon registers.

Signed-off-by: xingyu.wu <xingyu.wu@starfivetech.com>

clk:starfive:Modify the format

Modify the clocktree files' format

Signed-off-by: xingyu.wu <xingyu.wu@starfivetech.com>

dt-bindings:clock:Delete external clock definitions

Move external clock definitions to C files that avoid illegal use.

Signed-off-by: xingyu.wu <xingyu.wu@starfivetech.com>

vout: fix failure problem of vout while startup

fix failure problem of vout while startup

Signed-off-by: shengyang.chen<shengyang.chen@starfivetech.com>

Merge branch 'CR_1651_7110_evb_5.15_voutrst-1_shengyang.chen' into 'jh7110-5.15.y-devel'

Cr 1651 7110 evb 5.15 voutrst 1 shengyang.chen

See merge request sdk/linux!285

Merge branch 'CR_1562_SPI_Xingyu.Wu' into 'jh7110-5.15.y-devel'

CR_1562 spi xingyu.wu

See merge request sdk/linux!288

Merge branch 'CR_1564_I2C_hal.feng' into 'jh7110-5.15.y-devel'

CR 1564 i2c hal.feng

See merge request sdk/linux!290

Merge branch 'CR_1560_v4l2_changhuang.liang' into 'jh7110-5.15.y-devel'

CR_1560_v4l2_changhuang.liang

See merge request sdk/linux!294

Merge branch 'CR_1631_7110_evb_5.15_mipitx_shengyang.chen' into 'jh7110-5.15.y-devel'

CR_1631-5.15 riscv:linux:drm:mipitx

See merge request sdk/linux!296

Merge branch 'CR_1274_SEC_jiajie.ho' into 'jh7110-5.15.y-devel'

crypto:starfive: Switch CSR polling instead of interrupt for HMAC.

See merge request sdk/linux!298

crypto:starfive: Switch CSR polling instead of interrupt for HMAC.

Observed interrupt signal goes HIGH before HMAC calculations
has been completed. Switching to use CSR polling to check for
HMAC_DONE instead.

Signed-off-by: Jia Jie Ho <jiajie.ho@starfivetech.com>

riscv:linux:drm:

fix mipi shifted display problem
remove useless process in vs_dc_hw.c

Signed-off-by:shengyang.chen<shengyang.chen@starfivetech.com>

riscv: dts: starfive: Correct i2c scl/sda falling time

Signed-off-by: Hal Feng <hal.feng@starfivetech.com>

spi:pl022-starfive:Turn off dma channel search under overlay

Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com>

spi:pl022-starfive:Avoid power device error when CONFIG_PM enable

It would be error when CONFIG_PM enable and use overlay by of-platform to register.
And disable 'auto_runtime_pm' can be avoid.

And add some power manager operation in platform probe function.

Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com>

riscv:linux:drm:

replace some reset interfaces for vout

Signed-off-by:shengyang.chen<shengyang.chen@starfivetech.com>

riscv:arch:dts:

reduce some useless calling in vout port

Signed-off-by:shengyang.chen<shengyang.chen@starfivetech.com>

v4l2: fixed close wr due to system hung

Signed-off-by: changhuang.liang <changhuang.liang@starfivetech.com>

Merge branch 'CR_1566_RTC_hal.feng' into 'jh7110-5.15.y-devel'

CR_1566: rtc hal.feng

See merge request sdk/linux!276

riscv:linux:vout:rgb

Solve RGB channel display offset problem

Signed-off-by: keith <keith.zhao@starfivetech.com>

rtc: starfive: Improve rtc driver

1. Set initial time if rtc is never set.
2. Add timeout when clearing interrupt flag register.
3. Improve alarm function.

Signed-off-by: Hal Feng <hal.feng@starfivetech.com>

rtc: starfive: Improve coding style

Signed-off-by: Hal Feng <hal.feng@starfivetech.com>

Merge branch 'CR_1458_timer_watchdog_wording_Xingyu.Wu' into 'jh7110-5.15.y-devel'

CR 1458 timer watchdog wording xingyu.wu

See merge request sdk/linux!269

Merge branch 'CR_1455_PCIe_Kevin.xie' into 'jh7110-5.15.y-devel'

driver: pci: Add extended reset time for better compatibility

See merge request sdk/linux!273

Merge branch 'CR_1537_USB_515_mason.huo' into 'jh7110-5.15.y-devel'

usb: cdns3: Configuare phy as down-spread-spectrum

See merge request sdk/linux!253

Merge branch 'CR_1480_7110_evb_5.15_mipitx_shengyang.chen' into 'jh7110-5.15.y-devel'

riscv:linux:drm:mipidsi

See merge request sdk/linux!265

Merge branch 'CR_1383_v4l2_pipeline_515_changhuang.liang' into 'jh7110-5.15.y-devel'

v4l2: delete csiphy1 and csi1 subdev

See merge request sdk/linux!255

Merge branch 'CR_1496_DRM_mipi_hdmi_colorIssue_keith.zhao' into 'jh7110-5.15.y-devel'

riscv:driver:drm:DC8200

See merge request sdk/linux!271

Merge branch 'CR_1352_DRM_plane_overlay_515_Jack.Zhu' into 'jh7110-5.15.y-devel'

[VOUT][DRM]fix redmine #1352: disable plane overlay in close flow

See merge request sdk/linux!259

Merge branch 'CR_1427_I2C_hal.feng' into 'jh7110-5.15.y-devel'

Cr 1427 i2c hal.feng

See merge request sdk/linux!263

driver: pci: Add extended reset time for better compatibility

Signed-off-by: Kevin.xie <kevin.xie@starfivetech.com>

Merge branch 'CR_1563_v4l2_515_changhuang.liang' into 'jh7110-5.15.y-devel'

CR_1563_v4l2_515_changhuang.liang

See merge request sdk/linux!267

riscv:driver:drm:DC8200

1、fix issue #1496(#1320 is the same issue)

Signed-off-by:keith.zhao <keith.zhao@statfivetech.com>

clocksource: starfive: Update timer names

The existing implementation uses DT clock-names 'timer0', 'timer1' and etc
as timer names.  This will have issue if there are two timer instance IPs
in the system.

This patch update timer names to format below, example:
timer@13050000.ch0
timer@13050000.ch1
timer@13050000.ch2
timer@13050000.ch3

Signed-off-by: Ley Foon Tan <leyfoon.tan@linux.starfivetech.com>

dtsi:Add reset nodes about timer

Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com>

clocksource: starfive: Add reset control support

Reset the timer if the reset control is available.

Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com>
Signed-off-by: Ley Foon Tan <leyfoon.tan@linux.starfivetech.com>

dtsi:Update compatible string about timer

jh7110.dtsi:Update compatible string to "starfive,timers"

Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com>

dt-bindings: watchdog: starfive: Add StarFive watchdog

Add dt-bindigns documentation for StarFive watchdog.

Signed-off-by: Ley Foon Tan <leyfoon.tan@linux.starfivetech.com>

dt-bindings: timer: Add compatible for StarFive timer

Adds dt-binding documentation of timer for StarFive timer.

Signed-off-by: Ley Foon Tan <leyfoon.tan@linux.starfivetech.com>

watchdog: starfive: Change "si5" to "starfive"

Change all "si5" wording in driver to "starfive".
No functional change.

Signed-off-by: Ley Foon Tan <leyfoon.tan@linux.starfivetech.com>

clocksource: starfive: Update compatible string to "starfive,timers"

Update compatible string to "starfive,timers".

Signed-off-by: Ley Foon Tan <leyfoon.tan@linux.starfivetech.com>

clocksource: Kconfig: starfive: Update StarFive timer help description

Same StarFive timer IP is used in JH8100 SoC. Remove JH71xx wording from
description to be more generic.

Signed-off-by: Ley Foon Tan <leyfoon.tan@linux.starfivetech.com>

v4l2: modify bus_info

riscv:linux:drm:mipidsi

fix mipi display color problem

Signed-off-by:shengyang.chen<shengyang.chen@starfivetech.com>

drm: verisilicon: inno_hdmi: Fix an i2c failure during kernel startup

Signed-off-by: Hal Feng <hal.feng@starfivetech.com>

[VOUT][DRM]fix redmine #1352: disable plane overlay in close flow

Merge branch 'CR_1534_gpiomon_jianlong' into 'jh7110-5.15.y-devel'

CR_1534 pinctrl: starfive: Fix gpiomon erro

See merge request sdk/linux!249

Merge branch 'CR_1346_PWM_hal.feng' into 'jh7110-5.15.y-devel'

Cr 1346 pwm hal.feng

See merge request sdk/linux!257

pwm: pwm-starfive-ptc: Improve pwm accuracy

Signed-off-by: Hal Feng <hal.feng@starfivetech.com>

Merge branch 'CR_1490_7110_evb_5.15_mipitx_shengyang.chen' into 'jh7110-5.15.y-devel'

riscv:linux:vout:m31

See merge request sdk/linux!250

usb: cdns3: Configuare phy as down-spread-spectrum

The default phy spread-spectrum mode is up-spread-spectrum,
which is violated the usb3 spec.
The up-spread-spectrum mode leads to phy buffers overrun.

Signed-off-by: mason.huo <mason.huo@starfivetech.com>

v4l2: delete csiphy1 and csi1 subdev

Signed-off-by: changhuang.liang <changhuang.liang@starfivetech.com>

Merge branch 'CR_1311_CPUIdle_mason.huo' into 'jh7110-5.15.y-devel'

Cr 1311 cpu idle mason.huo

See merge request sdk/linux!247

riscv:linux:vout:m31

fix 'NULL device' printing problem in console

Signed-off-by:shengyang.chen<shengyang.chen@starfivetech.com>

pinctrl: starfive: Fix gpiomon erro
If enable CONFIG_PM, 'pm_runtime_get_sync' will return erro

Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com>

pwm: pwm-starfive-ptc: Improve coding style

Disable clock properly, delete redundant comments, modify compatible

Signed-off-by: Hal Feng <hal.feng@starfivetech.com>

riscv: dts: starfive: Modify the compatible of pwm(ptc) driver

Signed-off-by: Hal Feng <hal.feng@starfivetech.com>

Merge branch 'CR_1468_I2C_Kevin.xie' into 'jh7110-5.15.y-devel'

dts: starfive: Set static i2c bus number

See merge request sdk/linux!244

dts: starfive: Set static i2c bus number

Signed-off-by: Kevin.xie <kevin.xie@starfivetech.com>

riscv: dts: Add the cpuidle states

Add four cpuidle states per the dt binding document.

Signed-off-by: mason.huo <mason.huo@starfivetech.com>

riscv: deconfig: Enable the riscv cpuidle config

Signed-off-by: mason.huo <mason.huo@starfivetech.com>

riscv: Add the make function for SBI version

After cherry pick the riscv cpuidle driver,
there is a compilation error due to lack of
sbi_mk_version(); add it manually.

Signed-off-by: mason.huo <mason.huo@starfivetech.com>

dt-bindings: Add common bindings for ARM and RISC-V idle states

The RISC-V CPU idle states will be described in under the
/cpus/idle-states DT node in the same way as ARM CPU idle
states.

This patch adds common bindings documentation for both ARM
and RISC-V idle states.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Guo Ren <guoren@kernel.org>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

cpuidle: Add RISC-V SBI CPU idle driver

The RISC-V SBI HSM extension provides HSM suspend call which can
be used by Linux RISC-V to enter platform specific low-power state.

This patch adds a CPU idle driver based on RISC-V SBI calls which
will populate idle states from device tree and use SBI calls to
entry these idle states.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Acked-by: Atish Patra <atishp@rivosinc.com>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

cpuidle: Factor-out power domain related code from PSCI domain driver

The generic power domain related code in PSCI domain driver is largely
independent of PSCI and can be shared with RISC-V SBI domain driver
hence we factor-out this code into dt_idle_genpd.c and dt_idle_genpd.h.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

RISC-V: Add SBI HSM suspend related defines

We add defines related to SBI HSM suspend call and also
update HSM states naming as-per latest SBI specification.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Guo Ren <guoren@kernel.org>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: mason.huo <mason.huo@starfivetech.com>

RISC-V: Add arch functions for non-retentive suspend entry/exit

The hart registers and CSRs are not preserved in non-retentative
suspend state so we provide arch specific helper functions which
will save/restore hart context upon entry/exit to non-retentive
suspend state. These helper functions can be used by cpuidle
drivers for non-retentive suspend entry/exit.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Guo Ren <guoren@kernel.org>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: mason.huo <mason.huo@starfivetech.com>

RISC-V: Rename relocate() and make it global

The low-level relocate() function enables mmu and relocates
execution to link-time addresses. We rename relocate() function
to relocate_enable_mmu() function which is more informative.

Also, the relocate_enable_mmu() function will be used in the
resume path when a CPU wakes-up from a non-retentive suspend
so we make it global symbol.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Guo Ren <guoren@kernel.org>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

RISC-V: Enable CPU_IDLE drivers

We force select CPU_PM and provide asm/cpuidle.h so that we can
use CPU IDLE drivers for Linux RISC-V kernel.

Starfive: Add deconfig for starfive jh7110

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Signed-off-by: Anup Patel <apatel@vetanamicro.com>
Reviewed-by: Guo Ren <guoren@kernel.org>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: mason.huo <mason.huo@starfivetech.com>

Merge branch 'CR_1479_DRM_tda_driver_keith.zhao' into 'jh7110-5.15.y-devel'

Cr 1470 drm tda driver keith.zhao

See merge request sdk/linux!243

Merge branch 'CR_1274_SEC_william.qiu' into 'jh7110-5.15.y-devel'

crypto:starfive:remove sha warning log

See merge request sdk/linux!242