0010-clk-sifive-Sync-up-DT-bindings-header-with-upstream-.patch 3.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495
  1. From 810b76326c3ea6a6747e5cd65c59d41124893305 Mon Sep 17 00:00:00 2001
  2. From: Anup Patel <anup.patel@wdc.com>
  3. Date: Tue, 18 Jun 2019 12:21:03 +0530
  4. Subject: [PATCH 10/21] clk: sifive: Sync-up DT bindings header with upstream
  5. Linux
  6. The location and license header of DT bindings header for SiFive
  7. clock driver has changed in upstream Linux hence this patch.
  8. Signed-off-by: Anup Patel <anup.patel@wdc.com>
  9. Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
  10. Upstream-Status: Submitted
  11. ---
  12. drivers/clk/sifive/fu540-prci.c | 2 +-
  13. include/dt-bindings/clk/sifive-fu540-prci.h | 29 -------------------
  14. include/dt-bindings/clock/sifive-fu540-prci.h | 18 ++++++++++++
  15. 3 files changed, 19 insertions(+), 30 deletions(-)
  16. delete mode 100644 include/dt-bindings/clk/sifive-fu540-prci.h
  17. create mode 100644 include/dt-bindings/clock/sifive-fu540-prci.h
  18. diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
  19. index cdbf35e871..ceb318e062 100644
  20. --- a/drivers/clk/sifive/fu540-prci.c
  21. +++ b/drivers/clk/sifive/fu540-prci.c
  22. @@ -38,7 +38,7 @@
  23. #include <linux/math64.h>
  24. #include <linux/clk/analogbits-wrpll-cln28hpc.h>
  25. -#include <dt-bindings/clk/sifive-fu540-prci.h>
  26. +#include <dt-bindings/clock/sifive-fu540-prci.h>
  27. /*
  28. * EXPECTED_CLK_PARENT_COUNT: how many parent clocks this driver expects:
  29. diff --git a/include/dt-bindings/clk/sifive-fu540-prci.h b/include/dt-bindings/clk/sifive-fu540-prci.h
  30. deleted file mode 100644
  31. index 531523ea62..0000000000
  32. --- a/include/dt-bindings/clk/sifive-fu540-prci.h
  33. +++ /dev/null
  34. @@ -1,29 +0,0 @@
  35. -/* SPDX-License-Identifier: GPL-2.0 */
  36. -/*
  37. - * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  38. - *
  39. - * Copyright (C) 2018 SiFive, Inc.
  40. - * Wesley Terpstra
  41. - * Paul Walmsley
  42. - *
  43. - * This program is free software; you can redistribute it and/or modify
  44. - * it under the terms of the GNU General Public License version 2 as
  45. - * published by the Free Software Foundation.
  46. - *
  47. - * This program is distributed in the hope that it will be useful,
  48. - * but WITHOUT ANY WARRANTY; without even the implied warranty of
  49. - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  50. - * GNU General Public License for more details.
  51. - */
  52. -
  53. -#ifndef __LINUX_CLK_SIFIVE_FU540_PRCI_H
  54. -#define __LINUX_CLK_SIFIVE_FU540_PRCI_H
  55. -
  56. -/* Clock indexes for use by Device Tree data */
  57. -
  58. -#define PRCI_CLK_COREPLL 0
  59. -#define PRCI_CLK_DDRPLL 1
  60. -#define PRCI_CLK_GEMGXLPLL 2
  61. -#define PRCI_CLK_TLCLK 3
  62. -
  63. -#endif
  64. diff --git a/include/dt-bindings/clock/sifive-fu540-prci.h b/include/dt-bindings/clock/sifive-fu540-prci.h
  65. new file mode 100644
  66. index 0000000000..6a0b70a37d
  67. --- /dev/null
  68. +++ b/include/dt-bindings/clock/sifive-fu540-prci.h
  69. @@ -0,0 +1,18 @@
  70. +/* SPDX-License-Identifier: GPL-2.0 */
  71. +/*
  72. + * Copyright (C) 2018-2019 SiFive, Inc.
  73. + * Wesley Terpstra
  74. + * Paul Walmsley
  75. + */
  76. +
  77. +#ifndef __DT_BINDINGS_CLOCK_SIFIVE_FU540_PRCI_H
  78. +#define __DT_BINDINGS_CLOCK_SIFIVE_FU540_PRCI_H
  79. +
  80. +/* Clock indexes for use by Device Tree data and the PRCI driver */
  81. +
  82. +#define PRCI_CLK_COREPLL 0
  83. +#define PRCI_CLK_DDRPLL 1
  84. +#define PRCI_CLK_GEMGXLPLL 2
  85. +#define PRCI_CLK_TLCLK 3
  86. +
  87. +#endif
  88. --
  89. 2.22.0