shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '372c139deef48d827f8fe6ca47cb8210b28914a4'

Browse Source 
* commit '372c139deef48d827f8fe6ca47cb8210b28914a4':
  video: rockchip: mpp: fix JPEG Enc dma sync problem
  arm64: rockchip_gki.config: enable icm4260x sensor.
  arm64: rockchip_defconfig: enable icm4260x sensor.
  video: rockchip: vtunnel: fix compile errors on android 14
  fiq_debugger: set uart irq no balancing
  arm64: dts: rockchip: rk3588s-evb3: disable gt1x in bt1120 display board
  arm64: dts: rockchip: rk3568-evb: fix gc8034 power domain config
  PCI: rockchip: dw: remove .link_up() hook from struct dw_pcie_ops

Change-Id: Ie4ab8e2b6cc65d422edb219b645d9ad43da50fe9
This commit is contained in:
Tao Huang
2023-10-12 18:16:47 +08:00
parent 28a6652322 372c139dee
commit 116680b9cb
8 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi
View File

@@ -273,6 +273,7 @@
clock-names = "xvclk";
pinctrl-names = "default";
pinctrl-0 = <&cif_clk>;
power-domains = <&power RK3568_PD_VI>;
reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
rockchip,grf = <&grf>;

1
arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi
View File

@@ -304,6 +304,7 @@
clock-names = "xvclk";
pinctrl-names = "default";
pinctrl-0 = <&cif_clk>;
power-domains = <&power RK3568_PD_VI>;
reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
rockchip,grf = <&grf>;

15
arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x-v10-sii9022-bt1120-to-hdmi.dts
View File

@@ -19,6 +19,13 @@
status = "disabled";
};
/*
* The pins of gt1x and sii9022 are multiplexed
*/
&gt1x {
status = "disabled";
};
&i2c4 {
clock-frequency = <400000>;
status = "okay";
@@ -32,6 +39,10 @@
interrupts = <RK_PC0 IRQ_TYPE_LEVEL_HIGH>;
reset-gpio = <&gpio1 RK_PA7 GPIO_ACTIVE_LOW>;
enable-gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
/*
* MEDIA_BUS_FMT_UYVY8_1X16 for bt1120
* MEDIA_BUS_FMT_UYVY8_2X8 for bt656
*/
bus-format = <MEDIA_BUS_FMT_UYVY8_1X16>;
ports {
@@ -60,6 +71,10 @@
&rgb {
status = "okay";
pinctrl-names = "default";
/*
* <&bt1120_pins> for bt1120
* <&bt656_pins> for bt656
*/
pinctrl-0 = <&bt1120_pins>;
ports {

2
arch/arm64/configs/rockchip_defconfig
View File

@@ -475,6 +475,7 @@ CONFIG_GS_LSM303D=y
CONFIG_LSM330_ACC=y
CONFIG_BMA2XX_ACC=y
CONFIG_GS_DA223=y
CONFIG_ICM4260X_ACC=y
CONFIG_COMPASS_DEVICE=y
CONFIG_COMPASS_AK8975=y
CONFIG_COMPASS_AK8963=y
@@ -485,6 +486,7 @@ CONFIG_GYRO_EWTSA=y
CONFIG_GYRO_MPU6500=y
CONFIG_GYRO_MPU6880=y
CONFIG_GYRO_LSM330=y
CONFIG_GYRO_ICM4260X=y
CONFIG_LIGHT_DEVICE=y
CONFIG_LS_CM3217=y
CONFIG_LS_CM3218=y

2
arch/arm64/configs/rockchip_gki.config
View File

@@ -85,6 +85,7 @@ CONFIG_GS_SC7A20=m
CONFIG_GS_SC7A30=m
CONFIG_GYROSCOPE_DEVICE=m
CONFIG_GYRO_EWTSA=m
CONFIG_GYRO_ICM4260X=m
CONFIG_GYRO_L3G20D=m
CONFIG_GYRO_L3G4200D=m
CONFIG_GYRO_LSM330=m
@@ -139,6 +140,7 @@ CONFIG_I2C_CHARDEV=m
CONFIG_I2C_GPIO=m
CONFIG_I2C_HID=m
CONFIG_I2C_RK3X=m
CONFIG_ICM4260X_ACC=m
CONFIG_IEP=m
CONFIG_IIO_BUFFER_CB=m
CONFIG_INPUT_RK805_PWRKEY=m

2
drivers/soc/rockchip/fiq_debugger/fiq_debugger.c
View File

@@ -1555,7 +1555,7 @@ static int fiq_debugger_probe(struct platform_device *pdev)
pr_err("%s: could not install nmi irq handler\n", __func__);
irq_clear_status_flags(state->uart_irq, IRQ_NOAUTOEN);
ret = request_irq(state->uart_irq, fiq_debugger_uart_irq,
IRQF_NO_SUSPEND, "debug", state);
IRQF_NO_SUSPEND | IRQF_NOBALANCING, "debug", state);
} else {
enable_nmi(state->uart_irq);
}

2
drivers/video/rockchip/mpp/mpp_rkvenc2.c
View File

@@ -1468,7 +1468,7 @@ static int rkvenc_finish(struct mpp_dev *mpp, struct mpp_task *mpp_task)
if (task->bs_buf) {
u32 bs_size = mpp_read(mpp, 0x4064);
mpp_dma_buf_sync(task->bs_buf, 0, bs_size / 8 + task->offset_bs,
mpp_dma_buf_sync(task->bs_buf, 0, bs_size + task->offset_bs,
DMA_FROM_DEVICE, true);
}

4
drivers/video/rockchip/vtunnel/rkvtunnel.c
View File

@@ -731,7 +731,7 @@ rkvt_reset_proc(struct rkvt_ctrl_data *data, struct rkvt_session *session)
{
struct rkvt_dev *vt_dev = session->vt_dev;
struct rkvt_instance *inst;
long read_buf_id;
long long read_buf_id;
inst = rkvt_inst_get_by_tid(vt_dev, data->vt_id);
if (!inst)
@@ -1191,7 +1191,7 @@ rkvt_release_buf(struct rkvt_buf_data *data, struct rkvt_session *session)
struct rkvt_buffer *buffer = NULL;
int i;
int ret = 0;
long read_buf_id;
long long read_buf_id;
inst = rkvt_inst_get_by_tid(vt_dev, data->vt_id);
if (!inst)