shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,265,582 Commits 55 Branches 2,486 Tags
e97ec4041d79db85fdd7db29fec3ca7b8b61224e
Commit Graph

1265582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Huang
e97ec4041d Merge commit 'b97e3d77e750d210dc742b2f8c675143ee85de0e' 
* commit 'b97e3d77e750d210dc742b2f8c675143ee85de0e':
  ARM: dts: rockchip: add rv1106 dual sensor v11 extboard dts.
  ARM: configs: rk3308_linux_aarch32_defconfig: enable rk816 pmic

Change-Id: Ibe04cd56326e6b5a1a0a900d70fc14a5d10fc7b1
 2023-12-11 17:38:03 +08:00
Tao Huang
a780da0696 Merge commit '967ccfd802e649563fc1f8cbdf28da65c4e7b354' 
Merge made by the 'ours' strategy.

* commit '967ccfd802e649563fc1f8cbdf28da65c4e7b354':
  ARM: configs: rk3308_linux_aarch32_defconfig: sync from  savedefconfig

Change-Id: Ifa1c36d9d227392f1814f6d634932a79152db0fc
 2023-12-11 17:26:25 +08:00
Lin Jianhua
50674f9a03 ARM: configs: rk3308_linux_aarch32_defconfig: sync from savedefconfig 
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
Change-Id: I064cef348b469db1e3327465b47d52ea6f56e59d
 2023-12-11 17:15:27 +08:00
Tao Huang
b9baa5231b Merge commit 'be425cca7a4863178c4dfa6322a1aeb7b23bd5a9' 
* commit 'be425cca7a4863178c4dfa6322a1aeb7b23bd5a9':
  media: rockchip: vicap hw change suspend/resume early

Change-Id: Ifafc800ab49535625d12fa753969a43f7ef14e16
 2023-12-11 17:06:40 +08:00
Tao Huang
cc1db06225 Merge commit '5525a9cc48ab35c4fdb9905ee7c07137fb756078' 
Merge made by the 'ours' strategy.

* commit '5525a9cc48ab35c4fdb9905ee7c07137fb756078':
  arm64: dts: rockchip: Remove unused quirk for usb dwc3 controller

Change-Id: I5c355249827459dd102ea6b27ad36db0f48b8900
 2023-12-11 17:05:08 +08:00
William Wu
3c73baf9c1 arm64: dts: rockchip: Remove unused quirk for usb dwc3 controller 
This patch remove unused property "snps,xhci-trb-ent-quirk"
for rockchip platforms.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I34212099c21764dfdd2e42d03f91dbf449e3b0c9
 2023-12-11 16:57:33 +08:00
Tao Huang
2ca6a5d926 Merge commit '36e981880962e2f7580e42a9ea125a6a04c218ad' 
* commit '36e981880962e2f7580e42a9ea125a6a04c218ad':
  Revert "arm64: dts: rockchip: add xhci trb ent quirk for rockchip SoCs"
  ARM: dts: rockchip: rv1126: Remove unused quirk for usb
  PCI: rockchip: dw: Remove useless apis
  PCI: rockchip: dw: Fix resize bar capability for EP
  arm64: configs: add rockchip_linux_pcie_ep.config for some case use PCIe EP Card
  arm64: dts: rockchip: add PCIe EP Board for rk3568
  media: rockchip: isp: version v2.4.0
  media: i2c: techpoint: add tp9951 driver
  media: i2c: sc3338 adapt sleep_wakeup

Change-Id: I88f3b8c3875243e9f302b5f173bb7ce1544e9ccf
 2023-12-11 16:55:33 +08:00
Tao Huang
6ef91165fa Merge commit '190f4223b2b4b1320d485cb6211af1733d9da7a2' 
* commit '190f4223b2b4b1320d485cb6211af1733d9da7a2':
  media: i2c: sc200ai adapt sleep_wakeup
  media: i2c: add sleep-wakeup mod
  media: rockchip: vicap: call sensor quick stream only rv1106 when resume
  spi: rockchip-test: Support config spi mode
  media: rockchip: vicap add intr mask for bandwidth, and mask bandwidth err per second
  ARM: configs: rv1106-wakeup.config: enable VIDEO_CAM_SLEEP_WAKEUP
  ARM: configs: rockchip: update rv1106-wakeup.config
  arm64: dts: rockchip: rk3588-vehicle-evb-v20: change to use mfd display
  ARM: dts: rockchip: rv1106g-evb2-v12-wakeup remove rtt

Change-Id: I7d1adaee411c28b49bb004f428aba046724376ce

Conflicts:
	drivers/media/i2c/Makefile
	drivers/media/i2c/sc200ai.c
 2023-12-11 16:54:03 +08:00
LongChang Ma
b97e3d77e7 ARM: dts: rockchip: add rv1106 dual sensor v11 extboard dts. 
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Change-Id: Id0c2c72e9484d112958235fc9e10bb626c97737a
 2023-12-08 19:00:11 +08:00
Lin
967ccfd802 ARM: configs: rk3308_linux_aarch32_defconfig: sync from savedefconfig 
Signed-off-by: Lin <linjh@rock-chips.com>
Change-Id: I064cef348b469db1e3327465b47d52ea6f56e59d
 2023-12-08 17:25:17 +08:00
Lin Jianhua
1ec01b80a8 ARM: configs: rk3308_linux_aarch32_defconfig: enable rk816 pmic 
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
Change-Id: I95d2556a6836fa4ba0b75bc7dcc17dbdc093131f
 2023-12-08 17:25:17 +08:00
Chuanhu Sun
be425cca7a media: rockchip: vicap hw change suspend/resume early 
Signed-off-by: Chuanhu Sun <aaron.sun@rock-chips.com>
Change-Id: Ic19a8f1540cd2af19f6f921c5cc8eba078ea50fb
 2023-12-08 15:22:35 +08:00
William Wu
5525a9cc48 arm64: dts: rockchip: Remove unused quirk for usb dwc3 controller 
This patch remove unused property "snps,xhci-trb-ent-quirk"
for rockchip platforms.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I34212099c21764dfdd2e42d03f91dbf449e3b0c9
 2023-12-08 14:33:13 +08:00
Tao Huang
36e9818809 Revert "arm64: dts: rockchip: add xhci trb ent quirk for rockchip SoCs" 
This reverts commit fdc8aea2c0.

This patch remove unused property "snps,xhci-trb-ent-quirk"
for rockchip platforms.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I849019919feecd1a35a26e5d668e53a8d8bcae2e
 2023-12-08 14:33:13 +08:00
William Wu
bda0d3d451 ARM: dts: rockchip: rv1126: Remove unused quirk for usb 
This patch remove unused property "snps,xhci-trb-ent-quirk"
for rv1126 usb controller.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ic6a713261219cb75b7739f2db8ff5dddfafe67b1
 2023-12-08 14:32:50 +08:00
Jon Lin
a34de85857 PCI: rockchip: dw: Remove useless apis 
The PCIe dbi base is accessible in userspace by mmap, then the
elbi_data and bar0 physical address is visible from dbi base mmap
space.

Change-Id: I5abd5921d2c7fd361e098ded568a470ff1b67ad2
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2023-12-07 19:14:03 +08:00
Jon Lin
0350e3c5ed PCI: rockchip: dw: Fix resize bar capability for EP 
Avoid RC attempting to modify EP bar strategy.

Change-Id: Icd8fefe9d6a09ad4a4845af83d6dd6b80c78d5bc
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2023-12-07 19:14:03 +08:00
Lin Jianhua
b202c1caa3 arm64: configs: add rockchip_linux_pcie_ep.config for some case use PCIe EP Card 
Change-Id: Ia78d3e26ba1153b1fb0889dccb04c238534ff325
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
 2023-12-07 19:11:36 +08:00
Lin Jianhua
520ae493e9 arm64: dts: rockchip: add PCIe EP Board for rk3568 
Change-Id: Iabfd99bb6d6934255cc82cc773dc80ba822e415b
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
 2023-12-07 19:11:36 +08:00
Cai YiWei
7f2e38980d media: rockchip: isp: version v2.4.0 
Change-Id: If8379fbed725c542c0473fd0c6797effd896e03a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-12-07 16:15:20 +08:00
XiaoDong Huang
e6b4866a98 PM / sleep: support mem_lite/mem_ultra mode 
Change-Id: Iab2e11a2f63b1a3f38c1c9b6c4b675ee2660f244
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
 2023-12-07 09:44:59 +08:00
LongChang Ma
fd1f21d6c1 media: i2c: techpoint: add tp9951 driver 
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Change-Id: Ieee236964b12d2dc54c622641463e3bbd90c2ca6
 2023-12-06 17:44:55 +08:00
Shawn Lin
b045498f5c arm64: dts: rockchip: enable emmc strobe line pulldown RK3399 SoC 
It's recommended to use internal pulldown, so we enable it via FW.
However commit 8b5c2b45b8 ("phy: rockchip: set pulldown for strobe line in dts")
disabled the pulldown settings if no dts property available. This
breaks all the existing RK3399 boards without external strobe pulldown
resistor. Fix is by adding rockchip,enable-strobe-pulldown to
rk3399.dtsi

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I510614e2029de293dfce48c78b1928244370b921
 2023-12-06 17:27:41 +08:00
LongChang Ma
3c7ecd8d14 media: i2c: sc3338 adapt sleep_wakeup 
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Change-Id: I249b7a1a272aa1244b9fdd20b041d7b997bb6a27
 2023-12-06 16:27:38 +08:00
Ziwei Lin
190f4223b2 media: i2c: sc200ai adapt sleep_wakeup 
Signed-off-by: Ziwei Lin <ziwei.lin@rock-chips.com>
Change-Id: I169d77de24550bd6a79278447e9880b621f57ee2
 2023-12-06 16:26:34 +08:00
Ziwei Lin
4f9bce36a0 media: i2c: add sleep-wakeup mod 
Support for sensor sleep and wake up

Signed-off-by: Ziwei Lin <ziwei.lin@rock-chips.com>
Change-Id: I2eba13b88df6b9e1bf596c9c653784e77d470a9d
 2023-12-06 16:26:34 +08:00
Zefa Chen
a0766acbeb media: rockchip: vicap: call sensor quick stream only rv1106 when resume 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Icbcc7926e1a6a0292adde809238b9e756df92b97
 2023-12-06 15:50:45 +08:00
Jon Lin
b8c9f51590 spi: rockchip-test: Support config spi mode 
Change-Id: If6f67ed93f3a2a06acb8e2da485616174720ebf0
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2023-12-06 15:40:49 +08:00
Zefa Chen
d2233bb509 media: rockchip: vicap add intr mask for bandwidth, and mask bandwidth err per second 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie07d0c4d25bfc962f25a0b4b38f36557814e4a62
 2023-12-06 15:39:26 +08:00
Jkand Huang
1ccf851a69 ARM: configs: rv1106-wakeup.config: enable VIDEO_CAM_SLEEP_WAKEUP 
Change-Id: I5c183863c466d07d311a313011f712c7fa0afbbc
Signed-off-by: Jkand Huang <jkand.huang@rock-chips.com>
 2023-12-06 15:37:42 +08:00
Jkand Huang
2943841711 ARM: configs: rockchip: update rv1106-wakeup.config 
1. disable CONFIG_RV1106_HPMCU_FAST_WAKEUP
2. enable CONFIG_RV1106_PMU_WAKEUP_TIMEOUT
3. buildin CONFIG_PHY_ROCKCHIP_CSI2_DPHY
4. buildin CONFIG_VIDEO_ROCKCHIP_CIF

Change-Id: Id67a2ce0fd9f7b241cb572d485fe5cc073bcceb5
Signed-off-by: Jkand Huang <jkand.huang@rock-chips.com>
 2023-12-06 15:37:42 +08:00
Luo Wei
65d970d073 arm64: dts: rockchip: rk3588-vehicle-evb-v20: change to use mfd display 
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: Iaf385b286720c18c87a70acf6e280da80612172f
 2023-12-06 15:36:56 +08:00
Jkand Huang
58c549de59 ARM: dts: rockchip: rv1106g-evb2-v12-wakeup remove rtt 
Change-Id: Ib89f202b58cb365960e1e4960b7c08232cac8f5b
Signed-off-by: Jkand Huang <jkand.huang@rock-chips.com>
 2023-12-06 15:35:22 +08:00
Tao Huang
4af2dfa419 Merge commit '618ce38798a8c230240bf9c5762aeabfcc6bed7c' 
Merge made by the 'ours' strategy.

Ignore:
* commit '618ce38798a8c230240bf9c5762aeabfcc6bed7c':
  arm64: dts: rockchip: rk3588: Add CLK_IGNORE_UNUSED for MCLKOUTx
  clk: rockchip: clk-out: Add property for CLK_IGNORE_UNUSED

Change-Id: Id4b36c17244098826b6aa20d73498b0ca6d18003
 2023-12-05 19:28:05 +08:00
Tao Huang
cbae33f491 Merge commit '424557b2d34d9e876f0f1d36f3771e73ecfbdea8' 
* commit '424557b2d34d9e876f0f1d36f3771e73ecfbdea8':
  ARM: rockchip: rv1106: sleep: fix compile error
  media: rockchip: vicap: fixes error of quick stream for AOV without rtt mcu
  media: rockchip: vicap change stream suspend/resume early
  media: rockchip: vicap support resume mode of oneframe without rtt
  phy: rockchip: mipi csi2 dphy support set quick stream
  phy: rockchip: csi2-dphy: fixes NULL of dphy node for dcphy
  mfd: display-serdes: add split mode function support
  dt-bindings: opp: Document rockchip opp bindings
  arm64: dts: rockchip: rk3588: Change opp clock for gpu and npu opp table

Change-Id: I2570e20cda5e192e35b5d7476fcf5fc45b4787ec
 2023-12-05 19:24:47 +08:00
Tao Huang
cbdbe03ca4 Merge commit '7e80a3380a15d6f7b1ddc67e1c79411c33564903' 
Merge made by the 'ours' strategy.

* commit '7e80a3380a15d6f7b1ddc67e1c79411c33564903':
  soc: rockchip: opp_select: Add support to parse rockchip,opp-clocks

Change-Id: I11f140b6d52263287091830174e83ec28e194417
 2023-12-05 19:24:08 +08:00
Finley Xiao
22823575b0 soc: rockchip: opp_select: Add support to parse rockchip,opp-clocks 
The clocks property is used to get avs frequency and avs scale on some
platforms, add new property rockchip,opp-clocks for pvtpll and read
margin.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ida795081e199b40a0bdfe3cb079ae8286d006057
 2023-12-05 19:23:16 +08:00
Tao Huang
63ede6533e Merge commit '80af59f8b8783610afdf59ff4cd7a0b4fcdf095d' 
* commit '80af59f8b8783610afdf59ff4cd7a0b4fcdf095d':
  video: rockchip: rve: update to 1.0.5
  ARM: rockchip: rv1106: support CONFIG_RV1106_PMU_WAKEUP_TIMEOUT
  media: rockchip: isp: fix is_on false cause pm isp die
  ARM: rockchip: rv1106: support PMIC_SLEEP over gpio0_a4

Change-Id: Ic3b085e535b029b9364c0ecb55551d31e325cfab
 2023-12-05 19:20:14 +08:00
Sugar Zhang
618ce38798 arm64: dts: rockchip: rk3588: Add CLK_IGNORE_UNUSED for MCLKOUTx 
This patch is used for compatible for old style mclk
reference which do not use the "mclkout_x".

Use property 'rockchip,clk-ignore-unused' instead the fixed one.

Suggest to drop this patch for totally new SDK or SoCs
in the future.

Ref: 1255f11b25 ("clk: rockchip: clk-out: Add CLK_IGNORE_UNUSED flag")

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ifa5c0be7f2aad6fc6848b49f4612a160b04d7254
 2023-12-05 19:17:13 +08:00
Sugar Zhang
5843feb890 clk: rockchip: clk-out: Add property for CLK_IGNORE_UNUSED 
This patch is used for compatible for old style mclk
reference which do not use the "mclkout_x".

Use property 'rockchip,clk-ignore-unused' instead the fixed one.

Suggest to drop this patch for totally new SDK or SoCs
in the future.

Ref: 1255f11b25 ("clk: rockchip: clk-out: Add CLK_IGNORE_UNUSED flag")

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I72797d9fa3f8367c48808489e24f544c34acab39
 2023-12-05 19:17:06 +08:00
XiaoDong Huang
424557b2d3 ARM: rockchip: rv1106: sleep: fix compile error 
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I93b9c1efe38a5fb3afb9446f154abc4bd94abafe
 2023-12-05 18:26:26 +08:00
Zefa Chen
e9ceb67d33 media: rockchip: vicap: fixes error of quick stream for AOV without rtt mcu 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I502604dba7bb8c3c19e28f3b3e889ff3a72db071
 2023-12-05 18:10:36 +08:00
Zefa Chen
089ceee21e media: rockchip: vicap change stream suspend/resume early 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I80eb4105d640b334126c74c48ad4edaf4cb40fb1
 2023-12-05 18:10:17 +08:00
Zefa Chen
dc990ffab1 media: rockchip: vicap support resume mode of oneframe without rtt 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia3afbabcfcc6fdca263c8e41c9e2bf403a49ce42
 2023-12-05 18:09:33 +08:00
Zefa Chen
e1ecd29fcc phy: rockchip: mipi csi2 dphy support set quick stream 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1a36a5244cef005daddcd4d80fa8fe051061c7ca
 2023-12-05 18:08:35 +08:00
Zefa Chen
b42660e87c phy: rockchip: csi2-dphy: fixes NULL of dphy node for dcphy 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ibe326b1199d5e538f9a9c2ee7f079be210d0353a
 2023-12-05 18:04:12 +08:00
Luo Wei
80ebdebca0 mfd: display-serdes: add split mode function support 
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I70f1707c8625d8d693b1134d178c68fcdfbdf268
 2023-12-05 17:22:19 +08:00
Finley Xiao
7737649f46 soc: rockchip: opp_select: Add support to use the first clk as dvfs clk 
On rk3588, the npu dvfs clk name is clk_npu.
clocks = <&scmi_clk SCMI_CLK_NPU>, <&cru ACLK_NPU0>,
	 <&cru ACLK_NPU1>, <&cru ACLK_NPU2>,
	 <&cru HCLK_NPU0>, <&cru HCLK_NPU1>,
	 <&cru HCLK_NPU2>, <&cru PCLK_NPU_ROOT>;
clock-names = "clk_npu", "aclk0", "aclk1", "aclk2",
	      "hclk0", "hclk1", "hclk2", "pclk";

On rk3562, the npu dvfs clk name is scmi_clk.
clocks = <&scmi_clk ACLK_RKNN>, <&cru ACLK_RKNN>, <&cru HCLK_RKNN>;
clock-names = "scmi_clk", "aclk", "hclk";

Add suppprt to use the first clk as dvfs clk,
and don't need to change devicetree.

Change-Id: Ie8998aec6fe7f24f19f49cfe3f90c4183fef2094
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
 2023-12-05 16:59:31 +08:00
Finley Xiao
23cdd1ae0e dt-bindings: opp: Document rockchip opp bindings 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I0a60b7d43e5f34de402266859543400cd5d523ff
 2023-12-05 16:48:30 +08:00
Finley Xiao
92f826364b arm64: dts: rockchip: rk3588: Change opp clock for gpu and npu opp table 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ic2f585ecbfc0de4a11d20f14bbc6f0dd10f7b25d
 2023-12-05 16:48:21 +08:00