armbian/linux-rockchip
0
0
Fork 0
mirror of https://github.com/armbian/linux-rockchip.git synced 2026-01-06 11:08:10 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '5e9dee2ebe5c633887ee7d8f695259a7b5445b71'

Browse Source 
* commit '5e9dee2ebe5c633887ee7d8f695259a7b5445b71':
  media: i2c: add sc830ai sensor driver
  dmaengine: pl330: Use tasklet_hi_schedule
  mtd: spinand: XINCUN: Support new device XCSP1AAPK
  arm64: dts: rockchip: rk3562-amp: change mcu ram address

Change-Id: Ia03dea594134a3bee9843767d63f6a9be91f1de5
This commit is contained in:
Tao Huang
2024-01-12 18:57:27 +08:00
parent ead5797a9c 5e9dee2ebe
commit 2410c01daf
6 changed files with 1958 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm64/boot/dts/rockchip/rk3562-amp.dtsi
View File

@@ -29,7 +29,13 @@
/* remote amp core address */
amp_shmem_reserved: amp-shmem@7800000 {
reg = <0x0 0x7800000 0x0 0x400000>;
reg = <0x0 0x7800000 0x0 0x300000>;
no-map;
};
/* mcu address */
mcu_reserved: mcu@7b00000 {
reg = <0x0 0x7b00000 0x0 0x100000>;
no-map;
};
@@ -43,13 +49,6 @@
reg = <0x0 0x08000000 0x0 0x100000>;
no-map;
};
/* mcu address */
mcu_reserved: mcu@8200000 {
reg = <0x0 0x8200000 0x0 0x100000>;
no-map;
};
};
rpmsg: rpmsg@7c00000 {

2
drivers/dma/pl330.c
View File

@@ -1758,7 +1758,7 @@ static void dma_pl330_rqcb(struct dma_pl330_desc *desc, enum pl330_op_err err)
spin_unlock_irqrestore(&pch->lock, flags);
tasklet_schedule(&pch->task);
tasklet_hi_schedule(&pch->task);
}
static void pl330_dotask(struct tasklet_struct *t)

10
drivers/media/i2c/Kconfig
View File

@@ -1962,6 +1962,16 @@ config VIDEO_SC5336
This is a Video4Linux2 sensor driver for the SmartSens
SC5336 camera.
config VIDEO_SC830AI
tristate "SmartSens SC830AI sensor support"
depends on I2C && VIDEO_DEV
select MEDIA_CONTROLLER
select VIDEO_V4L2_SUBDEV_API
select V4L2_FWNODE
help
This is a Video4Linux2 sensor driver for the SmartSens
SC830AI camera.
config VIDEO_SC850SL
tristate "SmartSens SC850SL sensor support"
depends on I2C && VIDEO_DEV

1
drivers/media/i2c/Makefile
View File

@@ -246,6 +246,7 @@ obj-$(CONFIG_VIDEO_SC500AI) += sc500ai.o
obj-$(CONFIG_VIDEO_SC501AI) += sc501ai.o
obj-$(CONFIG_VIDEO_SC530AI) += sc530ai.o
obj-$(CONFIG_VIDEO_SC5336) += sc5336.o
obj-$(CONFIG_VIDEO_SC830AI) += sc830ai.o
obj-$(CONFIG_VIDEO_SC850SL) += sc850sl.o
obj-$(CONFIG_VIDEO_SENSOR_ADAPTER) += sensor_adapter.o
obj-$(CONFIG_VIDEO_SGM3784) += sgm3784.o

1930
drivers/media/i2c/sc830ai.c Normal file
View File

File diff suppressed because it is too large Load Diff

9
drivers/mtd/nand/spi/xincun.c
View File

@@ -92,6 +92,15 @@ static const struct spinand_info xincun_spinand_table[] = {
&update_cache_variants),
SPINAND_HAS_QE_BIT,
SPINAND_ECCINFO(&xcsp2aapk_ooblayout, xcsp2aapk_ecc_get_status)),
SPINAND_INFO("XCSP1AAPK",
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x01),
NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),
NAND_ECCREQ(8, 512),
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
&write_cache_variants,
&update_cache_variants),
SPINAND_HAS_QE_BIT,
SPINAND_ECCINFO(&xcsp2aapk_ooblayout, xcsp2aapk_ecc_get_status)),
};
static const struct spinand_manufacturer_ops xincun_spinand_manuf_ops = {