On Thu, Jul 05, 2018 at 04:32:39PM +0300, Todor Tomov wrote:
> Unify the clock names - use names closer to the clock
> definitions.
Why? You can't just change names. You are breaking an ABI.
>
> CC: Rob Herring <robh+dt@xxxxxxxxxx>
> CC: Mark Rutland <mark.rutland@xxxxxxx>
> CC: devicetree@xxxxxxxxxxxxxxx
> Signed-off-by: Todor Tomov <todor.tomov@xxxxxxxxxx>
> ---
> .../devicetree/bindings/media/qcom,camss.txt | 24 +++++++++++-----------
Bindings should be a separate patch.
> drivers/media/platform/qcom/camss/camss.c | 20 ++++++++----------
> 2 files changed, 20 insertions(+), 24 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/media/qcom,camss.txt b/Documentation/devicetree/bindings/media/qcom,camss.txt
> index cadeceb..032e8ed 100644
> --- a/Documentation/devicetree/bindings/media/qcom,camss.txt
> +++ b/Documentation/devicetree/bindings/media/qcom,camss.txt
> @@ -53,7 +53,7 @@ Qualcomm Camera Subsystem
> Usage: required
> Value type: <stringlist>
> Definition: Should contain the following entries:
> - - "camss_top_ahb"
> + - "top_ahb"
> - "ispif_ahb"
> - "csiphy0_timer"
> - "csiphy1_timer"
> @@ -67,11 +67,11 @@ Qualcomm Camera Subsystem
> - "csi1_phy"
> - "csi1_pix"
> - "csi1_rdi"
> - - "camss_ahb"
> - - "camss_vfe_vfe"
> - - "camss_csi_vfe"
> - - "iface"
> - - "bus"
> + - "ahb"
> + - "vfe0"
> + - "csi_vfe0"
> + - "vfe_ahb"
> + - "vfe_axi"
> - vdda-supply:
> Usage: required
> Value type: <phandle>
> @@ -161,7 +161,7 @@ Qualcomm Camera Subsystem
> <&gcc GCC_CAMSS_CSI_VFE0_CLK>,
> <&gcc GCC_CAMSS_VFE_AHB_CLK>,
> <&gcc GCC_CAMSS_VFE_AXI_CLK>;
> - clock-names = "camss_top_ahb",
> + clock-names = "top_ahb",
> "ispif_ahb",
> "csiphy0_timer",
> "csiphy1_timer",
> @@ -175,11 +175,11 @@ Qualcomm Camera Subsystem
> "csi1_phy",
> "csi1_pix",
> "csi1_rdi",
> - "camss_ahb",
> - "camss_vfe_vfe",
> - "camss_csi_vfe",
> - "iface",
> - "bus";
> + "ahb",
> + "vfe0",
> + "csi_vfe0",
> + "vfe_ahb",
> + "vfe_axi";
> vdda-supply = <&pm8916_l2>;
> iommus = <&apps_iommu 3>;
> ports {
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index abf6184..0b663e0 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -32,8 +32,7 @@ static const struct resources csiphy_res[] = {
> /* CSIPHY0 */
> {
> .regulator = { NULL },
> - .clock = { "camss_top_ahb", "ispif_ahb",
> - "camss_ahb", "csiphy0_timer" },
> + .clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy0_timer" },
> .clock_rate = { { 0 },
> { 0 },
> { 0 },
> @@ -45,8 +44,7 @@ static const struct resources csiphy_res[] = {
> /* CSIPHY1 */
> {
> .regulator = { NULL },
> - .clock = { "camss_top_ahb", "ispif_ahb",
> - "camss_ahb", "csiphy1_timer" },
> + .clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy1_timer" },
> .clock_rate = { { 0 },
> { 0 },
> { 0 },
> @@ -60,8 +58,7 @@ static const struct resources csid_res[] = {
> /* CSID0 */
> {
> .regulator = { "vdda" },
> - .clock = { "camss_top_ahb", "ispif_ahb",
> - "csi0_ahb", "camss_ahb",
> + .clock = { "top_ahb", "ispif_ahb", "csi0_ahb", "ahb",
> "csi0", "csi0_phy", "csi0_pix", "csi0_rdi" },
> .clock_rate = { { 0 },
> { 0 },
> @@ -78,8 +75,7 @@ static const struct resources csid_res[] = {
> /* CSID1 */
> {
> .regulator = { "vdda" },
> - .clock = { "camss_top_ahb", "ispif_ahb",
> - "csi1_ahb", "camss_ahb",
> + .clock = { "top_ahb", "ispif_ahb", "csi1_ahb", "ahb",
> "csi1", "csi1_phy", "csi1_pix", "csi1_rdi" },
> .clock_rate = { { 0 },
> { 0 },
> @@ -96,10 +92,10 @@ static const struct resources csid_res[] = {
>
> static const struct resources_ispif ispif_res = {
> /* ISPIF */
> - .clock = { "camss_top_ahb", "camss_ahb", "ispif_ahb",
> + .clock = { "top_ahb", "ahb", "ispif_ahb",
> "csi0", "csi0_pix", "csi0_rdi",
> "csi1", "csi1_pix", "csi1_rdi" },
> - .clock_for_reset = { "camss_vfe_vfe", "camss_csi_vfe" },
> + .clock_for_reset = { "vfe0", "csi_vfe0" },
> .reg = { "ispif", "csi_clk_mux" },
> .interrupt = "ispif"
>
> @@ -108,8 +104,8 @@ static const struct resources_ispif ispif_res = {
> static const struct resources vfe_res = {
> /* VFE0 */
> .regulator = { NULL },
> - .clock = { "camss_top_ahb", "camss_vfe_vfe", "camss_csi_vfe",
> - "iface", "bus", "camss_ahb" },
> + .clock = { "top_ahb", "vfe0", "csi_vfe0",
> + "vfe_ahb", "vfe_axi", "ahb" },
> .clock_rate = { { 0 },
> { 50000000, 80000000, 100000000, 160000000,
> 177780000, 200000000, 266670000, 320000000,
> --
> 2.7.4
>
