110-dt-sun6i-add-pll-and-spi-modclocks.patch 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677
  1. From 7f94ebf35b017f1664e957857a7f36752e2577cd Mon Sep 17 00:00:00 2001
  2. From: Maxime Ripard <maxime.ripard@free-electrons.com>
  3. Date: Wed, 5 Feb 2014 14:05:04 +0100
  4. Subject: [PATCH] ARM: sun6i: dt: Add PLL6 and SPI module clocks
  5. The module clocks in the A31 are still compatible with the A10 one. Add the SPI
  6. module clocks and the PLL6 in the device tree to allow their use by the SPI
  7. controllers.
  8. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  9. ---
  10. arch/arm/boot/dts/sun6i-a31.dtsi | 46 ++++++++++++++++++++++++++++++++--------
  11. 1 file changed, 37 insertions(+), 9 deletions(-)
  12. --- a/arch/arm/boot/dts/sun6i-a31.dtsi
  13. +++ b/arch/arm/boot/dts/sun6i-a31.dtsi
  14. @@ -83,16 +83,12 @@
  15. clocks = <&osc24M>;
  16. };
  17. - /*
  18. - * This is a dummy clock, to be used as placeholder on
  19. - * other mux clocks when a specific parent clock is not
  20. - * yet implemented. It should be dropped when the driver
  21. - * is complete.
  22. - */
  23. - pll6: pll6 {
  24. + pll6: clk@01c20028 {
  25. #clock-cells = <0>;
  26. - compatible = "fixed-clock";
  27. - clock-frequency = <0>;
  28. + compatible = "allwinner,sun6i-a31-pll6-clk";
  29. + reg = <0x01c20028 0x4>;
  30. + clocks = <&osc24M>;
  31. + clock-output-names = "pll6";
  32. };
  33. cpu: cpu@01c20050 {
  34. @@ -192,6 +188,38 @@
  35. "apb2_uart1", "apb2_uart2", "apb2_uart3",
  36. "apb2_uart4", "apb2_uart5";
  37. };
  38. +
  39. + spi0_clk: clk@01c200a0 {
  40. + #clock-cells = <0>;
  41. + compatible = "allwinner,sun4i-mod0-clk";
  42. + reg = <0x01c200a0 0x4>;
  43. + clocks = <&osc24M>, <&pll6>;
  44. + clock-output-names = "spi0";
  45. + };
  46. +
  47. + spi1_clk: clk@01c200a4 {
  48. + #clock-cells = <0>;
  49. + compatible = "allwinner,sun4i-mod0-clk";
  50. + reg = <0x01c200a4 0x4>;
  51. + clocks = <&osc24M>, <&pll6>;
  52. + clock-output-names = "spi1";
  53. + };
  54. +
  55. + spi2_clk: clk@01c200a8 {
  56. + #clock-cells = <0>;
  57. + compatible = "allwinner,sun4i-mod0-clk";
  58. + reg = <0x01c200a8 0x4>;
  59. + clocks = <&osc24M>, <&pll6>;
  60. + clock-output-names = "spi2";
  61. + };
  62. +
  63. + spi3_clk: clk@01c200ac {
  64. + #clock-cells = <0>;
  65. + compatible = "allwinner,sun4i-mod0-clk";
  66. + reg = <0x01c200ac 0x4>;
  67. + clocks = <&osc24M>, <&pll6>;
  68. + clock-output-names = "spi3";
  69. + };
  70. };
  71. soc@01c00000 {