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

Merge commit 'fa7c72a7cf204c801ce1a87b03b611baf03b0ed5'

Browse Source 
* commit 'fa7c72a7cf204c801ce1a87b03b611baf03b0ed5':
  arm64: dts: rockchip: rk3588: remove unused sub node hdptxphy_hdmi_clk0/1
  arm64: dts: rockchip: rk3588-nvr: update hdmi phy clk
  phy: rockchip-samsung-hdptx-hdmi: move hdmi phy clk register at hdmiphy
  arm64: dts: rockchip: rk3588: move hdmi phy clk to hdmiphy
  regulator: core: Ensure debugfs is fully initialized

Change-Id: Ic6a9fc796c6f29f960f769ffb04a48237722d355
This commit is contained in:
Tao Huang
2024-01-02 16:16:24 +08:00
parent 35dfbfded3 fa7c72a7cf
commit 4f6447a15d
5 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi
View File

@@ -130,7 +130,7 @@
};
&display_subsystem {
clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>;
clocks = <&hdptxphy_hdmi0>, <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
};
@@ -149,14 +149,6 @@
status = "okay";
};
&hdptxphy_hdmi_clk0 {
status = "okay";
};
&hdptxphy_hdmi_clk1 {
status = "okay";
};
&iep {
status = "okay";
};

9
arch/arm64/boot/dts/rockchip/rk3588.dtsi
View File

@@ -377,7 +377,7 @@
<&cru DCLK_VOP2>,
<&cru DCLK_VOP3>,
<&hclk_vo1>,
<&hdptxphy_hdmi_clk1>;
<&hdptxphy_hdmi1>;
clock-names = "pclk",
"hpd",
"earc",
@@ -769,6 +769,8 @@
reg = <0x0 0xfed70000 0x0 0x2000>;
clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>, <&cru PCLK_HDPTX1>;
clock-names = "ref", "apb";
clock-output-names = "clk_hdmiphy_pixel1";
#clock-cells = <0>;
resets = <&cru SRST_HDPTX1>, <&cru SRST_P_HDPTX1>,
<&cru SRST_HDPTX1_INIT>, <&cru SRST_HDPTX1_CMN>,
<&cru SRST_HDPTX1_LANE>, <&cru SRST_HDPTX1_ROPLL>,
@@ -778,11 +780,6 @@
rockchip,grf = <&hdptxphy1_grf>;
#phy-cells = <0>;
status = "disabled";
hdptxphy_hdmi_clk1: clk-port {
#clock-cells = <0>;
status = "okay";
};
};

9
arch/arm64/boot/dts/rockchip/rk3588s.dtsi
View File

@@ -5102,7 +5102,7 @@
<&cru DCLK_VOP2>,
<&cru DCLK_VOP3>,
<&hclk_vo1>,
<&hdptxphy_hdmi_clk0>;
<&hdptxphy_hdmi0>;
clock-names = "pclk",
"hpd",
"earc",
@@ -6720,6 +6720,8 @@
reg = <0x0 0xfed60000 0x0 0x2000>;
clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>, <&cru PCLK_HDPTX0>;
clock-names = "ref", "apb";
clock-output-names = "clk_hdmiphy_pixel0";
#clock-cells = <0>;
resets = <&cru SRST_HDPTX0>, <&cru SRST_P_HDPTX0>,
<&cru SRST_HDPTX0_INIT>, <&cru SRST_HDPTX0_CMN>,
<&cru SRST_HDPTX0_LANE>, <&cru SRST_HDPTX0_ROPLL>,
@@ -6729,11 +6731,6 @@
rockchip,grf = <&hdptxphy0_grf>;
#phy-cells = <0>;
status = "disabled";
hdptxphy_hdmi_clk0: clk-port {
#clock-cells = <0>;
status = "okay";
};
};
usbdp_phy0: phy@fed80000 {

18
drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c
View File

@@ -2151,21 +2151,11 @@ static int rockchip_hdptx_phy_clk_register(struct rockchip_hdptx_phy *hdptx)
{
struct device *dev = hdptx->dev;
struct device_node *np = dev->of_node;
struct device_node *clk_np;
struct platform_device *pdev;
struct clk_init_data init = {};
struct clk *refclk;
const char *parent_name;
int ret;
clk_np = of_get_child_by_name(np, "clk-port");
if (!clk_np)
return 0;
pdev = of_platform_device_create(clk_np, NULL, dev);
if (!pdev)
return 0;
refclk = devm_clk_get(dev, "ref");
if (IS_ERR(refclk)) {
dev_err(dev, "failed to get ref clock\n");
@@ -2177,10 +2167,6 @@ static int rockchip_hdptx_phy_clk_register(struct rockchip_hdptx_phy *hdptx)
init.parent_names = &parent_name;
init.num_parents = 1;
init.flags = CLK_GET_RATE_NOCACHE;
if (!hdptx->id)
init.name = "clk_hdmiphy_pixel0";
else
init.name = "clk_hdmiphy_pixel1";
init.ops = &hdptx_phy_clk_ops;
/* optional override of the clock name */
@@ -2188,14 +2174,14 @@ static int rockchip_hdptx_phy_clk_register(struct rockchip_hdptx_phy *hdptx)
hdptx->hw.init = &init;
hdptx->dclk = devm_clk_register(&pdev->dev, &hdptx->hw);
hdptx->dclk = devm_clk_register(hdptx->dev, &hdptx->hw);
if (IS_ERR(hdptx->dclk)) {
ret = PTR_ERR(hdptx->dclk);
dev_err(dev, "failed to register clock: %d\n", ret);
return ret;
}
ret = of_clk_add_provider(clk_np, of_clk_src_simple_get, hdptx->dclk);
ret = of_clk_add_provider(np, of_clk_src_simple_get, hdptx->dclk);
if (ret) {
dev_err(dev, "failed to register OF clock provider: %d\n", ret);
return ret;

2
drivers/regulator/core.c
View File

@@ -1924,6 +1924,8 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,
if (err != -EEXIST)
regulator->debugfs = debugfs_create_dir(supply_name, rdev->debugfs);
else
regulator->debugfs = ERR_PTR(err);
if (IS_ERR(regulator->debugfs))
rdev_dbg(rdev, "Failed to create debugfs directory\n");