shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,073,759 Commits 55 Branches 2,486 Tags
d76034d182e734a4bae93fe71b137ca89a408d3e
Commit Graph

1073759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Huang
d76034d182 Partially revert "clk: rockchip: support setting ddr clock via SCPI and SIP Version 2 APIs" 
This partially reverts commit d2b92a90ea.

Remove SCPI support.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I8104fec7d3c39870fa62835fc08d7fc53c45bb53
 2023-02-24 21:11:27 +08:00
Tao Huang
ccf392b755 Revert "PM / devfreq: rockchip_dmc: add support for rk3368" 
This reverts commit 3aacbd51b7.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2b72f87b15dab04a34ad796bd16dbba70833c16e
 2023-02-24 21:06:10 +08:00
Tao Huang
8c58646774 Revert "linux os can config sleep mode" 
This reverts commit c8dc70ee04.

Remove unused driver.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iaacb3264ee3a1ea47cccc4a1931d34bb6095397a
 2023-02-24 21:06:10 +08:00
Tao Huang
80710dd8e7 Revert "arm64: dts: rk3368: add dfi and dmc device nodes" 
This reverts commit af1dedb54c.

Remove unused driver.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I7869123d27356bb88c09dea08b348713c3147eea
 2023-02-24 21:06:10 +08:00
Tao Huang
085b39ca18 Revert "rk3368 dts: add ddr timing node in rk3368.dtsi" 
This reverts commit 8be554a502.

Remove unused driver.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I229ef6acb813f640f6b7f65e06d4d71a49e52839
 2023-02-24 21:06:09 +08:00
Tao Huang
ac127f231b Revert "thermal: rockchip: add rk3368 support" 
This reverts commit fa07761ac3.

Remove unused driver.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I25f8a09532781c65c27bba0b3553cfe1539e77bb
 2023-02-24 21:05:56 +08:00
Tao Huang
be50b5edcb Revert "RK3368 GPU: Rogue N Init." 
This reverts commit 418c01275a.

Remove unused driver.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I8f7efe30eb9c8cc356ffca8cc198882e62b07360
 2023-02-24 21:05:56 +08:00
Jon Lin
efc029bba1 mtd: spi-nor: esmt: Support new devices 
en25qh128, en25s64, en25qh256a, en25qx256a

Change-Id: I168292cab499644970822f18daf11c0edc51d6a8
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2023-02-24 20:25:53 +08:00
Tao Huang
19e64be07f Revert "hid: add usb hid driver for rockchip discrete vr device." 
This reverts commit bb21b20985.

Remove unused RKVR driver.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I7553897b60c9d8159129a009c6e4f5ab09b6ec94
 2023-02-24 17:00:00 +08:00
Tao Huang
6269d536a3 Revert "ALSA: usb-audio: add USB ID for nanoc audio codec" 
This reverts commit 45c518d6ca.

Remove unused RKVR driver.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1220abd811b4ec8c416758ca3ae00b438ff215c0
 2023-02-24 16:57:52 +08:00
Tao Huang
ef69122250 Revert "ALSA: usb-audio: fix disvr usb Audio bug" 
This reverts commit 7aac3b4eef.

Remove unused RKVR driver.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I6f4531ba4b13d876feebf5ac1fd12e254099a6d1
 2023-02-24 16:57:46 +08:00
Simon Xue
85623ff322 arm64: mm: Try to fix alignment faults 
Change-Id: I7ceba0ae2270b95d42eb1c8f13c0ff605429283e
Signed-off-by: Simon Xue <xxm@rock-chips.com>
 2023-02-23 19:54:57 +08:00
Cai YiWei
560194a6c5 media: rockchip: isp: fix sensor off to enable reset 
Change-Id: If167d6f6f2928a554df42eab691406428d69f281
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-02-23 17:31:43 +08:00
Simon Xue
ed2c9c09f4 dma-buf: dma-buf-cache: fix concurrency issue 
The same dma-buf may attach/map on different cpu at the same time,
this lead to concurrency issue. Add mutex lock to make dma-buf-cache
thread-safe

		cpu1					cpu2
		|					|
	dma_buf_cache_map_attachment		dma_buf_cache_map_attachment
		|					|
	dma_buf_map_attachment			dma_buf_map_attachment
		|					|
	system_heap_map_dma_buf			system_heap_map_dma_buf
		|					|
	iommu_dma_map_sg			iommu_dma_map_sg
		|					|
	__finalise_sg				__finalise_sg
		|					|
	sg_dma_address(sg) = iova1			|
		|					|
	cache->sg_table = sg_table		sg_dma_address(sg) = iova2 + iova1

after add mutex lock

		cpu1					cpu2
		|					|
	dma_buf_cache_map_attachment		dma_buf_cache_map_attachment
		|					|
	mutex_lock				mutex_lock
		|					|
	dma_buf_map_attachment			return cache->sg_table
		|					|
	system_heap_map_dma_buf			mutex_unlock
		|
	iommu_dma_map_sg
		|
	__finalise_sg
		|
	sg_dma_address(sg) = iova1
		|
	cache->sg_table = sg_table
		|
	mutex_unlock

Change-Id: I2e08dafe61668ce35467b2c3b074f132f08ed6ba
Signed-off-by: Simon Xue <xxm@rock-chips.com>
 2023-02-23 10:22:23 +08:00
Liang Chen
224d1104e7 arm64: dts: rockchip: rk3562: adjust opp-table by pvtm 
Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: Iee7a75ef75533bc842f3e2b2bc1f1798a3694ad2
 2023-02-21 19:56:36 +08:00
Cai YiWei
57bbb677f4 media: rockchip: isp: luma stream resolution alignment 
Change-Id: If90d5d50dc1e55f28fd077c3651f65240c1010c0
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-02-23 09:41:09 +08:00
Liang Chen
7702078207 thermal: rockchip: register thermal driver early 
The voltage level of opp-table depend on thermal driver.

Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: Id51106a0676cac38027e901d9c30832aba39d8a5
 2023-02-21 17:49:00 +08:00
Binyuan Lan
5071891c17 arm64: dts: rockchip: rk3562-evb: fix uart_rts_gpios 
Change-Id: Ib90f1ab7cc62a6cf88ec79bec4ac2a68d26b17b6
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
 2023-02-22 17:16:54 +08:00
Sandy Huang
271f493d1b drm/rockchip: vop3: update ygt2/4 triger condition for rk3528 
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I21768d3aa506a116964084dc0ee09ff68e838fa4
 2023-02-22 17:08:03 +08:00
Shawn Lin
4cf8e604eb ARM: dts: rockchip: rk3128-evb-ddr3-v10-linux: Fix sdmmc 
sdmmc card wasn't functional at all as some properties copied from
old kernel can't work any more.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ib1deb1d5387bbca0e3be22c3175f301005bcee1d
 2023-02-22 16:48:29 +08:00
Shawn Lin
8c62deaf60 ARM: dts: rockchip: rk3128: redefine sdmmc_pwren as GPIO function 
For rk3128 reference design, sdmmc_pwren is used as a GPIO.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: If954337fe87da85eb7a088714ac6b0a5777c3cb7
 2023-02-22 16:37:46 +08:00
Wyon Bi
9014f0d9cb drm/rockchip: dw-dp: Add support for drm_panel usage 
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I84545b8465541baf67f62f1deee5a9238a0f89be
 2023-02-22 16:06:08 +08:00
Shawn Lin
47c8b6bf38 ARM: dts: rockchip: rk312x: Update sdmmc node 
Some properties have been removed or modified as kernel upgraded.
And add sdmmc_det for rk3128 since rk3128 can use functional det.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I256bedb66a1fbf61fdcf40ff9034f69755642b05
 2023-02-22 15:53:46 +08:00
Yandong Lin
9b9ba0dcc7 video: rockchip: mpp: fix rkvdec2 link info err 
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I1f224fa7a8c050f5a782baef7d0bdd6920fad753
 2023-02-22 15:21:48 +08:00
Finley Xiao
4bfb57719d soc: rockchip: opp_select: Fix restricting voltage error 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ia4eb980c9b071b5b6bdb2fbb2229de6b17f65d8a
 2023-02-22 14:49:27 +08:00
Sugar Zhang
8b300934b1 arm64: dts: rockchip: rk3528: Set mclkin freq as 0 Hz default 
Use freq 0 Hz to represent the case which not used yet, and,
should assign the match freq as external mclk in if used.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ida01fcf9fb7c57db2de3d55c19a9bc80ac8fde97
 2023-02-22 14:33:46 +08:00
Sugar Zhang
cc54f72174 arm64: dts: rockchip: rk3588: Set mclkin freq as 0 Hz default 
Use freq 0 Hz to represent the case which not used yet, and,
should assign the match freq as external mclk in if used.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I0a731367a81a740df36af7552c7b6a353f9bd2f0
 2023-02-22 14:33:46 +08:00
Sugar Zhang
272ce0169e arm64: dts: rockchip: rk3562: Set mclkin freq as 0 Hz default 
Use freq 0 Hz to represent the case which not used yet, and,
should assign the match freq as external mclk in if used.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id8d39117ba477285a562e7fa7bf7b28edd5e9212
 2023-02-22 14:33:46 +08:00
Sandy Huang
a4309e65bb drm/rockchip: vop3: add cluster frame reset 
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I1d7d590ea91c0864cebe11066780789078960120
 2023-02-22 11:34:50 +08:00
Joseph Chen
aec5968aad clk: rockchip: rk3528: Allow disable clk_400m_src 
There is not any child under clk_400m_src.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I23c96869f69e62ee3ada30d66ffc7b2482bcdd7f
 2023-02-22 03:00:57 +00:00
Elaine Zhang
d659377437 clk: rockchip: rk3128: fix up the sdmmc drv and sample set phase failed 
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I9e8b25c8f85594ee9c3e7d5d3e2d47ac05fdda94
 2023-02-22 11:00:22 +08:00
Sandy Huang
5dabd04f93 drm/rockchip: vop2: adjust writeback commit time 
adjust commit time from 1/8 to 7/8 scan timing when enable writeback;

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Iea0dd9e29b83399c1a0966e0c3ff68b861acd020
 2023-02-22 10:56:26 +08:00
Zefa Chen
0669486cd5 media: rockchip: vicap fixes tasklet error for vb_done 
Fixes: 824a24f4 ("media: rockchip: vicap use tasklet to done buf")

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I231edb728285c049e96cfd48b4dfb19b6d31bfe8
 2023-02-22 10:18:43 +08:00
Zefa Chen
2b6fcece05 media: rockchip: vicap: rk3562 add csirx data clk 
if not control csirx data clk, may cause vicap do cru reset fail

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I38bd186e8add2d3e7df1df527f3d02bf4e7d5d76
 2023-02-22 10:18:27 +08:00
Zefa Chen
e42f671447 arm64: dts: rockchip: rk3562: vicap add csirx data clk control 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I15baadf44db6c1325812b925e7ac84c636f6303c
 2023-02-22 10:18:27 +08:00
Sugar Zhang
0df0ba8a98 arm64: dts: rockchip: rk3528: Add SAIx_MCLK{OUT,IN} nodes 
e.g.

  mclkin_sai0: mclkin-sai0 {
      compatible = "fixed-clock";
      #clock-cells = <0>;
      clock-frequency = <12288000>;
      clock-output-names = "i2s0_mclkin";
  };

  mclkout_sai0: mclkout-sai0@ff340014 {
      compatible = "rockchip,clk-out";
      reg = <0 0xff340014 0 0x4>;
      clocks = <&cru MCLK_SAI_I2S0>;
      #clock-cells = <0>;
      clock-output-names = "mclk_sai0_to_io";
      rockchip,bit-shift = <1>;
      rockchip,bit-set-to-disable;
  };

Note:

clock-output-names of mclkin_sai0 should equal to strings in drivers. such as:

drivers/clk/rockchip/clk-rk3528.c:

PNAME(mclk_sai_i2s0_p)                  = { "mclk_i2s0_2ch_sai_src", "i2s0_mclkin" };
PNAME(mclk_sai_i2s1_p)                  = { "mclk_i2s1_8ch_sai_src", "i2s1_mclkin" };

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id7eef076aaa55d59beadfd340a513152727112f9
 2023-02-22 10:18:00 +08:00
Yandong Lin
3fb2e28edd video: rockchip: mpp: change the way to refresh the dma cache 
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I0a929cb896069d7bc4a782f19e2fde4de5dc58db
 2023-02-22 09:51:41 +08:00
Jon Lin
9cd6a5c06d drivers: rkflash: Support new devices 
Change-Id: Ieb7a1217a92d47581faf0ac3dfcd4db78b84f098
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2023-02-21 16:40:06 +08:00
Jon Lin
f0dbc8bbb0 drivers: rkflash: Support sfc ver6 and sfc ver8 
Change-Id: I21b11e414ab48c7b3ae7dd8e6ab9dc1e8bcadee6
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2023-02-21 16:39:22 +08:00
Sugar Zhang
5ba3ec652a ASoC: rockchip: mdais: Skip DAIs which have no channel mapping 
There is no need to start DAIs which have no channel mapping.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ia6be32d474845b9ecb443c38b6801e9836e8a77a
 2023-02-21 15:28:32 +08:00
Algea Cao
a93d8eea59 drm: bridge: dw-hdmi: Fix 1080p RGB/YUV444 10BIT display blur 
If set default phase to 1, 1080p RGB/YUV444 10BIT display blur
when switch from 4K YUV420 8BIT.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I8ccd1cef40f3e47ce481a176a41c569ab2932b83
 2023-02-21 15:27:10 +08:00
Algea Cao
e965510afe drm: bridge: dw-hdmi: clear overflow when switch color format 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I98682e8cc085829fd9fde16d7e14efa08ab8128a
 2023-02-21 15:27:10 +08:00
Algea Cao
b74c9ae934 drm: bridge: dw-hdmi: Update hdr panel metadata when can't get edid 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ide73e5f10a591a9f85061461fa34a66bc3ac5d95
 2023-02-21 15:27:10 +08:00
Algea Cao
b2e231e53f drm: bridge: dw-hdmi: Send audio uevent when play hdr video 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I349b862d2a918f5938b149b0d52ed9fc840b5a4b
 2023-02-21 15:27:10 +08:00
Algea Cao
9828e0f315 drm: bridge: dw-hdmi: Don't go to seamless switching process when hdmi plug in 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ib2884ba796baa051972c032fad3e8117cb6dcc30
 2023-02-21 15:27:10 +08:00
Algea Cao
053a921a19 drm: bridge: dw-hdmi: Support BT709 hdr and 8-bit hdr output 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: If9a90c05f98f39aa2481aec9a4b2fa5378313f45
 2023-02-21 15:27:10 +08:00
Algea Cao
5d81881b45 drm/rockchip: Support parse edid colorimetry 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I051adb0d5fa5ecfa95cebb13539c440646512a77
 2023-02-21 15:27:10 +08:00
Algea Cao
66b04a5c5f drm: bridge: dw-hdmi: Set rk3528 hpd status when resume 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I105e9a8c44dfd4ea78af406c011b3b7eb1c8f742
 2023-02-21 15:27:10 +08:00
Jon Lin
a0538ddf89 mtd: spinand: dosilicon: Support new devices 
DS35Q12B, DS35M12B

Change-Id: I8e4bf56f1cb1873c9b11858cfb567b276d980e14
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2023-02-21 15:08:27 +08:00
Sugar Zhang
c3d3a14f49 arm64: dts: rockchip: rk3588: Use mclkout_i2sx for devices 
replace.sh

  #!/bin/sh

  grep -lr "$1" | xargs sed -i "s/$1/$2/g"

e.g.

  ./replace.sh "cru I2S1_8CH_MCLKOUT" "mclkout_i2s1"

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I742c35e23a54facb90cde8f9d0d2b935be69152b
 2023-02-21 14:59:32 +08:00