* [Resend PATCH v2 0/3] STM32F4 Clock binding fix & update
@ 2017-02-01 13:09 gabriel.fernandez
2017-02-01 13:09 ` [Resend PATCH v2 1/3] dt-bindings: mfd: stm32f4: Fix STM32F4_X_CLOCK() macro gabriel.fernandez
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: gabriel.fernandez @ 2017-02-01 13:09 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Russell King, Maxime Coquelin,
Alexandre Torgue, Michael Turquette, Stephen Boyd, Nicolas Pitre,
Arnd Bergmann, daniel.thompson, andrea.merello,
radoslaw.pietrzyk, Lee Jones
Cc: devicetree, linux-arm-kernel, linux-kernel, linux-clk,
gabriel.fernandez, ludovic.barre, olivier.bideau,
amelie.delaunay
From: Gabriel Fernandez <gabriel.fernandez@st.com>
v2:
- Only rename commit subject of first patch to avoid the error:
Remote Server returned '<vger.kernel.org #5.7.1 SMTP;
550 5.7.1 Content-Policy reject msg: The capital Triple-X in subject
is way too often associated with junk email,
This patch-set includes:
- a fix to STM32F4_X_CLOCK() macro
- an update of missing binding definition
- a patch to use STM32F4_X_CLOCK() macro
Gabriel Fernandez (3):
dt-bindings: mfd: stm32f4: Fix STM32F4_X_CLOCK() macro
dt-bindings: mfd: stm32f4: Add missing binding definition
ARM: dts: stm32: Use clock DT binding definition on stm32f429 family
arch/arm/boot/dts/stm32429i-eval.dts | 2 +-
arch/arm/boot/dts/stm32f429.dtsi | 66 +++++++++++++++++++----------------
include/dt-bindings/mfd/stm32f4-rcc.h | 24 +++++++++----
3 files changed, 53 insertions(+), 39 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Resend PATCH v2 1/3] dt-bindings: mfd: stm32f4: Fix STM32F4_X_CLOCK() macro
2017-02-01 13:09 [Resend PATCH v2 0/3] STM32F4 Clock binding fix & update gabriel.fernandez
@ 2017-02-01 13:09 ` gabriel.fernandez
2017-02-01 14:35 ` Lee Jones
2017-02-01 13:09 ` [Resend PATCH v2 2/3] dt-bindings: mfd: stm32f4: Add missing binding definition gabriel.fernandez
2017-02-01 13:09 ` [Resend PATCH v2 3/3] ARM: dts: stm32: Use clock DT binding definition on stm32f429 family gabriel.fernandez
2 siblings, 1 reply; 8+ messages in thread
From: gabriel.fernandez @ 2017-02-01 13:09 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Russell King, Maxime Coquelin,
Alexandre Torgue, Michael Turquette, Stephen Boyd, Nicolas Pitre,
Arnd Bergmann, daniel.thompson, andrea.merello,
radoslaw.pietrzyk, Lee Jones
Cc: devicetree, linux-arm-kernel, linux-kernel, linux-clk,
gabriel.fernandez, ludovic.barre, olivier.bideau,
amelie.delaunay
From: Gabriel Fernandez <gabriel.fernandez@st.com>
Macro to select a clock was not correct.
Offset of enable register starts at 0x30, then calculation to select a bit is:
(@enable_reg - 0x30) / 4 * 32 + bit_to_select
Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
Tested-by: M'boumba Cedric Madianga <cedric.madianga@gmail.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
---
include/dt-bindings/mfd/stm32f4-rcc.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/dt-bindings/mfd/stm32f4-rcc.h b/include/dt-bindings/mfd/stm32f4-rcc.h
index e98942d..f662b19 100644
--- a/include/dt-bindings/mfd/stm32f4-rcc.h
+++ b/include/dt-bindings/mfd/stm32f4-rcc.h
@@ -25,7 +25,7 @@
#define STM32F4_RCC_AHB1_OTGHS 29
#define STM32F4_AHB1_RESET(bit) (STM32F4_RCC_AHB1_##bit + (0x10 * 8))
-#define STM32F4_AHB1_CLOCK(bit) (STM32F4_RCC_AHB1_##bit + (0x30 * 8))
+#define STM32F4_AHB1_CLOCK(bit) (STM32F4_RCC_AHB1_##bit)
/* AHB2 */
@@ -36,13 +36,13 @@
#define STM32F4_RCC_AHB2_OTGFS 7
#define STM32F4_AHB2_RESET(bit) (STM32F4_RCC_AHB2_##bit + (0x14 * 8))
-#define STM32F4_AHB2_CLOCK(bit) (STM32F4_RCC_AHB2_##bit + (0x34 * 8))
+#define STM32F4_AHB2_CLOCK(bit) (STM32F4_RCC_AHB2_##bit + 0x20)
/* AHB3 */
#define STM32F4_RCC_AHB3_FMC 0
#define STM32F4_AHB3_RESET(bit) (STM32F4_RCC_AHB3_##bit + (0x18 * 8))
-#define STM32F4_AHB3_CLOCK(bit) (STM32F4_RCC_AHB3_##bit + (0x38 * 8))
+#define STM32F4_AHB3_CLOCK(bit) (STM32F4_RCC_AHB3_##bit + 0x40)
/* APB1 */
#define STM32F4_RCC_APB1_TIM2 0
@@ -72,7 +72,7 @@
#define STM32F4_RCC_APB1_UART8 31
#define STM32F4_APB1_RESET(bit) (STM32F4_RCC_APB1_##bit + (0x20 * 8))
-#define STM32F4_APB1_CLOCK(bit) (STM32F4_RCC_APB1_##bit + (0x40 * 8))
+#define STM32F4_APB1_CLOCK(bit) (STM32F4_RCC_APB1_##bit + 0x80)
/* APB2 */
#define STM32F4_RCC_APB2_TIM1 0
@@ -93,6 +93,6 @@
#define STM32F4_RCC_APB2_LTDC 26
#define STM32F4_APB2_RESET(bit) (STM32F4_RCC_APB2_##bit + (0x24 * 8))
-#define STM32F4_APB2_CLOCK(bit) (STM32F4_RCC_APB2_##bit + (0x44 * 8))
+#define STM32F4_APB2_CLOCK(bit) (STM32F4_RCC_APB2_##bit + 0xA0)
#endif /* _DT_BINDINGS_MFD_STM32F4_RCC_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Resend PATCH v2 2/3] dt-bindings: mfd: stm32f4: Add missing binding definition
2017-02-01 13:09 [Resend PATCH v2 0/3] STM32F4 Clock binding fix & update gabriel.fernandez
2017-02-01 13:09 ` [Resend PATCH v2 1/3] dt-bindings: mfd: stm32f4: Fix STM32F4_X_CLOCK() macro gabriel.fernandez
@ 2017-02-01 13:09 ` gabriel.fernandez
2017-02-01 13:31 ` Lee Jones
2017-02-01 14:34 ` Lee Jones
2017-02-01 13:09 ` [Resend PATCH v2 3/3] ARM: dts: stm32: Use clock DT binding definition on stm32f429 family gabriel.fernandez
2 siblings, 2 replies; 8+ messages in thread
From: gabriel.fernandez @ 2017-02-01 13:09 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Russell King, Maxime Coquelin,
Alexandre Torgue, Michael Turquette, Stephen Boyd, Nicolas Pitre,
Arnd Bergmann, daniel.thompson, andrea.merello,
radoslaw.pietrzyk, Lee Jones
Cc: devicetree, linux-arm-kernel, linux-kernel, linux-clk,
gabriel.fernandez, ludovic.barre, olivier.bideau,
amelie.delaunay
From: Gabriel Fernandez <gabriel.fernandez@st.com>
This patch adds missing binding definition (backupram, ethernet, otg,
qspi, adc & dsi)
Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
---
include/dt-bindings/mfd/stm32f4-rcc.h | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/include/dt-bindings/mfd/stm32f4-rcc.h b/include/dt-bindings/mfd/stm32f4-rcc.h
index f662b19..082a81c 100644
--- a/include/dt-bindings/mfd/stm32f4-rcc.h
+++ b/include/dt-bindings/mfd/stm32f4-rcc.h
@@ -18,11 +18,17 @@
#define STM32F4_RCC_AHB1_GPIOJ 9
#define STM32F4_RCC_AHB1_GPIOK 10
#define STM32F4_RCC_AHB1_CRC 12
+#define STM32F4_RCC_AHB1_BKPSRAM 18
+#define STM32F4_RCC_AHB1_CCMDATARAM 20
#define STM32F4_RCC_AHB1_DMA1 21
#define STM32F4_RCC_AHB1_DMA2 22
#define STM32F4_RCC_AHB1_DMA2D 23
#define STM32F4_RCC_AHB1_ETHMAC 25
-#define STM32F4_RCC_AHB1_OTGHS 29
+#define STM32F4_RCC_AHB1_ETHMACTX 26
+#define STM32F4_RCC_AHB1_ETHMACRX 27
+#define STM32F4_RCC_AHB1_ETHMACPTP 28
+#define STM32F4_RCC_AHB1_OTGHS 29
+#define STM32F4_RCC_AHB1_OTGHSULPI 30
#define STM32F4_AHB1_RESET(bit) (STM32F4_RCC_AHB1_##bit + (0x10 * 8))
#define STM32F4_AHB1_CLOCK(bit) (STM32F4_RCC_AHB1_##bit)
@@ -40,6 +46,7 @@
/* AHB3 */
#define STM32F4_RCC_AHB3_FMC 0
+#define STM32F4_RCC_AHB3_QSPI 1
#define STM32F4_AHB3_RESET(bit) (STM32F4_RCC_AHB3_##bit + (0x18 * 8))
#define STM32F4_AHB3_CLOCK(bit) (STM32F4_RCC_AHB3_##bit + 0x40)
@@ -79,7 +86,9 @@
#define STM32F4_RCC_APB2_TIM8 1
#define STM32F4_RCC_APB2_USART1 4
#define STM32F4_RCC_APB2_USART6 5
-#define STM32F4_RCC_APB2_ADC 8
+#define STM32F4_RCC_APB2_ADC1 8
+#define STM32F4_RCC_APB2_ADC2 9
+#define STM32F4_RCC_APB2_ADC3 10
#define STM32F4_RCC_APB2_SDIO 11
#define STM32F4_RCC_APB2_SPI1 12
#define STM32F4_RCC_APB2_SPI4 13
@@ -91,6 +100,7 @@
#define STM32F4_RCC_APB2_SPI6 21
#define STM32F4_RCC_APB2_SAI1 22
#define STM32F4_RCC_APB2_LTDC 26
+#define STM32F4_RCC_APB2_DSI 27
#define STM32F4_APB2_RESET(bit) (STM32F4_RCC_APB2_##bit + (0x24 * 8))
#define STM32F4_APB2_CLOCK(bit) (STM32F4_RCC_APB2_##bit + 0xA0)
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Resend PATCH v2 3/3] ARM: dts: stm32: Use clock DT binding definition on stm32f429 family
2017-02-01 13:09 [Resend PATCH v2 0/3] STM32F4 Clock binding fix & update gabriel.fernandez
2017-02-01 13:09 ` [Resend PATCH v2 1/3] dt-bindings: mfd: stm32f4: Fix STM32F4_X_CLOCK() macro gabriel.fernandez
2017-02-01 13:09 ` [Resend PATCH v2 2/3] dt-bindings: mfd: stm32f4: Add missing binding definition gabriel.fernandez
@ 2017-02-01 13:09 ` gabriel.fernandez
2 siblings, 0 replies; 8+ messages in thread
From: gabriel.fernandez @ 2017-02-01 13:09 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Russell King, Maxime Coquelin,
Alexandre Torgue, Michael Turquette, Stephen Boyd, Nicolas Pitre,
Arnd Bergmann, daniel.thompson, andrea.merello,
radoslaw.pietrzyk, Lee Jones
Cc: devicetree, linux-arm-kernel, linux-kernel, linux-clk,
gabriel.fernandez, ludovic.barre, olivier.bideau,
amelie.delaunay
From: Gabriel Fernandez <gabriel.fernandez@st.com>
This patch uses clock DT binding definition instead numerical values
for stm32f429 board.
Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
---
arch/arm/boot/dts/stm32429i-eval.dts | 2 +-
arch/arm/boot/dts/stm32f429.dtsi | 66 +++++++++++++++++++-----------------
2 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts
index 76f7206..4e31881 100644
--- a/arch/arm/boot/dts/stm32429i-eval.dts
+++ b/arch/arm/boot/dts/stm32429i-eval.dts
@@ -107,7 +107,7 @@
usbotg_hs_phy: usbphy {
#phy-cells = <0>;
compatible = "usb-nop-xceiv";
- clocks = <&rcc 0 30>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(OTGHSULPI)>;
clock-names = "main_clk";
};
};
diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
index 041e3fc..1bacdfb 100644
--- a/arch/arm/boot/dts/stm32f429.dtsi
+++ b/arch/arm/boot/dts/stm32f429.dtsi
@@ -49,6 +49,7 @@
#include "armv7-m.dtsi"
#include <dt-bindings/pinctrl/stm32f429-pinfunc.h>
#include <dt-bindings/clock/stm32fx-clock.h>
+#include <dt-bindings/mfd/stm32f4-rcc.h>
/ {
clocks {
@@ -82,7 +83,7 @@
compatible = "st,stm32-timer";
reg = <0x40000000 0x400>;
interrupts = <28>;
- clocks = <&rcc 0 128>;
+ clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM2)>;
status = "disabled";
};
@@ -90,7 +91,7 @@
compatible = "st,stm32-timer";
reg = <0x40000400 0x400>;
interrupts = <29>;
- clocks = <&rcc 0 129>;
+ clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM3)>;
status = "disabled";
};
@@ -98,7 +99,7 @@
compatible = "st,stm32-timer";
reg = <0x40000800 0x400>;
interrupts = <30>;
- clocks = <&rcc 0 130>;
+ clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM4)>;
status = "disabled";
};
@@ -106,14 +107,14 @@
compatible = "st,stm32-timer";
reg = <0x40000c00 0x400>;
interrupts = <50>;
- clocks = <&rcc 0 131>;
+ clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM5)>;
};
timer6: timer@40001000 {
compatible = "st,stm32-timer";
reg = <0x40001000 0x400>;
interrupts = <54>;
- clocks = <&rcc 0 132>;
+ clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM6)>;
status = "disabled";
};
@@ -121,7 +122,7 @@
compatible = "st,stm32-timer";
reg = <0x40001400 0x400>;
interrupts = <55>;
- clocks = <&rcc 0 133>;
+ clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM7)>;
status = "disabled";
};
@@ -129,7 +130,7 @@
compatible = "st,stm32-usart", "st,stm32-uart";
reg = <0x40004400 0x400>;
interrupts = <38>;
- clocks = <&rcc 0 145>;
+ clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART2)>;
status = "disabled";
};
@@ -137,7 +138,7 @@
compatible = "st,stm32-usart", "st,stm32-uart";
reg = <0x40004800 0x400>;
interrupts = <39>;
- clocks = <&rcc 0 146>;
+ clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART3)>;
status = "disabled";
dmas = <&dma1 1 4 0x400 0x0>,
<&dma1 3 4 0x400 0x0>;
@@ -148,7 +149,7 @@
compatible = "st,stm32-uart";
reg = <0x40004c00 0x400>;
interrupts = <52>;
- clocks = <&rcc 0 147>;
+ clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART4)>;
status = "disabled";
};
@@ -156,7 +157,7 @@
compatible = "st,stm32-uart";
reg = <0x40005000 0x400>;
interrupts = <53>;
- clocks = <&rcc 0 148>;
+ clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART5)>;
status = "disabled";
};
@@ -164,7 +165,7 @@
compatible = "st,stm32-usart", "st,stm32-uart";
reg = <0x40007800 0x400>;
interrupts = <82>;
- clocks = <&rcc 0 158>;
+ clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART7)>;
status = "disabled";
};
@@ -172,7 +173,7 @@
compatible = "st,stm32-usart", "st,stm32-uart";
reg = <0x40007c00 0x400>;
interrupts = <83>;
- clocks = <&rcc 0 159>;
+ clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART8)>;
status = "disabled";
};
@@ -180,7 +181,7 @@
compatible = "st,stm32-usart", "st,stm32-uart";
reg = <0x40011000 0x400>;
interrupts = <37>;
- clocks = <&rcc 0 164>;
+ clocks = <&rcc 0 STM32F4_APB2_CLOCK(USART1)>;
status = "disabled";
dmas = <&dma2 2 4 0x400 0x0>,
<&dma2 7 4 0x400 0x0>;
@@ -191,7 +192,7 @@
compatible = "st,stm32-usart", "st,stm32-uart";
reg = <0x40011400 0x400>;
interrupts = <71>;
- clocks = <&rcc 0 165>;
+ clocks = <&rcc 0 STM32F4_APB2_CLOCK(USART6)>;
status = "disabled";
};
@@ -226,7 +227,7 @@
gpio-controller;
#gpio-cells = <2>;
reg = <0x0 0x400>;
- clocks = <&rcc 0 0>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOA)>;
st,bank-name = "GPIOA";
};
@@ -234,7 +235,7 @@
gpio-controller;
#gpio-cells = <2>;
reg = <0x400 0x400>;
- clocks = <&rcc 0 1>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOB)>;
st,bank-name = "GPIOB";
};
@@ -242,7 +243,7 @@
gpio-controller;
#gpio-cells = <2>;
reg = <0x800 0x400>;
- clocks = <&rcc 0 2>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOC)>;
st,bank-name = "GPIOC";
};
@@ -250,7 +251,7 @@
gpio-controller;
#gpio-cells = <2>;
reg = <0xc00 0x400>;
- clocks = <&rcc 0 3>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOD)>;
st,bank-name = "GPIOD";
};
@@ -258,7 +259,7 @@
gpio-controller;
#gpio-cells = <2>;
reg = <0x1000 0x400>;
- clocks = <&rcc 0 4>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOE)>;
st,bank-name = "GPIOE";
};
@@ -266,7 +267,7 @@
gpio-controller;
#gpio-cells = <2>;
reg = <0x1400 0x400>;
- clocks = <&rcc 0 5>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOF)>;
st,bank-name = "GPIOF";
};
@@ -274,7 +275,7 @@
gpio-controller;
#gpio-cells = <2>;
reg = <0x1800 0x400>;
- clocks = <&rcc 0 6>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOG)>;
st,bank-name = "GPIOG";
};
@@ -282,7 +283,7 @@
gpio-controller;
#gpio-cells = <2>;
reg = <0x1c00 0x400>;
- clocks = <&rcc 0 7>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOH)>;
st,bank-name = "GPIOH";
};
@@ -290,7 +291,7 @@
gpio-controller;
#gpio-cells = <2>;
reg = <0x2000 0x400>;
- clocks = <&rcc 0 8>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOI)>;
st,bank-name = "GPIOI";
};
@@ -298,7 +299,7 @@
gpio-controller;
#gpio-cells = <2>;
reg = <0x2400 0x400>;
- clocks = <&rcc 0 9>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOJ)>;
st,bank-name = "GPIOJ";
};
@@ -306,7 +307,7 @@
gpio-controller;
#gpio-cells = <2>;
reg = <0x2800 0x400>;
- clocks = <&rcc 0 10>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOK)>;
st,bank-name = "GPIOK";
};
@@ -384,7 +385,7 @@
<16>,
<17>,
<47>;
- clocks = <&rcc 0 21>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(DMA1)>;
#dma-cells = <4>;
};
@@ -399,7 +400,7 @@
<68>,
<69>,
<70>;
- clocks = <&rcc 0 22>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(DMA2)>;
#dma-cells = <4>;
st,mem2mem;
};
@@ -411,7 +412,9 @@
interrupts = <61>;
interrupt-names = "macirq";
clock-names = "stmmaceth", "mac-clk-tx", "mac-clk-rx";
- clocks = <&rcc 0 25>, <&rcc 0 26>, <&rcc 0 27>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(ETHMAC)>,
+ <&rcc 0 STM32F4_AHB1_CLOCK(ETHMACTX)>,
+ <&rcc 0 STM32F4_AHB1_CLOCK(ETHMACRX)>;
st,syscon = <&syscfg 0x4>;
snps,pbl = <8>;
snps,mixed-burst;
@@ -422,7 +425,7 @@
compatible = "snps,dwc2";
reg = <0x40040000 0x40000>;
interrupts = <77>;
- clocks = <&rcc 0 29>;
+ clocks = <&rcc 0 STM32F4_AHB1_CLOCK(OTGHS)>;
clock-names = "otg";
status = "disabled";
};
@@ -431,12 +434,13 @@
compatible = "st,stm32-rng";
reg = <0x50060800 0x400>;
interrupts = <80>;
- clocks = <&rcc 0 38>;
+ clocks = <&rcc 0 STM32F4_AHB2_CLOCK(RNG)>;
+
};
};
};
&systick {
- clocks = <&rcc 1 0>;
+ clocks = <&rcc 1 SYSTICK>;
status = "okay";
};
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Resend PATCH v2 2/3] dt-bindings: mfd: stm32f4: Add missing binding definition
2017-02-01 13:09 ` [Resend PATCH v2 2/3] dt-bindings: mfd: stm32f4: Add missing binding definition gabriel.fernandez
@ 2017-02-01 13:31 ` Lee Jones
2017-02-01 13:34 ` Gabriel Fernandez
2017-02-01 14:34 ` Lee Jones
1 sibling, 1 reply; 8+ messages in thread
From: Lee Jones @ 2017-02-01 13:31 UTC (permalink / raw)
To: gabriel.fernandez
Cc: Rob Herring, Mark Rutland, Russell King, Maxime Coquelin,
Alexandre Torgue, Michael Turquette, Stephen Boyd, Nicolas Pitre,
Arnd Bergmann, daniel.thompson, andrea.merello,
radoslaw.pietrzyk, devicetree, linux-arm-kernel, linux-kernel,
linux-clk, ludovic.barre, olivier.bideau, amelie.delaunay
On Wed, 01 Feb 2017, gabriel.fernandez@st.com wrote:
> From: Gabriel Fernandez <gabriel.fernandez@st.com>
>
> This patch adds missing binding definition (backupram, ethernet, otg,
> qspi, adc & dsi)
What is RCC?
> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
> ---
> include/dt-bindings/mfd/stm32f4-rcc.h | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/include/dt-bindings/mfd/stm32f4-rcc.h b/include/dt-bindings/mfd/stm32f4-rcc.h
> index f662b19..082a81c 100644
> --- a/include/dt-bindings/mfd/stm32f4-rcc.h
> +++ b/include/dt-bindings/mfd/stm32f4-rcc.h
> @@ -18,11 +18,17 @@
> #define STM32F4_RCC_AHB1_GPIOJ 9
> #define STM32F4_RCC_AHB1_GPIOK 10
> #define STM32F4_RCC_AHB1_CRC 12
> +#define STM32F4_RCC_AHB1_BKPSRAM 18
> +#define STM32F4_RCC_AHB1_CCMDATARAM 20
> #define STM32F4_RCC_AHB1_DMA1 21
> #define STM32F4_RCC_AHB1_DMA2 22
> #define STM32F4_RCC_AHB1_DMA2D 23
> #define STM32F4_RCC_AHB1_ETHMAC 25
> -#define STM32F4_RCC_AHB1_OTGHS 29
> +#define STM32F4_RCC_AHB1_ETHMACTX 26
> +#define STM32F4_RCC_AHB1_ETHMACRX 27
> +#define STM32F4_RCC_AHB1_ETHMACPTP 28
> +#define STM32F4_RCC_AHB1_OTGHS 29
> +#define STM32F4_RCC_AHB1_OTGHSULPI 30
>
> #define STM32F4_AHB1_RESET(bit) (STM32F4_RCC_AHB1_##bit + (0x10 * 8))
> #define STM32F4_AHB1_CLOCK(bit) (STM32F4_RCC_AHB1_##bit)
> @@ -40,6 +46,7 @@
>
> /* AHB3 */
> #define STM32F4_RCC_AHB3_FMC 0
> +#define STM32F4_RCC_AHB3_QSPI 1
>
> #define STM32F4_AHB3_RESET(bit) (STM32F4_RCC_AHB3_##bit + (0x18 * 8))
> #define STM32F4_AHB3_CLOCK(bit) (STM32F4_RCC_AHB3_##bit + 0x40)
> @@ -79,7 +86,9 @@
> #define STM32F4_RCC_APB2_TIM8 1
> #define STM32F4_RCC_APB2_USART1 4
> #define STM32F4_RCC_APB2_USART6 5
> -#define STM32F4_RCC_APB2_ADC 8
> +#define STM32F4_RCC_APB2_ADC1 8
> +#define STM32F4_RCC_APB2_ADC2 9
> +#define STM32F4_RCC_APB2_ADC3 10
> #define STM32F4_RCC_APB2_SDIO 11
> #define STM32F4_RCC_APB2_SPI1 12
> #define STM32F4_RCC_APB2_SPI4 13
> @@ -91,6 +100,7 @@
> #define STM32F4_RCC_APB2_SPI6 21
> #define STM32F4_RCC_APB2_SAI1 22
> #define STM32F4_RCC_APB2_LTDC 26
> +#define STM32F4_RCC_APB2_DSI 27
>
> #define STM32F4_APB2_RESET(bit) (STM32F4_RCC_APB2_##bit + (0x24 * 8))
> #define STM32F4_APB2_CLOCK(bit) (STM32F4_RCC_APB2_##bit + 0xA0)
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Resend PATCH v2 2/3] dt-bindings: mfd: stm32f4: Add missing binding definition
2017-02-01 13:31 ` Lee Jones
@ 2017-02-01 13:34 ` Gabriel Fernandez
0 siblings, 0 replies; 8+ messages in thread
From: Gabriel Fernandez @ 2017-02-01 13:34 UTC (permalink / raw)
To: Lee Jones
Cc: Rob Herring, Mark Rutland, Russell King, Maxime Coquelin,
Alexandre Torgue, Michael Turquette, Stephen Boyd, Nicolas Pitre,
Arnd Bergmann, daniel.thompson, andrea.merello,
radoslaw.pietrzyk, devicetree, linux-arm-kernel, linux-kernel,
linux-clk, ludovic.barre, olivier.bideau, amelie.delaunay
Hi Lee,
On 02/01/2017 02:31 PM, Lee Jones wrote:
> On Wed, 01 Feb 2017, gabriel.fernandez@st.com wrote:
>
>> From: Gabriel Fernandez <gabriel.fernandez@st.com>
>>
>> This patch adds missing binding definition (backupram, ethernet, otg,
>> qspi, adc & dsi)
> What is RCC?
Reset & Clock Control
>
>> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
>> ---
>> include/dt-bindings/mfd/stm32f4-rcc.h | 14 ++++++++++++--
>> 1 file changed, 12 insertions(+), 2 deletions(-)
>>
>> diff --git a/include/dt-bindings/mfd/stm32f4-rcc.h b/include/dt-bindings/mfd/stm32f4-rcc.h
>> index f662b19..082a81c 100644
>> --- a/include/dt-bindings/mfd/stm32f4-rcc.h
>> +++ b/include/dt-bindings/mfd/stm32f4-rcc.h
>> @@ -18,11 +18,17 @@
>> #define STM32F4_RCC_AHB1_GPIOJ 9
>> #define STM32F4_RCC_AHB1_GPIOK 10
>> #define STM32F4_RCC_AHB1_CRC 12
>> +#define STM32F4_RCC_AHB1_BKPSRAM 18
>> +#define STM32F4_RCC_AHB1_CCMDATARAM 20
>> #define STM32F4_RCC_AHB1_DMA1 21
>> #define STM32F4_RCC_AHB1_DMA2 22
>> #define STM32F4_RCC_AHB1_DMA2D 23
>> #define STM32F4_RCC_AHB1_ETHMAC 25
>> -#define STM32F4_RCC_AHB1_OTGHS 29
>> +#define STM32F4_RCC_AHB1_ETHMACTX 26
>> +#define STM32F4_RCC_AHB1_ETHMACRX 27
>> +#define STM32F4_RCC_AHB1_ETHMACPTP 28
>> +#define STM32F4_RCC_AHB1_OTGHS 29
>> +#define STM32F4_RCC_AHB1_OTGHSULPI 30
>>
>> #define STM32F4_AHB1_RESET(bit) (STM32F4_RCC_AHB1_##bit + (0x10 * 8))
>> #define STM32F4_AHB1_CLOCK(bit) (STM32F4_RCC_AHB1_##bit)
>> @@ -40,6 +46,7 @@
>>
>> /* AHB3 */
>> #define STM32F4_RCC_AHB3_FMC 0
>> +#define STM32F4_RCC_AHB3_QSPI 1
>>
>> #define STM32F4_AHB3_RESET(bit) (STM32F4_RCC_AHB3_##bit + (0x18 * 8))
>> #define STM32F4_AHB3_CLOCK(bit) (STM32F4_RCC_AHB3_##bit + 0x40)
>> @@ -79,7 +86,9 @@
>> #define STM32F4_RCC_APB2_TIM8 1
>> #define STM32F4_RCC_APB2_USART1 4
>> #define STM32F4_RCC_APB2_USART6 5
>> -#define STM32F4_RCC_APB2_ADC 8
>> +#define STM32F4_RCC_APB2_ADC1 8
>> +#define STM32F4_RCC_APB2_ADC2 9
>> +#define STM32F4_RCC_APB2_ADC3 10
>> #define STM32F4_RCC_APB2_SDIO 11
>> #define STM32F4_RCC_APB2_SPI1 12
>> #define STM32F4_RCC_APB2_SPI4 13
>> @@ -91,6 +100,7 @@
>> #define STM32F4_RCC_APB2_SPI6 21
>> #define STM32F4_RCC_APB2_SAI1 22
>> #define STM32F4_RCC_APB2_LTDC 26
>> +#define STM32F4_RCC_APB2_DSI 27
>>
>> #define STM32F4_APB2_RESET(bit) (STM32F4_RCC_APB2_##bit + (0x24 * 8))
>> #define STM32F4_APB2_CLOCK(bit) (STM32F4_RCC_APB2_##bit + 0xA0)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Resend PATCH v2 2/3] dt-bindings: mfd: stm32f4: Add missing binding definition
2017-02-01 13:09 ` [Resend PATCH v2 2/3] dt-bindings: mfd: stm32f4: Add missing binding definition gabriel.fernandez
2017-02-01 13:31 ` Lee Jones
@ 2017-02-01 14:34 ` Lee Jones
1 sibling, 0 replies; 8+ messages in thread
From: Lee Jones @ 2017-02-01 14:34 UTC (permalink / raw)
To: gabriel.fernandez
Cc: Rob Herring, Mark Rutland, Russell King, Maxime Coquelin,
Alexandre Torgue, Michael Turquette, Stephen Boyd, Nicolas Pitre,
Arnd Bergmann, daniel.thompson, andrea.merello,
radoslaw.pietrzyk, devicetree, linux-arm-kernel, linux-kernel,
linux-clk, ludovic.barre, olivier.bideau, amelie.delaunay
On Wed, 01 Feb 2017, gabriel.fernandez@st.com wrote:
> From: Gabriel Fernandez <gabriel.fernandez@st.com>
>
> This patch adds missing binding definition (backupram, ethernet, otg,
> qspi, adc & dsi)
>
> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
> ---
> include/dt-bindings/mfd/stm32f4-rcc.h | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
Acked-by: Lee Jones <lee.jones@linaro.org>
> diff --git a/include/dt-bindings/mfd/stm32f4-rcc.h b/include/dt-bindings/mfd/stm32f4-rcc.h
> index f662b19..082a81c 100644
> --- a/include/dt-bindings/mfd/stm32f4-rcc.h
> +++ b/include/dt-bindings/mfd/stm32f4-rcc.h
> @@ -18,11 +18,17 @@
> #define STM32F4_RCC_AHB1_GPIOJ 9
> #define STM32F4_RCC_AHB1_GPIOK 10
> #define STM32F4_RCC_AHB1_CRC 12
> +#define STM32F4_RCC_AHB1_BKPSRAM 18
> +#define STM32F4_RCC_AHB1_CCMDATARAM 20
> #define STM32F4_RCC_AHB1_DMA1 21
> #define STM32F4_RCC_AHB1_DMA2 22
> #define STM32F4_RCC_AHB1_DMA2D 23
> #define STM32F4_RCC_AHB1_ETHMAC 25
> -#define STM32F4_RCC_AHB1_OTGHS 29
> +#define STM32F4_RCC_AHB1_ETHMACTX 26
> +#define STM32F4_RCC_AHB1_ETHMACRX 27
> +#define STM32F4_RCC_AHB1_ETHMACPTP 28
> +#define STM32F4_RCC_AHB1_OTGHS 29
> +#define STM32F4_RCC_AHB1_OTGHSULPI 30
>
> #define STM32F4_AHB1_RESET(bit) (STM32F4_RCC_AHB1_##bit + (0x10 * 8))
> #define STM32F4_AHB1_CLOCK(bit) (STM32F4_RCC_AHB1_##bit)
> @@ -40,6 +46,7 @@
>
> /* AHB3 */
> #define STM32F4_RCC_AHB3_FMC 0
> +#define STM32F4_RCC_AHB3_QSPI 1
>
> #define STM32F4_AHB3_RESET(bit) (STM32F4_RCC_AHB3_##bit + (0x18 * 8))
> #define STM32F4_AHB3_CLOCK(bit) (STM32F4_RCC_AHB3_##bit + 0x40)
> @@ -79,7 +86,9 @@
> #define STM32F4_RCC_APB2_TIM8 1
> #define STM32F4_RCC_APB2_USART1 4
> #define STM32F4_RCC_APB2_USART6 5
> -#define STM32F4_RCC_APB2_ADC 8
> +#define STM32F4_RCC_APB2_ADC1 8
> +#define STM32F4_RCC_APB2_ADC2 9
> +#define STM32F4_RCC_APB2_ADC3 10
> #define STM32F4_RCC_APB2_SDIO 11
> #define STM32F4_RCC_APB2_SPI1 12
> #define STM32F4_RCC_APB2_SPI4 13
> @@ -91,6 +100,7 @@
> #define STM32F4_RCC_APB2_SPI6 21
> #define STM32F4_RCC_APB2_SAI1 22
> #define STM32F4_RCC_APB2_LTDC 26
> +#define STM32F4_RCC_APB2_DSI 27
>
> #define STM32F4_APB2_RESET(bit) (STM32F4_RCC_APB2_##bit + (0x24 * 8))
> #define STM32F4_APB2_CLOCK(bit) (STM32F4_RCC_APB2_##bit + 0xA0)
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Resend PATCH v2 1/3] dt-bindings: mfd: stm32f4: Fix STM32F4_X_CLOCK() macro
2017-02-01 13:09 ` [Resend PATCH v2 1/3] dt-bindings: mfd: stm32f4: Fix STM32F4_X_CLOCK() macro gabriel.fernandez
@ 2017-02-01 14:35 ` Lee Jones
0 siblings, 0 replies; 8+ messages in thread
From: Lee Jones @ 2017-02-01 14:35 UTC (permalink / raw)
To: gabriel.fernandez
Cc: Rob Herring, Mark Rutland, Russell King, Maxime Coquelin,
Alexandre Torgue, Michael Turquette, Stephen Boyd, Nicolas Pitre,
Arnd Bergmann, daniel.thompson, andrea.merello,
radoslaw.pietrzyk, devicetree, linux-arm-kernel, linux-kernel,
linux-clk, ludovic.barre, olivier.bideau, amelie.delaunay
On Wed, 01 Feb 2017, gabriel.fernandez@st.com wrote:
> From: Gabriel Fernandez <gabriel.fernandez@st.com>
>
> Macro to select a clock was not correct.
>
> Offset of enable register starts at 0x30, then calculation to select a bit is:
> (@enable_reg - 0x30) / 4 * 32 + bit_to_select
>
> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
> Tested-by: M'boumba Cedric Madianga <cedric.madianga@gmail.com>
> Acked-by: Stephen Boyd <sboyd@codeaurora.org>
>
> ---
> include/dt-bindings/mfd/stm32f4-rcc.h | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
Acked-by: Lee Jones <lee.jones@linaro.org>
> diff --git a/include/dt-bindings/mfd/stm32f4-rcc.h b/include/dt-bindings/mfd/stm32f4-rcc.h
> index e98942d..f662b19 100644
> --- a/include/dt-bindings/mfd/stm32f4-rcc.h
> +++ b/include/dt-bindings/mfd/stm32f4-rcc.h
> @@ -25,7 +25,7 @@
> #define STM32F4_RCC_AHB1_OTGHS 29
>
> #define STM32F4_AHB1_RESET(bit) (STM32F4_RCC_AHB1_##bit + (0x10 * 8))
> -#define STM32F4_AHB1_CLOCK(bit) (STM32F4_RCC_AHB1_##bit + (0x30 * 8))
> +#define STM32F4_AHB1_CLOCK(bit) (STM32F4_RCC_AHB1_##bit)
>
>
> /* AHB2 */
> @@ -36,13 +36,13 @@
> #define STM32F4_RCC_AHB2_OTGFS 7
>
> #define STM32F4_AHB2_RESET(bit) (STM32F4_RCC_AHB2_##bit + (0x14 * 8))
> -#define STM32F4_AHB2_CLOCK(bit) (STM32F4_RCC_AHB2_##bit + (0x34 * 8))
> +#define STM32F4_AHB2_CLOCK(bit) (STM32F4_RCC_AHB2_##bit + 0x20)
>
> /* AHB3 */
> #define STM32F4_RCC_AHB3_FMC 0
>
> #define STM32F4_AHB3_RESET(bit) (STM32F4_RCC_AHB3_##bit + (0x18 * 8))
> -#define STM32F4_AHB3_CLOCK(bit) (STM32F4_RCC_AHB3_##bit + (0x38 * 8))
> +#define STM32F4_AHB3_CLOCK(bit) (STM32F4_RCC_AHB3_##bit + 0x40)
>
> /* APB1 */
> #define STM32F4_RCC_APB1_TIM2 0
> @@ -72,7 +72,7 @@
> #define STM32F4_RCC_APB1_UART8 31
>
> #define STM32F4_APB1_RESET(bit) (STM32F4_RCC_APB1_##bit + (0x20 * 8))
> -#define STM32F4_APB1_CLOCK(bit) (STM32F4_RCC_APB1_##bit + (0x40 * 8))
> +#define STM32F4_APB1_CLOCK(bit) (STM32F4_RCC_APB1_##bit + 0x80)
>
> /* APB2 */
> #define STM32F4_RCC_APB2_TIM1 0
> @@ -93,6 +93,6 @@
> #define STM32F4_RCC_APB2_LTDC 26
>
> #define STM32F4_APB2_RESET(bit) (STM32F4_RCC_APB2_##bit + (0x24 * 8))
> -#define STM32F4_APB2_CLOCK(bit) (STM32F4_RCC_APB2_##bit + (0x44 * 8))
> +#define STM32F4_APB2_CLOCK(bit) (STM32F4_RCC_APB2_##bit + 0xA0)
>
> #endif /* _DT_BINDINGS_MFD_STM32F4_RCC_H */
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-02-01 14:35 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-01 13:09 [Resend PATCH v2 0/3] STM32F4 Clock binding fix & update gabriel.fernandez
2017-02-01 13:09 ` [Resend PATCH v2 1/3] dt-bindings: mfd: stm32f4: Fix STM32F4_X_CLOCK() macro gabriel.fernandez
2017-02-01 14:35 ` Lee Jones
2017-02-01 13:09 ` [Resend PATCH v2 2/3] dt-bindings: mfd: stm32f4: Add missing binding definition gabriel.fernandez
2017-02-01 13:31 ` Lee Jones
2017-02-01 13:34 ` Gabriel Fernandez
2017-02-01 14:34 ` Lee Jones
2017-02-01 13:09 ` [Resend PATCH v2 3/3] ARM: dts: stm32: Use clock DT binding definition on stm32f429 family gabriel.fernandez
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).