Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dt-bindings: display: msm: update clk names

Now that drm/msm is converted over to use msm_get_clk() everywhere (that
matters), which handles falling back to looking for a clock with the
"_clk" suffix, we can remove "_clk" from the documentation so that new
dts files added do not include "_clk" in the name.

Previously we were doing this for the more recently upstreamed bindings
but not for (nearly) all.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Acked-by: Rob Herring <robh@kernel.org>

+48 -48
+18 -18
Documentation/devicetree/bindings/display/msm/dsi.txt
··· 13 13 - power-domains: Should be <&mmcc MDSS_GDSC>. 14 14 - clocks: Phandles to device clocks. 15 15 - clock-names: the following clocks are required: 16 - * "mdp_core_clk" 17 - * "iface_clk" 18 - * "bus_clk" 19 - * "core_mmss_clk" 20 - * "byte_clk" 21 - * "pixel_clk" 22 - * "core_clk" 16 + * "mdp_core" 17 + * "iface" 18 + * "bus" 19 + * "core_mmss" 20 + * "byte" 21 + * "pixel" 22 + * "core" 23 23 For DSIv2, we need an additional clock: 24 - * "src_clk" 25 - - assigned-clocks: Parents of "byte_clk" and "pixel_clk" for the given platform. 24 + * "src" 25 + - assigned-clocks: Parents of "byte" and "pixel" for the given platform. 26 26 - assigned-clock-parents: The Byte clock and Pixel clock PLL outputs provided 27 27 by a DSI PHY block. See [1] for details on clock bindings. 28 28 - vdd-supply: phandle to vdd regulator device node ··· 101 101 - power-domains: Should be <&mmcc MDSS_GDSC>. 102 102 - clocks: Phandles to device clocks. See [1] for details on clock bindings. 103 103 - clock-names: the following clocks are required: 104 - * "iface_clk" 104 + * "iface" 105 105 - vddio-supply: phandle to vdd-io regulator device node 106 106 107 107 Optional properties: ··· 123 123 reg = <0xfd922800 0x200>; 124 124 power-domains = <&mmcc MDSS_GDSC>; 125 125 clock-names = 126 - "bus_clk", 127 - "byte_clk", 128 - "core_clk", 129 - "core_mmss_clk", 130 - "iface_clk", 131 - "mdp_core_clk", 132 - "pixel_clk"; 126 + "bus", 127 + "byte", 128 + "core", 129 + "core_mmss", 130 + "iface", 131 + "mdp_core", 132 + "pixel"; 133 133 clocks = 134 134 <&mmcc MDSS_AXI_CLK>, 135 135 <&mmcc MDSS_BYTE0_CLK>, ··· 207 207 reg = <0xfd922a00 0xd4>, 208 208 <0xfd922b00 0x2b0>, 209 209 <0xfd922d80 0x7b>; 210 - clock-names = "iface_clk"; 210 + clock-names = "iface"; 211 211 clocks = <&mmcc MDSS_AHB_CLK>; 212 212 #clock-cells = <1>; 213 213 vddio-supply = <&pma8084_l12>;
+10 -10
Documentation/devicetree/bindings/display/msm/edp.txt
··· 12 12 - clocks: device clocks 13 13 See Documentation/devicetree/bindings/clock/clock-bindings.txt for details. 14 14 - clock-names: the following clocks are required: 15 - * "core_clk" 16 - * "iface_clk" 17 - * "mdp_core_clk" 18 - * "pixel_clk" 19 - * "link_clk" 15 + * "core" 16 + * "iface" 17 + * "mdp_core" 18 + * "pixel" 19 + * "link" 20 20 - #clock-cells: The value should be 1. 21 21 - vdda-supply: phandle to vdda regulator device node 22 22 - lvl-vdd-supply: phandle to regulator device node which is used to supply power ··· 41 41 interrupts = <12 0>; 42 42 power-domains = <&mmcc MDSS_GDSC>; 43 43 clock-names = 44 - "core_clk", 45 - "pixel_clk", 46 - "iface_clk", 47 - "link_clk", 48 - "mdp_core_clk"; 44 + "core", 45 + "pixel", 46 + "iface", 47 + "link", 48 + "mdp_core"; 49 49 clocks = 50 50 <&mmcc MDSS_EDPAUX_CLK>, 51 51 <&mmcc MDSS_EDPPIXEL_CLK>,
+4 -4
Documentation/devicetree/bindings/display/msm/hdmi.txt
··· 64 64 interrupts = <GIC_SPI 79 0>; 65 65 power-domains = <&mmcc MDSS_GDSC>; 66 66 clock-names = 67 - "core_clk", 68 - "master_iface_clk", 69 - "slave_iface_clk"; 67 + "core", 68 + "master_iface", 69 + "slave_iface"; 70 70 clocks = 71 71 <&mmcc HDMI_APP_CLK>, 72 72 <&mmcc HDMI_M_AHB_CLK>, ··· 92 92 <0x4a00500 0x100>; 93 93 #phy-cells = <0>; 94 94 power-domains = <&mmcc MDSS_GDSC>; 95 - clock-names = "slave_iface_clk"; 95 + clock-names = "slave_iface"; 96 96 clocks = <&mmcc HDMI_S_AHB_CLK>; 97 97 core-vdda-supply = <&pm8921_hdmi_mvs>; 98 98 };
+16 -16
Documentation/devicetree/bindings/display/msm/mdp5.txt
··· 22 22 Documentation/devicetree/bindings/power/power_domain.txt 23 23 - clocks: device clocks. See ../clocks/clock-bindings.txt for details. 24 24 - clock-names: the following clocks are required. 25 - * "iface_clk" 26 - * "bus_clk" 27 - * "vsync_clk" 25 + * "iface" 26 + * "bus" 27 + * "vsync" 28 28 - #address-cells: number of address cells for the MDSS children. Should be 1. 29 29 - #size-cells: Should be 1. 30 30 - ranges: parent bus address space is the same as the child bus address space. 31 31 32 32 Optional properties: 33 33 - clock-names: the following clocks are optional: 34 - * "lut_clk" 34 + * "lut" 35 35 36 36 MDP5: 37 37 Required properties: ··· 45 45 through MDP block 46 46 - clocks: device clocks. See ../clocks/clock-bindings.txt for details. 47 47 - clock-names: the following clocks are required. 48 - - * "bus_clk" 49 - - * "iface_clk" 50 - - * "core_clk" 51 - - * "vsync_clk" 48 + - * "bus" 49 + - * "iface" 50 + - * "core" 51 + - * "vsync" 52 52 - ports: contains the list of output ports from MDP. These connect to interfaces 53 53 that are external to the MDP hardware, such as HDMI, DSI, EDP etc (LVDS is a 54 54 special case since it is a part of the MDP block itself). ··· 77 77 78 78 Optional properties: 79 79 - clock-names: the following clocks are optional: 80 - * "lut_clk" 80 + * "lut" 81 81 82 82 Example: 83 83 ··· 95 95 clocks = <&gcc GCC_MDSS_AHB_CLK>, 96 96 <&gcc GCC_MDSS_AXI_CLK>, 97 97 <&gcc GCC_MDSS_VSYNC_CLK>; 98 - clock-names = "iface_clk", 99 - "bus_clk", 100 - "vsync_clk" 98 + clock-names = "iface", 99 + "bus", 100 + "vsync" 101 101 102 102 interrupts = <0 72 0>; 103 103 ··· 120 120 <&gcc GCC_MDSS_AXI_CLK>, 121 121 <&gcc GCC_MDSS_MDP_CLK>, 122 122 <&gcc GCC_MDSS_VSYNC_CLK>; 123 - clock-names = "iface_clk", 124 - "bus_clk", 125 - "core_clk", 126 - "vsync_clk"; 123 + clock-names = "iface", 124 + "bus", 125 + "core", 126 + "vsync"; 127 127 128 128 ports { 129 129 #address-cells = <1>;