Commit Graph

111547 Commits

Author SHA1 Message Date
Cai YiWei
8d5c287ddb media: rockchip: isp/ispp to version v1.3.0
Change-Id: I27d24dcdea7eeefba4287ffa71c7ca509fd2e194
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-12-24 11:48:51 +08:00
Allon Huang
dc2948f279 media: rockchip: cif: add dvp sof
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ibda8e3de56baaa32cb74fa179c3706c5d3a87d96
2020-12-23 16:02:04 +08:00
YouMin Chen
19f9ea4b8e dt-bindings: clock: rk3568-cru: add clock ID SCLK_DDRCLK
Change-Id: Ie029065bda4de0fb764acf328c058c545c4176d6
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-12-23 12:53:49 +08:00
Algea Cao
c0a543e874 drm: rockchip: rk628: Add rk628 hdmirx driver
Change-Id: If4d9fefeada220430f9b6a5b3a35a20239461d3e
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2020-12-23 11:28:11 +08:00
Sudeep Holla
e80884e89e BACKPORT: firmware: smccc: Drop smccc_version enum and use ARM_SMCCC_VERSION_1_x instead
Instead of maintaining 2 sets of enums/macros for tracking SMCCC version,
let us drop smccc_version enum and use ARM_SMCCC_VERSION_1_x directly
instead.

This is in preparation to drop smccc_version here and move it separately
under drivers/firmware/smccc.

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Tested-by: Etienne Carriere <etienne.carriere@st.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Reviewed-by: Etienne Carriere <etienne.carriere@st.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20200518091222.27467-5-sudeep.holla@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
(cherry picked from commit ad5a57dfe4)

Change-Id: I8b3625d3adbaea003c1dadcbc028c62a2f4f59ba
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2020-12-23 09:55:29 +08:00
William Wu
924ae9b9ea usb: gadget: add transfer_type in struct usb_ep for rockchip
The usb gadget core set the chosen endpoint descriptor for
each endpoints in config_ep_by_speed(), however, we want
to get the transfer type of the endpoints earlier on the
rockchip platforms for usb controller initialization
(e.g. do tx fifos resize for rockchip usb dwc3 controller),
so this patch add transfer_type in the struct usb_ep, and
set the transfer_type in the usb_ep_autoconfig_ss().

Change-Id: Ia2added218e180dda7a7ca5da09ee18d63be1ff0
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-12-22 18:44:44 +08:00
Cai YiWei
4ff60a36b2 media: rockchip: isp: extend line to fix merge bypass bug for isp20
Change-Id: Ia1ed6a885cffd55859dcec5ad35f22b99d506336
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-12-22 18:13:34 +08:00
Lukasz Luba
c373c1f0ae UPSTREAM: include: trace: Add SCMI header with trace events
Adding trace events would help to measure the speed of the communication
channel. It can be also potentially used helpful during investigation
of some issues platforms which use different transport layer.

Update also MAINTAINERS file with information that the new trace events
are maintained.

Suggested-by: Jim Quinlan <james.quinlan@broadcom.com>
Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
(cherry picked from commit 257d0e20ec)

Change-Id: I4349c71a5c2efdb2be06fef4e82750facc81d55a
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2020-12-22 15:54:10 +08:00
Steven Price
b93145dca3 UPSTREAM: arm/arm64: Provide a wrapper for SMCCC 1.1 calls
SMCCC 1.1 calls may use either HVC or SMC depending on the PSCI
conduit. Rather than coding this in every call site, provide a macro
which uses the correct instruction. The macro also handles the case
where no conduit is configured/available returning a not supported error
in res, along with returning the conduit used for the call.

This allow us to remove some duplicated code and will be useful later
when adding paravirtualized time hypervisor calls.

Signed-off-by: Steven Price <steven.price@arm.com>
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
(cherry picked from commit 541625ac47)

Change-Id: I870c88fae413a0d46c242f840938e1a3578a942f
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2020-12-22 15:54:09 +08:00
Mark Rutland
62eb270452 UPSTREAM: arm/arm64: smccc/psci: add arm_smccc_1_1_get_conduit()
SMCCC callers are currently amassing a collection of enums for the SMCCC
conduit, and are having to dig into the PSCI driver's internals in order
to figure out what to do.

Let's clean this up, with common SMCCC_CONDUIT_* definitions, and an
arm_smccc_1_1_get_conduit() helper that abstracts the PSCI driver's
internal state.

We can kill off the PSCI_CONDUIT_* definitions once we've migrated users
over to the new interface.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 6b7fe77c33)

Change-Id: I4e2d92b6f641eedc759b2f7a7e1c576a7935b8b2
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2020-12-22 15:54:09 +08:00
Sudeep Holla
0d0070c028 UPSTREAM: firmware: arm_scmi: Add support for multiple device per protocol
Currently only one scmi device is created for each protocol enumerated.
However, there is requirement to make use of some procotols by multiple
kernel subsystems/frameworks. One such example is SCMI PERFORMANCE
protocol which can be used by both cpufreq and devfreq drivers.
Similarly, SENSOR protocol may be used by hwmon and iio subsystems,
and POWER protocol may be used by genpd and regulator drivers.

In order to achieve that, let us extend the scmi bus to match based
not only protocol id but also the scmi device name if one is available.

Reviewed-by: Cristian Marussi <cristian.marussi@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
(cherry picked from commit ee7a9c9f67)

Change-Id: Ia371408eb8e2b26c0b3b39de9ed86baa3d2f87b9
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2020-12-22 15:54:09 +08:00
YouMin Chen
ad4ff95560 PM / devfreq: rockchip_dmc: add support for rk3568
Change-Id: I64f11fefb6227805031e911910a0123e4c0f9d78
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-12-22 15:37:47 +08:00
YouMin Chen
8a4608928a dt-bindings: memory: add header to define DRAM for rk3568
Change-Id: I3f5218a6babf2e4a6d58eb9b8680911875c1f5de
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-12-22 15:25:28 +08:00
Cai YiWei
77d310cf85 Revert "HACK: media: videobuf2: allow cache hints on all memory types"
This reverts commit a7b55392ab.

Signed-off-by: Cai YiWei <cyw@rock-chips.com>
Change-Id: I6eacd69327e0b64d36c8d7c69dd1f0a51ce3480a
2020-12-17 14:58:08 +08:00
Xu Hongfei
d610b5b0ce media: rockchip: isp/ispp to version v1.2.2
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
Change-Id: Ief6e5362117a85949e16949db70832ea309a6e99
2020-12-16 17:45:48 +08:00
Hu Kejun
7c3cdfb472 media: rockchip: isp/ispp: support output isp/ispp reg on each frame
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Idff87c8af4e5a097e9279ea7a0247941246fec50
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
2020-12-15 10:05:25 +08:00
Elaine Zhang
0657602584 clk: rockchip: rk3568: export cpll_xxx clk id for more function
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I5f310f9b857623a5a204ab9b5f0a4befde894684
2020-12-07 09:18:27 +08:00
Cai YiWei
9617022c24 media: rockchip: ispp: fec extend to independent video
CONFIG_VIDEO_ROCKCHIP_ISPP_FEC to enable this function

Change-Id: I4baae13964f2f99df9ae19d5160f06610bcfa308
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-12-01 17:38:45 +08:00
Simon Xue
1967ba803d BACKPORT: PCI: dwc: Centralize link gen setting
keystone would force gen2 if no DT property. Now it relies on the
PCI_EXP_LNKCAP value.

Change-Id: I055e2ac26947caedc0cac93a535116d655d522f6
Link: https://lore.kernel.org/r/20200821035420.380495-35-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Richard Zhu <hongxing.zhu@nxp.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: Murali Karicheri <m-karicheri2@ti.com>
Cc: Jingoo Han <jingoohan1@gmail.com>
Cc: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
Cc: Stanimir Varbanov <svarbanov@mm-sol.com>
Cc: Andy Gross <agross@kernel.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Pratyush Anand <pratyush.anand@gmail.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-arm-msm@vger.kernel.org
Cc: linux-tegra@vger.kernel.org
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
(cherry picked from commit 39bc500650)
2020-12-01 17:13:20 +08:00
Finley Xiao
3256732d55 clk: rockchip: rv1126: Add CLK_32K_IOE support
Add clk_32k_ioe to select 32k io as input or output.

Change-Id: I2c32af4bded53c91280a0dbbd54af17f2f90e843
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-11-30 17:37:45 +08:00
Algea Cao
d77feca3b9 mfd: Add RK630 mfd driver
Change-Id: I03c127df4ec2ad80cbaf4b0d4ad540cb5b32a245
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2020-11-24 14:39:11 +08:00
Wang Jie
31342a8e46 input: sensor: add ak09918 driver
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
Change-Id: Ie17abdb127d8605850b9132e96cb450fe8af96c1
2020-11-24 09:09:47 +08:00
Wang Jie
cc2cea6a8a input: sensor: add em3071x driver
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
Change-Id: Ie71bf633a673d063f7275635b765cb200bc3722b
2020-11-23 19:22:32 +08:00
Wang Jie
63e9e260e9 input: sensor: add icm2060x driver
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
Change-Id: Icd7e7d09fa0d25e48b999ee99c3bebb6570e18bf
2020-11-23 15:58:27 +08:00
Wyon Bi
962c917b1d drm/rockchip: analogix_dp: Add audio support
Change-Id: Ib611037f497a0758bd2b6a312155562a719fe15f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-11-20 18:06:09 +08:00
Zorro Liu
17e3503627 include: rk_vendor_storage: add EINK_VCOM_ID
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: Iead6e262505c2eb261ca950b3990c3a8f72017af
2020-11-20 14:34:04 +08:00
David Wu
fe5bc84edd include: linux: soc: rockchip: Add rgmii delayline id
Add rgmii delayline id, which we can store and read delayline
of rgmii at vendor storage.

Change-Id: If97a76d706136bb43432688237980e9760b1b5f0
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-11-20 14:12:55 +08:00
Elaine Zhang
e13a0ea1af clk: rockchip: rk3568: export SCLK_32K_IOE clock id
Add clk_32k_ioe to select 32k io as input or output.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I8347b34b43244b1dca0217d9af56fcf9c414d18e
2020-11-18 15:18:26 +08:00
Lee Jones
35dbcb55c6 UPSTREAM: regulator: consumer: Supply missing prototypes for 3 core functions
regulator_suspend_enable(), regulator_suspend_disable() and
regulator_set_suspend_voltage() are all exported members of the
API, but are all missing prototypes.

Fixes the following W=1 warning(s):

 drivers/regulator/core.c:3805:5: warning: no previous prototype for ‘regulator_suspend_enable’ [-Wmissing-prototypes]
 3805 | int regulator_suspend_enable(struct regulator_dev *rdev,
 | ^~~~~~~~~~~~~~~~~~~~~~~~
 drivers/regulator/core.c:3812:5: warning: no previous prototype for ‘regulator_suspend_disable’ [-Wmissing-prototypes]
 3812 | int regulator_suspend_disable(struct regulator_dev *rdev,
 | ^~~~~~~~~~~~~~~~~~~~~~~~~
 drivers/regulator/core.c:3851:5: warning: no previous prototype for ‘regulator_set_suspend_voltage’ [-Wmissing-prototypes]
 3851 | int regulator_set_suspend_voltage(struct regulator *regulator, int min_uV,
 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Change-Id: I1ccdd34e5a7c42976472a00b4b17547bd741509e
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20200625163614.4001403-2-lee.jones@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit da6690767c)
2020-11-17 11:24:32 +08:00
Allon Huang
3e3dd37a46 media: rockchip: cif: support rk3568 vicap
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: If78619cd89ebc1e586a940fd7fac02cea21f0124
2020-11-16 17:15:18 +08:00
Hu Kejun
ff78b5290b media: rockchip: isp: support iq part of isp21
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I2c2354c9e8ae590c907d5357803cd702c90e9577
2020-11-16 17:04:59 +08:00
Hu Kejun
2e434d977b media: rockchip: isp: add head file for isp21
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I3f6217cdae06e45412dcb284c32d3f1a4927f402
2020-11-16 17:04:59 +08:00
Linus Walleij
ea25234920 BACKPORT: power: supply: gpio-charger: Convert to GPIO descriptors
This converts the GPIO charger to use exclusively GPIO
descriptors, moving the two remaining platforms passing
global GPIO numbers over to using a GPIO descriptor table.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

 Conflicts:
	arch/arm/mach-pxa/tosa.c
        arch/arm/mach-sa1100/collie.c
        drivers/power/supply/gpio-charger.c

(cherry picked from commit 17529bcf0a)
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I22fb3dc7d42163d7a715d219665a14474cdd7422
2020-11-16 16:24:30 +08:00
Sugar Zhang
07b7fc9e85 ASoC: rockchip: Add support for Voice Activity Detection
This patch replace codec to component.

Change-Id: I6ae63b4d36f2f9b24f0fdf352fdc385ec425b330
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-13 17:07:49 +08:00
Cai YiWei
0ae73e8272 media: rockchip: isp/ispp to version v1.2.1
Change-Id: Ia371119cd091dbbad1d7c7bd9ab8806f9d755614
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-11-13 11:42:50 +08:00
Xu Hongfei
cf9f0f7046 Revert "media: rockchip: isp: set lgmean related regs for tmo in hdr isr"
This reverts commit ce801a9bb6.

Change-Id: Idfe306735460be39bda996e4a7996bb0e3a03bff
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
2020-11-13 10:43:34 +08:00
Elaine Zhang
7e7e372271 dt-bindings: clock: rk3568: update the pcie soft reset id
Updates missing parts of the TRM.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ia24cd2986f7b0f11884260132aa4f5782eb58c52
2020-11-12 18:23:05 +08:00
Elaine Zhang
23dfbd105e clk: rockchip: rk3568 export clk id CPLL_333M
cpll_333m need change rate by ebc.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I39cf3b436d0822c5e9be74f0fa181a74960c3e57
2020-11-12 17:28:31 +08:00
Xu Hongfei
ce801a9bb6 media: rockchip: isp: set lgmean related regs for tmo in hdr isr
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
Change-Id: I82cb63cff85e8b137a7b765601e57a8da0f99705
2020-11-10 18:49:40 +08:00
Sugar Zhang
b2b6762e9a clk: rockchip: rk3568: Export id for CLK_I2Sx MUX
Change-Id: I19245516504c06a4bc484cc4b20816ba9490c4fc
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-10 14:44:39 +08:00
Elaine Zhang
3ea0c615c9 dt-bindings: clock: rk3568: fix up the clk_hdmic_cec id repeat definition
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I2ec34d4c27d6b8dbac884fa01bcd66a2918b59ad
2020-11-10 14:36:54 +08:00
Wyon Bi
d7ad116fb3 drm/rockchip: analogix_dp: Add support for rk3568
This patch adds support for Analogix eDP TX IP used on RK3568 SoC.

Change-Id: Ieb89906cba5bc569ed8c476fecd00f6035a7f582
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-11-10 14:31:55 +08:00
Yuti Amonkar
c5771fc0a5 UPSTREAM: phy: Add DisplayPort configuration options
Allow DisplayPort PHYs to be configured through the generic
functions through a custom structure added to the generic union.
The configuration structure is used for reconfiguration of
DisplayPort PHYs during link training operation.

The parameters added here are the ones defined in the DisplayPort
spec v1.4 which include link rate, number of lanes, voltage swing
and pre-emphasis.

Add the DisplayPort phy mode to the generic phy_mode enum.

Change-Id: Id68cbd69c0938bd64402b8af7b6b37b168472848
Signed-off-by: Yuti Amonkar <yamonkar@cadence.com>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Reviewed-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
(cherry picked from commit 42d068472d)
2020-11-10 12:53:05 +08:00
Maxime Ripard
2c1bae131a UPSTREAM: phy: Add MIPI D-PHY configuration options
Now that we have some infrastructure for it, allow the MIPI D-PHY phy's to
be configured through the generic functions through a custom structure
added to the generic union.

The parameters added here are the ones defined in the MIPI D-PHY spec, plus
the number of lanes in use. The current set of parameters should cover all
the potential users.

Change-Id: Ie5a12064ba59a1a2c8628bd34c4c2b4996559ec3
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
(cherry picked from commit 2ed869990e)
2020-11-10 12:53:05 +08:00
Maxime Ripard
01503fa839 UPSTREAM: phy: Add configuration interface
The phy framework is only allowing to configure the power state of the PHY
using the init and power_on hooks, and their power_off and exit
counterparts.

While it works for most, simple, PHYs supported so far, some more advanced
PHYs need some configuration depending on runtime parameters. These PHYs
have been supported by a number of means already, often by using ad-hoc
drivers in their consumer drivers.

That doesn't work too well however, when a consumer device needs to deal
with multiple PHYs, or when multiple consumers need to deal with the same
PHY (a DSI driver and a CSI driver for example).

So we'll add a new interface, through two funtions, phy_validate and
phy_configure. The first one will allow to check that a current
configuration, for a given mode, is applicable. It will also allow the PHY
driver to tune the settings given as parameters as it sees fit.

phy_configure will actually apply that configuration in the phy itself.

Change-Id: I252cb7733740a28728e9ff228cba9a6b407b1b07
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
(cherry picked from commit aeaac93ddb)
2020-11-10 12:53:05 +08:00
Elaine Zhang
925dc1b993 clk: rockchip: rk3568: update the pmucru ref clk
Pmucru updates missing parts of the TRM.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Idee0b51064c7579dfaeb03118e9d1eaae716d9e7
2020-11-09 10:02:51 +08:00
William Wu
2f07a1986d usb: gadget: f_uac: add volume and mute feature unit
This patch adds feature unit descriptor for f_uac1 and f_uac2,
and supports volume control and mute control for capture and
playback.

By default, the volume and mute feature unit descriptors are NOT
add in the UAC descriptor. The user can define whether the UAC1/
UAC2 shall support volume and mute functionality via the attributes
c_feature_unit/p_feature_unit in the UAC function directory.

For example, user can add the volume and mute feature unit descriptors
for UAC1 capture and playback:

echo 1 > /config/usb-gadget/gadget/functions/uac1.name/c_feature_unit
echo 1 > /config/usb-gadget/gadget/functions/uac1.name/p_feature_unit

This patch also adds uevents for volume and mute functionality. The
user can complete the real volume and mute control functionality in
the user space depends on these new uevents (like the uac_app in the
RV1126/RV1109 SDK).

Change-Id: I76d447a19fd69e038851040cd73e6c7d420f467d
Signed-off-by: William Wu <william.wu@rock-chips.com>
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
2020-11-08 19:19:07 +08:00
Sean Paul
8d7cdbbea2 UPSTREAM: drm: Describe pixel_blend_mode in drm_plane_state
Adds docs for pixel_blend_mode in drm_plane_state. Fixes the warning
found by kbuild test robot:

htmldocs: include/drm/drm_plane.h:189: warning: Function parameter or member 'pixel_blend_mode' not described in 'drm_plane_state'

Change-Id: Ife448dca43ae262ecfccf312fe94142f0eaac5e0
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Lowry Li <lowry.li@arm.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180831150934.202332-1-sean@poorly.run
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit b972cece94)
2020-11-05 18:55:12 +08:00
Lowry Li
e254a8b9df BACKPORT: drm: Add per-plane pixel blend mode property
Pixel blend modes represent the alpha blending equation
selection, describing how the pixels from the current
plane are composited with the background.

Adds a pixel_blend_mode to drm_plane_state and a
blend_mode_property to drm_plane, and related support
functions.

Defines three blend modes in drm_blend.h.

Changes since v1:
 - Moves the blending equation into the DOC comment
 - Refines the comments of drm_plane_create_blend_mode_property to not
   enumerate the #defines, but instead the string values
 - Uses fg.* instead of pixel.* and plane_alpha instead of plane.alpha
Changes since v2:
 - Refines the comments of drm_plane_create_blend_mode_property:
      1) Puts the descriptions (after the ":") on a new line
      2) Adds explaining why @supported_modes need PREMUL as default
Changes since v3:
 - Refines drm_plane_create_blend_mode_property(). drm_property_add_enum()
   can calculate the index itself just fine, so no point in having the
   caller pass it in.
 - Since the current DRM assumption is that alpha is premultiplied
   as default, define DRM_MODE_BLEND_PREMULTI as 0 will be better.
 - Refines some comments.
Changes since v4:
 - Adds comments in drm_blend.h.
 - Removes setting default value in drm_plane_create_blend_mode_property()
   as it is already in __drm_atomic_helper_plane_reset().
 - Fixes to use state->pixel_blend_mode instead of using
   plane->state->pixel_blend_mode in reset function.
 - Rebases on drm-misc-next.

Change-Id: I021908dc42aef01e4b7c70f99904ccabffa4adfe
Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Lowry Li <lowry.li@arm.com>
Signed-off-by: Ayan Kumar Halder <ayan.halder@arm.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/245734/
(cherry picked from commit a5ec8332d4)
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-05 18:54:32 +08:00
Tao Huang
439d4e9999 Merge tag 'ASB-2020-11-05_4.19-stable' of https://android.googlesource.com/kernel/common
https://source.android.com/security/bulletin/2020-11-01
CVE-2020-0423

* tag 'ASB-2020-11-05_4.19-stable': (529 commits)
  ANDROID: GKI: Enable DEBUG_INFO_DWARF4
  UPSTREAM: mm/sl[uo]b: export __kmalloc_track(_node)_caller
  BACKPORT: xfrm/compat: Translate 32-bit user_policy from sockptr
  BACKPORT: xfrm/compat: Add 32=>64-bit messages translator
  UPSTREAM: xfrm/compat: Attach xfrm dumps to 64=>32 bit translator
  UPSTREAM: xfrm/compat: Add 64=>32-bit messages translator
  BACKPORT: xfrm: Provide API to register translator module
  ANDROID: Publish uncompressed Image on aarch64
  FROMLIST: crypto: arm64/poly1305-neon - reorder PAC authentication with SP update
  UPSTREAM: crypto: arm64/chacha - fix chacha_4block_xor_neon() for big endian
  UPSTREAM: crypto: arm64/chacha - fix hchacha_block_neon() for big endian
  Linux 4.19.154
  usb: gadget: f_ncm: allow using NCM in SuperSpeed Plus gadgets.
  eeprom: at25: set minimum read/write access stride to 1
  USB: cdc-wdm: Make wdm_flush() interruptible and add wdm_fsync().
  usb: cdc-acm: add quirk to blacklist ETAS ES58X devices
  tty: serial: fsl_lpuart: fix lpuart32_poll_get_char
  net: korina: cast KSEG0 address to pointer in kfree
  ath10k: check idx validity in __ath10k_htt_rx_ring_fill_n()
  scsi: ufs: ufs-qcom: Fix race conditions caused by ufs_qcom_testbus_config()
  ...

Change-Id: I797efa1149f557c1dfab7856813cc40d1a4d60b2

Conflicts:
	drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
	mm/page_alloc.c
2020-11-03 18:36:42 +08:00