Merge branch 'master' of github:OpenIPC/firmware

pull/130/head
Igor Zalatov (from Citadel PC) 2021-12-30 21:46:47 +03:00
commit 20cf959171
2 changed files with 17 additions and 11 deletions

View File

@ -11,7 +11,7 @@ chipid=$(ipctool --chip_id)
mem_start=0x80000000 # phy mem start mem_start=0x80000000 # phy mem start
mem_total=$(awk -F '=' '$1=="totalmem"{print $2}' RS=" " /proc/cmdline | tr -d 'M') mem_total=$(awk -F '=' '$1=="totalmem"{print $2}' RS=" " /proc/cmdline | tr -d 'M')
mem_total=${mem_total:=64} mem_total=${mem_total:=128}
os_mem_size=$(awk -F '=' '$1=="mem"{print $2}' RS=" " /proc/cmdline | tr -d 'M') os_mem_size=$(awk -F '=' '$1=="mem"{print $2}' RS=" " /proc/cmdline | tr -d 'M')
os_mem_size=${os_mem_size:=32} os_mem_size=${os_mem_size:=32}
@ -27,7 +27,6 @@ insert_mmz() {
insert_detect() { insert_detect() {
cd /lib/modules/4.9.37/hisilicon cd /lib/modules/4.9.37/hisilicon
insmod sys_config.ko vi_vpss_online=$b_arg_online sensor=unknown pin_mux_select=0
insert_mmz insert_mmz
insmod hi_media.ko insmod hi_media.ko
insmod hi3516a_base.ko insmod hi3516a_base.ko
@ -46,6 +45,7 @@ remove_detect() {
rmmod hi3516a_base rmmod hi3516a_base
rmmod hi_media rmmod hi_media
rmmod mmz rmmod mmz
rmmod sys_config
} }
insert_audio() { insert_audio() {
@ -96,6 +96,13 @@ insert_sns() {
devmem 0x20030104 32 0x0 # VI 250MHz devmem 0x20030104 32 0x0 # VI 250MHz
insmod sensor_i2c.ko insmod sensor_i2c.ko
;; ;;
imx178)
devmem 0x200f0050 32 0x2; # i2c0_scl
devmem 0x200f0054 32 0x2; # i2c0_sda
devmem 0x2003002c 32 0xF0007 # sensor unreset, clk 25MHz, VI 250MHz
#himm 0x2003002c 0x90007 # sensor unreset, clk 37.125MHz, VI 250MHz
;;
imx185) imx185)
devmem 0x200f0050 0x1 # spi0_sclk devmem 0x200f0050 0x1 # spi0_sclk
devmem 0x200f0054 0x1 # spi0_sdo devmem 0x200f0054 0x1 # spi0_sdo
@ -129,16 +136,16 @@ insert_sns() {
insmod extdrv/sensor_spi.ko sensor=imx117 insmod extdrv/sensor_spi.ko sensor=imx117
;; ;;
mn34220) mn34220)
devmem 0x200f0050 0x2 # i2c0_scl devmem 0x200f0050 32 0x2 # i2c0_scl
devmem 0x200f0054 0x2 # i2c0_sda devmem 0x200f0054 32 0x2 # i2c0_sda
devmem 0x2003002c 0x90007 # sensor unreset, clk 37.125MHz, VI 250MHz devmem 0x2003002c 32 0x90007 # sensor unreset, clk 37.125MHz, VI 250MHz
;; ;;
ar0330) ar0330)
devmem 0x200f0050 0x2 # i2c0_scl devmem 0x200f0050 32 0x2 # i2c0_scl
devmem 0x200f0054 0x2 # i2c0_sda devmem 0x200f0054 32 0x2 # i2c0_sda
devmem 0x2003002c 0xE0007 # sensor unreset, clk 24MHz, VI 250MHz devmem 0x2003002c 32 0xE0007 # sensor unreset, clk 24MHz, VI 250MHz
;; ;;
ov4689) ov4689)
devmem 0x200f0050 32 0x2 # i2c0_scl devmem 0x200f0050 32 0x2 # i2c0_scl
@ -164,7 +171,6 @@ insert_sns() {
} }
insert_ko() { insert_ko() {
# sys config # sys config
#insmod sys_config.ko vi_vpss_online=$b_arg_online sensor=$SENSOR pin_mux_select=0
# driver load # driver load
insert_mmz insert_mmz
@ -177,7 +183,7 @@ insert_ko() {
exit exit
fi fi
#insmod hi3516a_tde.ko insmod hi3516a_tde.ko
insmod hi3516a_region.ko insmod hi3516a_region.ko
insmod hi3516a_vgs.ko insmod hi3516a_vgs.ko

View File

@ -38,7 +38,7 @@ define HISILICON_OSDRV_HI3516AV100_INSTALL_TARGET_CMDS
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_rc.ko $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_rc.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_region.ko $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_region.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_sys.ko $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_sys.ko
# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_tde.ko $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_tde.ko
# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_vda.ko # $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_vda.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_venc.ko $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_venc.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_vgs.ko $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/kmod/hi3516a_vgs.ko