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

Merge commit 'b661b75c97690229bcbf827664b7262f951d90ba'

Browse Source 
* commit 'b661b75c97690229bcbf827664b7262f951d90ba':
  arm64: dts: rockchip: rk3576-ebook: remove no use defined
  drm/rockchip: rgb: deinit output_if and output_if_left_panel for rgb output
  media: rockchip: ispp: Disable dump_file on GKI
  input: sensors: mc3230: Call filp_open() only when CONFIG_NO_GKI
  ASoC: rockchip: pdm_v2: make the volume TLV to match the units 0.01dB
  ASoC: rockchip: pdm_v2: set the pdm default gain to 24dB
  arm64: dts: rockchip: Add OP-TEE firmware node for rk3576-linux.dtsi

Change-Id: I5cc63fe0bb549fed26e472f37fe1e32731ac421b
This commit is contained in:
Tao Huang
2024-05-11 18:33:50 +08:00
parent 409400988b b661b75c97
commit 77a68c7aa7
7 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
arch/arm64/boot/dts/rockchip/rk3576-ebook-v10.dts
View File

@@ -261,32 +261,6 @@
panel,panel_color = <0>;
panel,width-mm = <157>;
panel,height-mm = <210>;
#if 0
/* EC103KH3 panel */
panel,width = <2480>;
panel,height = <1860>;
panel,vir_width = <2496>;
panel,vir_height = <1944>;
panel,sdck = <60000000>;
panel,lsl = <64>;
panel,lbl = <64>;
panel,ldl = <312>;
panel,lel = <22>;
panel,gdck-sta = <1>;
panel,lgonl = <252>;
panel,fsl = <1>;
panel,fbl = <4>;
panel,fdl = <1944>;
panel,fel = <16>;
panel,mirror = <0>;
panel,panel_16bit = <1>;
panel,panel_color = <1>;
panel,sdoe_mode = <1>;
panel,sdce_width = <1>;
panel,width-mm = <166>;
panel,height-mm = <210>;
panel,disable_logo = <1>;
#endif
};
&gpu {

7
arch/arm64/boot/dts/rockchip/rk3576-linux.dtsi
View File

@@ -22,6 +22,13 @@
status = "okay";
};
firmware {
optee: optee {
compatible = "linaro,optee-tz";
method = "smc";
};
};
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;

3
drivers/gpu/drm/rockchip/rockchip_rgb.c
View File

@@ -242,6 +242,8 @@ static void rockchip_rgb_encoder_enable(struct drm_encoder *encoder)
static void rockchip_rgb_encoder_disable(struct drm_encoder *encoder)
{
struct rockchip_rgb *rgb = encoder_to_rgb(encoder);
struct drm_crtc *crtc = encoder->crtc;
struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc->state);
if (rgb->panel) {
drm_panel_disable(rgb->panel);
@@ -257,6 +259,7 @@ static void rockchip_rgb_encoder_disable(struct drm_encoder *encoder)
rgb->funcs->disable(rgb);
pinctrl_pm_select_sleep_state(rgb->dev);
s->output_if &= ~(VOP_OUTPUT_IF_RGB | VOP_OUTPUT_IF_BT656 | VOP_OUTPUT_IF_BT1120);
}
static int

5
drivers/input/sensors/accel/mc3230.c
View File

@@ -179,10 +179,13 @@ static int mc3230_active(struct i2c_client *client, int enable);
static void MC32X0_rbm(struct i2c_client *client, int enable);
static int init_3230_ctl_data(struct i2c_client *client);
struct file *openFile(const char *path, int flag, int mode)
static struct file *openFile(const char *path, int flag, int mode)
{
struct file *fp;
if (!IS_ENABLED(CONFIG_NO_GKI))
return NULL;
fp = filp_open(path, flag, mode);
if (IS_ERR(fp) || !fp->f_op)
return NULL;

3
drivers/media/platform/rockchip/ispp/stream.c
View File

@@ -1561,6 +1561,9 @@ static void dump_file(struct rkispp_device *dev, u32 restart_module)
char file[160], reg[48];
int i;
if (!IS_ENABLED(CONFIG_NO_GKI))
return;
snprintf(file, sizeof(file), "%s/%s%d.reg",
rkispp_dump_path, DRIVER_NAME, dev->dev_id);
fp = filp_open(file, O_RDWR | O_CREAT, 0644);

14
sound/soc/rockchip/rockchip_pdm_v2.c
View File

@@ -414,7 +414,7 @@ static const char * const hpf_cutoff_text[] = {
static SOC_ENUM_SINGLE_DECL(hpf_cutoff_enum, PDM_V2_FILTER_CTRL,
19, hpf_cutoff_text);
static const DECLARE_TLV_DB_SCALE(pdm_v2_digtal_gain_tlv, -6525, 375, 0);
static const DECLARE_TLV_DB_SCALE(pdm_v2_digtal_gain_tlv, -6563, 75, 0);
static const struct snd_kcontrol_new rockchip_pdm_v2_controls[] = {
SOC_ENUM("Receive PATH3 Source Select", rpath3_enum),
@@ -723,9 +723,17 @@ static int rockchip_pdm_v2_probe(struct platform_device *pdev)
rockchip_pdm_v2_set_samplerate(pdm, PDM_V2_DEFAULT_RATE);
rockchip_pdm_v2_rxctrl(pdm, 0);
/* Set the default gain */
/*
* Set the default gain 24dB, this parameter can get better
* performance if the voice energy is lower. In other words this
* can improve PDM IP SNR.
*
* So the applicable range of this is for sound intensity below 100dB.
* If you want to record stronger sound intensity, you must set
* PDM gain register but not soft gain-controller.
*/
regmap_update_bits(pdm->regmap, PDM_V2_FILTER_CTRL, PDM_V2_GAIN_CTRL_MSK,
PDM_V2_GAIN_0DB);
PDM_V2_GAIN_24DB);
ret = rockchip_pdm_v2_path_parse(pdm, node);
if (ret != 0 && ret != -ENOENT)

5
sound/soc/rockchip/rockchip_pdm_v2.h
View File

@@ -76,10 +76,11 @@
/* PDM_V2_FILTER_CTRL */
/* 0.375dB every step. 0: mute, 1: -65.25dB, 255: 30dB */
#define PDM_V2_GAIN_CTRL_MSK (0xff << 23)
#define PDM_V2_GAIN_CTRL_SHIFT 23
#define PDM_V2_GAIN_CTRL_SHIFT 24
#define PDM_V2_GAIN_MIN 0
#define PDM_V2_GAIN_MAX 0xff
#define PDM_V2_GAIN_MAX 0x7f
#define PDM_V2_GAIN_0DB (175 << 23)
#define PDM_V2_GAIN_24DB (239 << 23)
#define PDM_V2_HPF_R_MSK (0x1 << 21)
#define PDM_V2_HPF_R_EN (0x1 << 21)
#define PDM_V2_HPF_R_DIS (0x0 << 21)