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

Merge commit '62ba841def983d87eb54878372a252048a85c801'

Browse Source 
* commit '62ba841def983d87eb54878372a252048a85c801':
  usb: gadget: u_audio: Add missing break in g_audio_work
  ANDROID: usb: gadget: configfs: Add Uevent to notify userspace
  ANDROID: usb: gadget: configfs: Add usb_function ptr to fi struct
  phy: rockchip: inno-usb2: only disable usb480m clk in error path
  drm/rockchip: dw_hdmi: regulator avdd-0v9 and avdd-1v8 is optional
  rk: kbuild: silence resource_tool warning
This commit is contained in:
Tao Huang
2023-05-24 17:04:20 +08:00
parent 0842130bd4 62ba841def
commit 8f0da5189f
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1489,12 +1489,20 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
}
hdmi->avdd_0v9 = devm_regulator_get_optional(hdmi->dev, "avdd-0v9");
if (IS_ERR(hdmi->avdd_0v9))
return PTR_ERR(hdmi->avdd_0v9);
if (IS_ERR(hdmi->avdd_0v9)) {
if (PTR_ERR(hdmi->avdd_0v9) != -ENODEV)
return dev_err_probe(hdmi->dev, PTR_ERR(hdmi->avdd_0v9),
"failed to get regulator: avdd-0v9\n");
hdmi->avdd_0v9 = NULL;
}
hdmi->avdd_1v8 = devm_regulator_get_optional(hdmi->dev, "avdd-1v8");
if (IS_ERR(hdmi->avdd_1v8))
return PTR_ERR(hdmi->avdd_1v8);
if (IS_ERR(hdmi->avdd_1v8)) {
if (PTR_ERR(hdmi->avdd_1v8) != -ENODEV)
return dev_err_probe(hdmi->dev, PTR_ERR(hdmi->avdd_1v8),
"failed to get regulator: avdd-1v8\n");
hdmi->avdd_1v8 = NULL;
}
hdmi->skip_check_420_mode =
of_property_read_bool(np, "skip-check-420-mode");

15
drivers/phy/rockchip/phy-rockchip-inno-usb2.c
View File

@@ -886,8 +886,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy)
goto unlock;
ret = property_enable(base, &rport->port_cfg->phy_sus, false);
if (ret)
goto disable_clks;
if (ret) {
clk_disable_unprepare(rphy->clk480m);
goto unlock;
}
/*
* For rk3588, it needs to reset phy when exit from
@@ -900,8 +902,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy)
if (rport->port_id == USB2PHY_PORT_OTG &&
of_device_is_compatible(rphy->dev->of_node, "rockchip,rk3588-usb2phy")) {
ret = rockchip_usb2phy_reset(rphy);
if (ret)
goto disable_clks;
if (ret) {
clk_disable_unprepare(rphy->clk480m);
goto unlock;
}
}
/* waiting for the utmi_clk to become stable */
@@ -909,9 +913,6 @@ static int rockchip_usb2phy_power_on(struct phy *phy)
rport->suspended = false;
disable_clks:
clk_disable_unprepare(rphy->clk480m);
unlock:
mutex_unlock(&rport->mutex);

1
drivers/usb/gadget/function/u_audio.c
View File

@@ -1284,6 +1284,7 @@ static void g_audio_work(struct work_struct *data)
uac_event[0] = "USB_STATE=SET_AUDIO_CLK";
snprintf(str, sizeof(str), "PPM=%d", audio->params.ppm);
uac_event[1] = str;
break;
default:
break;
}

1
scripts/Makefile
View File

@@ -15,6 +15,7 @@ hostprogs-always-$(CONFIG_RUST) += generate_rust_target
generate_rust_target-rust := y
HOSTCFLAGS_resource_tool.o += -Wno-declaration-after-statement
HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include
HOSTLDLIBS_sorttable = -lpthread
HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include