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 'c1dcc6ec1ede1f46f8ef5e25c805d0531b74356b'

Browse Source 
* commit 'c1dcc6ec1ede1f46f8ef5e25c805d0531b74356b':
  drm/rockchip: dw_hdmi: Fix hdmi cts hf1-31 failed
  arm64: dts: rockchip: rk628-hdmi2csi: rk628 change the interrupt to high level trigger
  arm64: dts: rockchip: rk3576-evb1-v10-rk628-hdmi2csi: enable cec for rk628 hdmirx
  media: i2c: rk628: fix cec no response when send messages
  spi: spidev-rkslv: Add spidev_rkslv_spi_ids
  spi: spidev-rkmst: Add spidev_rkmst_spi_ids
  spi: spidev: Add spidev id_table
  media: i2c: rk628: add nosignal process when get_fmt and enable stream
  media: i2c: rk628: get_fmt width must align to 8

Change-Id: I22ea938cde89d66c12ca9b641934c8d2688aee17
This commit is contained in:
Tao Huang
2024-05-13 20:33:15 +08:00
parent caa6ba955f c1dcc6ec1e
commit 842d93042e
11 changed files with 72 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-rk628-hdmi2csi.dts
View File

@@ -90,11 +90,12 @@
pinctrl-names = "default";
pinctrl-0 = <&rk628_pin>;
interrupt-parent = <&gpio3>;
interrupts = <RK_PB0 IRQ_TYPE_EDGE_RISING>;
interrupts = <RK_PB0 IRQ_TYPE_LEVEL_HIGH>;
enable-gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>;
plugin-det-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
continues-clk = <1>;
cec-enable;
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";

2
arch/arm64/boot/dts/rockchip/rk3576-evb2-rk628-hdmi2csi.dtsi
View File

@@ -82,7 +82,7 @@
pinctrl-names = "default";
pinctrl-0 = <&rk628_hdmiin_pin>;
interrupt-parent = <&gpio3>;
interrupts = <RK_PD1 IRQ_TYPE_EDGE_RISING>;
interrupts = <RK_PD1 IRQ_TYPE_LEVEL_HIGH>;
reset-gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_LOW>;
plugin-det-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_LOW>;
continues-clk = <1>;

4
arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4-v10-rk628-hdmi2csi.dts
View File

@@ -108,7 +108,7 @@
pinctrl-names = "default";
pinctrl-0 = <&rk628_pin_1>;
interrupt-parent = <&gpio1>;
interrupts = <RK_PB1 IRQ_TYPE_EDGE_RISING>;
interrupts = <RK_PB1 IRQ_TYPE_LEVEL_HIGH>;
enable-gpios = <&gpio1 RK_PB3 GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>;
plugin-det-gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_LOW>;
@@ -148,7 +148,7 @@
pinctrl-names = "default";
pinctrl-0 = <&rk628_pin>;
interrupt-parent = <&gpio2>;
interrupts = <RK_PC4 IRQ_TYPE_EDGE_RISING>;
interrupts = <RK_PC4 IRQ_TYPE_LEVEL_HIGH>;
enable-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
plugin-det-gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>;

2
arch/arm64/boot/dts/rockchip/rk3588-evb7-v11-rk628-hdmi2csi.dts
View File

@@ -98,7 +98,7 @@
pinctrl-names = "default";
pinctrl-0 = <&rk628_pin>;
interrupt-parent = <&gpio1>;
interrupts = <RK_PB2 IRQ_TYPE_EDGE_RISING>;
interrupts = <RK_PB2 IRQ_TYPE_LEVEL_HIGH>;
enable-gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>;
plugin-det-gpios = <&gpio2 RK_PB6 GPIO_ACTIVE_LOW>;

47
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
View File

@@ -1792,6 +1792,14 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
return 0;
}
static bool is_hdmi2_mode(const struct drm_display_mode *mode)
{
if (mode->clock > 340000 && mode->clock <= 600000)
return true;
return false;
}
static enum drm_mode_status
dw_hdmi_rockchip_mode_valid(struct dw_hdmi *dw_hdmi, void *data,
const struct drm_display_info *info,
@@ -1821,6 +1829,28 @@ dw_hdmi_rockchip_mode_valid(struct dw_hdmi *dw_hdmi, void *data,
hdmi = to_rockchip_hdmi(encoder);
if (!hdmi->skip_check_420_mode) {
/* edid isn't support yuv420 and max_tmds_clock is less than mode pixel clk */
if (mode->clock < 600000 && connector->display_info.max_tmds_clock < mode->clock &&
(!drm_mode_is_420(&connector->display_info, mode) ||
!connector->ycbcr_420_allowed))
return MODE_BAD;
/* edid isn't support yuv420 and hdmitx only support hdmi1.4 clk */
if (hdmi->max_tmdsclk <= 340000 && is_hdmi2_mode(mode) &&
!drm_mode_is_420(&connector->display_info, mode))
return MODE_BAD;
/*
* hdmi cts hf1-31 required filtering yuv420 mode that frequency
* exceeds the max_tmds_clock of edid.
*/
if (drm_mode_is_420(&connector->display_info, mode) &&
connector->display_info.max_tmds_clock < (mode->clock / 2) &&
is_hdmi2_mode(mode))
return MODE_BAD;
};
if (hdmi->is_hdmi_qp) {
if (!hdmi->enable_gpio && mode->clock > 600000)
return MODE_BAD;
@@ -1836,23 +1866,6 @@ dw_hdmi_rockchip_mode_valid(struct dw_hdmi *dw_hdmi, void *data,
if (mode->clock > INT_MAX / 1000)
return MODE_BAD;
/*
* If sink max TMDS clock < 340MHz, we should check the mode pixel
* clock > 340MHz is YCbCr420 or not and whether the platform supports
* YCbCr420.
*/
if (!hdmi->skip_check_420_mode) {
if (mode->clock > 340000 &&
connector->display_info.max_tmds_clock < 340000 &&
(!drm_mode_is_420(&connector->display_info, mode) ||
!connector->ycbcr_420_allowed))
return MODE_BAD;
if (hdmi->max_tmdsclk <= 340000 && mode->clock > 340000 &&
!drm_mode_is_420(&connector->display_info, mode))
return MODE_BAD;
};
if (hdmi->phy) {
if (hdmi->is_hdmi_qp)
phy_set_bus_width(hdmi->phy, mode->clock * 10);

3
drivers/media/i2c/rk628/rk628.h
View File

@@ -228,6 +228,9 @@
#define GRF_SOC_VERSION 0x0200
#define GRF_MAX_REGISTER GRF_SOC_VERSION
#define RK628_DEFAULT_WIDTH 64
#define RK628_DEFAULT_HEIGHT 64
enum {
COMBTXPHY_MODULEA_EN = BIT(0),
COMBTXPHY_MODULEB_EN = BIT(1),

4
drivers/media/i2c/rk628/rk628_bt1120_v4l2.c
View File

@@ -938,10 +938,6 @@ static void rk628_bt1120_enable_interrupts(struct v4l2_subdev *sd, bool en)
rk628_i2c_write(bt1120->rk628, HDMI_RX_MD_IEN_CLR, md_mask);
rk628_i2c_write(bt1120->rk628, HDMI_RX_PDEC_IEN_CLR, pdec_mask);
rk628_i2c_write(bt1120->rk628, HDMI_RX_AUD_FIFO_IEN_CLR, 0x1f);
if (bt1120->cec && bt1120->cec->adap) {
rk628_i2c_write(bt1120->rk628, HDMI_RX_AUD_CEC_IEN_SET, 0);
rk628_i2c_write(bt1120->rk628, HDMI_RX_AUD_CEC_IEN_CLR, ~0);
}
bt1120->vid_ints_en = false;
}
usleep_range(5000, 5000);

23
drivers/media/i2c/rk628/rk628_csi_v4l2.c
View File

@@ -876,6 +876,11 @@ static void enable_stream(struct v4l2_subdev *sd, bool en)
v4l2_dbg(1, debug, sd, "%s: %sable\n", __func__, en ? "en" : "dis");
if (en) {
if (!tx_5v_power_present(sd) || csi->nosignal) {
v4l2_err(sd, "%s: hdmi no signal or unplug!\n", __func__);
return;
}
if (rk628_hdmirx_scdc_ced_err(csi->rk628)) {
rk628_hdmirx_plugout(sd);
schedule_delayed_work(&csi->delayed_work_enable_hotplug,
@@ -1538,10 +1543,6 @@ static void rk628_csi_enable_interrupts(struct v4l2_subdev *sd, bool en)
rk628_i2c_write(csi->rk628, HDMI_RX_MD_IEN_CLR, md_mask);
rk628_i2c_write(csi->rk628, HDMI_RX_PDEC_IEN_CLR, pdec_mask);
rk628_i2c_write(csi->rk628, HDMI_RX_AUD_FIFO_IEN_CLR, 0x1f);
if (csi->cec && csi->cec->adap) {
rk628_i2c_write(csi->rk628, HDMI_RX_AUD_CEC_IEN_SET, 0);
rk628_i2c_write(csi->rk628, HDMI_RX_AUD_CEC_IEN_CLR, ~0);
}
csi->vid_ints_en = false;
}
usleep_range(5000, 5000);
@@ -2007,13 +2008,20 @@ static int rk628_csi_get_fmt(struct v4l2_subdev *sd,
{
struct rk628_csi *csi = to_csi(sd);
mutex_lock(&csi->confctl_mutex);
/* The application don't wants this to be blocked, so use mutex_trylock() */
if (!mutex_trylock(&csi->confctl_mutex)) {
format->format.code = csi->mbus_fmt_code;
format->format.width = RK628_DEFAULT_WIDTH;
format->format.height = RK628_DEFAULT_HEIGHT;
format->format.field = V4L2_FIELD_NONE;
return 0;
}
format->format.code = csi->mbus_fmt_code;
format->format.width = csi->timings.bt.width;
format->format.width = ALIGN_DOWN(csi->timings.bt.width, 8);
format->format.height = csi->timings.bt.height;
format->format.field = csi->timings.bt.interlaced ?
V4L2_FIELD_INTERLACED : V4L2_FIELD_NONE;
mutex_unlock(&csi->confctl_mutex);
if (csi->plat_data->tx_mode == CSI_MODE) {
if (csi->timings.bt.pixelclock > 150000000 || csi->csi_lanes_in_use <= 2) {
@@ -2057,6 +2065,7 @@ static int rk628_csi_get_fmt(struct v4l2_subdev *sd,
__v4l2_ctrl_s_ctrl_int64(csi->pixel_rate, RK628_CSI_PIXEL_RATE_HIGH);
}
mutex_unlock(&csi->confctl_mutex);
v4l2_dbg(1, debug, sd, "%s: fmt code:%d, w:%d, h:%d, field code:%d\n",
__func__, format->format.code, format->format.width,
format->format.height, format->format.field);

7
drivers/spi/spidev-rkmst.c
View File

@@ -617,6 +617,12 @@ MODULE_DEVICE_TABLE(of, spidev_rkmst_dt_match);
#endif /* CONFIG_OF */
static const struct spi_device_id spidev_rkmst_spi_ids[] = {
{ .name = "spi-obj-master" },
{},
};
MODULE_DEVICE_TABLE(spi, spidev_rkmst_spi_ids);
static struct spi_driver spidev_rkmst_driver = {
.driver = {
.name = "spidev_rkmst",
@@ -625,6 +631,7 @@ static struct spi_driver spidev_rkmst_driver = {
},
.probe = spidev_rkmst_probe,
.remove = spidev_rkmst_remove,
.id_table = spidev_rkmst_spi_ids,
};
module_spi_driver(spidev_rkmst_driver);

11
drivers/spi/spidev-rkslv.c
View File

@@ -395,7 +395,13 @@ MODULE_DEVICE_TABLE(of, spidev_rkslv_dt_match);
#endif /* CONFIG_OF */
static struct spi_driver spidev_rkmst_driver = {
static const struct spi_device_id spidev_rkslv_spi_ids[] = {
{ .name = "spi-obj-slave" },
{},
};
MODULE_DEVICE_TABLE(spi, spidev_rkslv_spi_ids);
static struct spi_driver spidev_rkslv_driver = {
.driver = {
.name = "spidev_rkslv",
.owner = THIS_MODULE,
@@ -403,8 +409,9 @@ static struct spi_driver spidev_rkmst_driver = {
},
.probe = spidev_rkslv_probe,
.remove = spidev_rkslv_remove,
.id_table = spidev_rkslv_spi_ids,
};
module_spi_driver(spidev_rkmst_driver);
module_spi_driver(spidev_rkslv_driver);
MODULE_AUTHOR("Jon Lin <jon.lin@rock-chips.com>");
MODULE_DESCRIPTION("ROCKCHIP SPI Object Slave Driver");

1
drivers/spi/spidev.c
View File

@@ -700,6 +700,7 @@ static const struct spi_device_id spidev_spi_ids[] = {
{ .name = "m53cpld" },
{ .name = "spi-petra" },
{ .name = "spi-authenta" },
{ .name = "spidev" },
{},
};
MODULE_DEVICE_TABLE(spi, spidev_spi_ids);