Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1687101

[PATCH 01/11] ARM: dts: sun8i: a83t: Switch to CCU device tree binding macros

From Chen-Yu Tsai <wens@csie.org>
Newsgroups linux.kernel
Subject [PATCH 01/11] ARM: dts: sun8i: a83t: Switch to CCU device tree binding macros
Date 2017-07-14 08:50 +0200
Message-ID <u32Ai-84Q-27@gated-at.bofh.it> (permalink)
References <u32Ai-84Q-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Now that the CCU device tree binding headers have been merged, we can
use the properly named macros in the device tree, instead of raw
numbers.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---

This patch is included as it is a pre-requisite to the other device
tree changes in this series. It is however independent, and should
be applied as a fix for 4.13-rc, not for -next, and preferably sooner
than later.

---
 arch/arm/boot/dts/sun8i-a83t.dtsi | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
index 21439d0aa55d..beed05e10a3b 100644
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
@@ -44,7 +44,9 @@
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
+#include <dt-bindings/clock/sun8i-a83t-ccu.h>
 #include <dt-bindings/clock/sun8i-r-ccu.h>
+#include <dt-bindings/reset/sun8i-a83t-ccu.h>
 
 / {
 	interrupt-parent = <&gic>;
@@ -175,8 +177,8 @@
 			compatible = "allwinner,sun8i-a83t-dma";
 			reg = <0x01c02000 0x1000>;
 			interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&ccu 21>;
-			resets = <&ccu 7>;
+			clocks = <&ccu CLK_BUS_DMA>;
+			resets = <&ccu RST_BUS_DMA>;
 			#dma-cells = <1>;
 		};
 
@@ -195,7 +197,7 @@
 				     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
 			reg = <0x01c20800 0x400>;
-			clocks = <&ccu 45>, <&osc24M>, <&osc16Md512>;
+			clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc16Md512>;
 			clock-names = "apb", "hosc", "losc";
 			gpio-controller;
 			interrupt-controller;
@@ -247,8 +249,8 @@
 				     "allwinner,sun8i-h3-spdif";
 			reg = <0x01c21000 0x400>;
 			interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&ccu 44>, <&ccu 76>;
-			resets = <&ccu 32>;
+			clocks = <&ccu CLK_BUS_SPDIF>, <&ccu CLK_SPDIF>;
+			resets = <&ccu RST_BUS_SPDIF>;
 			clock-names = "apb", "spdif";
 			dmas = <&dma 2>;
 			dma-names = "tx";
@@ -263,8 +265,8 @@
 			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
 			reg-shift = <2>;
 			reg-io-width = <4>;
-			clocks = <&ccu 53>;
-			resets = <&ccu 40>;
+			clocks = <&ccu CLK_BUS_UART0>;
+			resets = <&ccu RST_BUS_UART0>;
 			status = "disabled";
 		};
 
-- 
2.13.2

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 00/11] ARM: sun8i: a83t: Add support for MMC controllers Chen-Yu Tsai <wens@csie.org> - 2017-07-14 08:50 +0200
  [PATCH 11/11] ARM: dts: sun8i: a83t: h8homlet: Enable micro-SD card and onboard eMMC Chen-Yu Tsai <wens@csie.org> - 2017-07-14 08:50 +0200
  [PATCH 04/11] mmc: sunxi: Keep default timing phase settings for new timing mode Chen-Yu Tsai <wens@csie.org> - 2017-07-14 08:50 +0200
    Re: [PATCH 04/11] mmc: sunxi: Keep default timing phase settings for  new timing mode Ulf Hansson <ulf.hansson@linaro.org> - 2017-07-14 11:20 +0200
      Re: [PATCH 04/11] mmc: sunxi: Keep default timing phase settings for  new timing mode Chen-Yu Tsai <wens@csie.org> - 2017-07-14 11:50 +0200
    Re: [PATCH 04/11] mmc: sunxi: Keep default timing phase settings for  new timing mode Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-07-17 11:20 +0200
    Re: [PATCH 04/11] mmc: sunxi: Keep default timing phase settings for  new timing mode Ulf Hansson <ulf.hansson@linaro.org> - 2017-07-17 12:40 +0200
  [PATCH 09/11] ARM: dts: sun8i: a83t: Add pingroup for 8-bit eMMC on mmc2 Chen-Yu Tsai <wens@csie.org> - 2017-07-14 08:50 +0200
  [PATCH 01/11] ARM: dts: sun8i: a83t: Switch to CCU device tree binding macros Chen-Yu Tsai <wens@csie.org> - 2017-07-14 08:50 +0200
    Re: [PATCH 01/11] ARM: dts: sun8i: a83t: Switch to CCU device tree  binding macros Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-07-17 11:10 +0200
  [PATCH 02/11] clk: sunxi-ng: Add interface to query or configure MMC timing modes. Chen-Yu Tsai <wens@csie.org> - 2017-07-14 08:50 +0200
    Re: [PATCH 02/11] clk: sunxi-ng: Add interface to query or configure  MMC timing modes. Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-07-17 11:20 +0200
  [PATCH 08/11] ARM: dts: sun8i: a83t: Add MMC controller device nodes Chen-Yu Tsai <wens@csie.org> - 2017-07-14 08:50 +0200
    Re: [PATCH 08/11] ARM: dts: sun8i: a83t: Add MMC controller device  nodes Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-07-17 11:30 +0200
  [PATCH 07/11] mmc: sunxi: Add support for A83T eMMC (MMC2) Chen-Yu Tsai <wens@csie.org> - 2017-07-14 08:50 +0200
    Re: [PATCH 07/11] mmc: sunxi: Add support for A83T eMMC (MMC2) Rob Herring <robh@kernel.org> - 2017-07-17 21:00 +0200
  [PATCH 05/11] mmc: sunxi: Support controllers that can use both old and new timings Chen-Yu Tsai <wens@csie.org> - 2017-07-14 08:50 +0200
    Re: [PATCH 05/11] mmc: sunxi: Support controllers that can use both  old and new timings Ulf Hansson <ulf.hansson@linaro.org> - 2017-07-14 11:30 +0200
      Re: [PATCH 05/11] mmc: sunxi: Support controllers that can use both  old and new timings Chen-Yu Tsai <wens@csie.org> - 2017-07-14 11:50 +0200
        Re: [PATCH 05/11] mmc: sunxi: Support controllers that can use both  old and new timings Ulf Hansson <ulf.hansson@linaro.org> - 2017-07-14 12:00 +0200
          Re: [PATCH 05/11] mmc: sunxi: Support controllers that can use both  old and new timings Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-07-17 11:30 +0200
    Re: [PATCH 05/11] mmc: sunxi: Support controllers that can use both  old and new timings Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-07-17 11:20 +0200

csiph-web