| Message ID | 20200128091106.28552-2-patrick.delaunay@st.com |
|---|---|
| State | Accepted |
| Commit | 4f280927835cd4b0895a9d73def5b6b8cb343b7e |
| Delegated to: | Patrick Delaunay |
| Headers | show |
| Series | stm32mp1 devicetre-tree and board update | expand |
On 1/28/20 10:10 AM, Patrick Delaunay wrote: > Device tree and binding alignment with kernel v5.4 > > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> > --- > > arch/arm/dts/stm32mp157-pinctrl.dtsi | 8 ++++---- > arch/arm/dts/stm32mp157c-ev1.dts | 5 ++--- > arch/arm/dts/stm32mp157c.dtsi | 4 ++-- > doc/device-tree-bindings/mtd/stm32-fmc2-nand.txt | 6 ++++-- > 4 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/dts/stm32mp157-pinctrl.dtsi b/arch/arm/dts/stm32mp157-pinctrl.dtsi > index 0d53396119..07cd0809ff 100644 > --- a/arch/arm/dts/stm32mp157-pinctrl.dtsi > +++ b/arch/arm/dts/stm32mp157-pinctrl.dtsi > @@ -622,13 +622,13 @@ > <STM32_PINMUX('F', 6, AF9)>; /* QSPI_BK1_IO3 */ > bias-disable; > drive-push-pull; > - slew-rate = <3>; > + slew-rate = <1>; > }; > pins2 { > pinmux = <STM32_PINMUX('B', 6, AF10)>; /* QSPI_BK1_NCS */ > bias-pull-up; > drive-push-pull; > - slew-rate = <3>; > + slew-rate = <1>; > }; > }; > > @@ -650,13 +650,13 @@ > <STM32_PINMUX('G', 7, AF11)>; /* QSPI_BK2_IO3 */ > bias-disable; > drive-push-pull; > - slew-rate = <3>; > + slew-rate = <1>; > }; > pins2 { > pinmux = <STM32_PINMUX('C', 0, AF10)>; /* QSPI_BK2_NCS */ > bias-pull-up; > drive-push-pull; > - slew-rate = <3>; > + slew-rate = <1>; > }; > }; > > diff --git a/arch/arm/dts/stm32mp157c-ev1.dts b/arch/arm/dts/stm32mp157c-ev1.dts > index 89d29b50c3..aa5892b156 100644 > --- a/arch/arm/dts/stm32mp157c-ev1.dts > +++ b/arch/arm/dts/stm32mp157c-ev1.dts > @@ -189,8 +189,8 @@ > clocks = <&clk_ext_camera>; > clock-names = "xclk"; > DOVDD-supply = <&v2v8>; > - powerdown-gpios = <&stmfx_pinctrl 18 GPIO_ACTIVE_HIGH>; > - reset-gpios = <&stmfx_pinctrl 19 GPIO_ACTIVE_LOW>; > + powerdown-gpios = <&stmfx_pinctrl 18 (GPIO_ACTIVE_HIGH | GPIO_PUSH_PULL)>; > + reset-gpios = <&stmfx_pinctrl 19 (GPIO_ACTIVE_LOW | GPIO_PUSH_PULL)>; > rotation = <180>; > status = "okay"; > > @@ -223,7 +223,6 @@ > > joystick_pins: joystick { > pins = "gpio0", "gpio1", "gpio2", "gpio3", "gpio4"; > - drive-push-pull; > bias-pull-down; > }; > > diff --git a/arch/arm/dts/stm32mp157c.dtsi b/arch/arm/dts/stm32mp157c.dtsi > index 41aea75213..28a7e4c08a 100644 > --- a/arch/arm/dts/stm32mp157c.dtsi > +++ b/arch/arm/dts/stm32mp157c.dtsi > @@ -939,7 +939,7 @@ > interrupt-names = "int0", "int1"; > clocks = <&rcc CK_HSE>, <&rcc FDCAN_K>; > clock-names = "hclk", "cclk"; > - bosch,mram-cfg = <0x1400 0 0 32 0 0 2 2>; > + bosch,mram-cfg = <0x0 0 0 32 0 0 2 2>; > status = "disabled"; > }; > > @@ -952,7 +952,7 @@ > interrupt-names = "int0", "int1"; > clocks = <&rcc CK_HSE>, <&rcc FDCAN_K>; > clock-names = "hclk", "cclk"; > - bosch,mram-cfg = <0x0 0 0 32 0 0 2 2>; > + bosch,mram-cfg = <0x1400 0 0 32 0 0 2 2>; > status = "disabled"; > }; > > diff --git a/doc/device-tree-bindings/mtd/stm32-fmc2-nand.txt b/doc/device-tree-bindings/mtd/stm32-fmc2-nand.txt > index 70e76be2a3..ad2bef8265 100644 > --- a/doc/device-tree-bindings/mtd/stm32-fmc2-nand.txt > +++ b/doc/device-tree-bindings/mtd/stm32-fmc2-nand.txt > @@ -18,8 +18,10 @@ Optional properties: > - dmas: DMA specifiers (see: dma/stm32-mdma.txt) > - dma-names: Must be "tx", "rx" and "ecc" > > -Optional children nodes: > -Children nodes represent the available NAND chips. > +* NAND device bindings: > + > +Required properties: > +- reg: describes the CS lines assigned to the NAND device. > > Optional properties: > - nand-on-flash-bbt: see nand.txt Reviewed-by: Patrice Chotard <patrice.chotard@st.com> Thanks
Hi, > From: Patrick DELAUNAY <patrick.delaunay@st.com> > Sent: mardi 28 janvier 2020 10:11 > > Device tree and binding alignment with kernel v5.4 > > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> > --- Applied to u-boot-stm32/master, thanks! Regards Patrick
diff --git a/arch/arm/dts/stm32mp157-pinctrl.dtsi b/arch/arm/dts/stm32mp157-pinctrl.dtsi index 0d53396119..07cd0809ff 100644 --- a/arch/arm/dts/stm32mp157-pinctrl.dtsi +++ b/arch/arm/dts/stm32mp157-pinctrl.dtsi @@ -622,13 +622,13 @@ <STM32_PINMUX('F', 6, AF9)>; /* QSPI_BK1_IO3 */ bias-disable; drive-push-pull; - slew-rate = <3>; + slew-rate = <1>; }; pins2 { pinmux = <STM32_PINMUX('B', 6, AF10)>; /* QSPI_BK1_NCS */ bias-pull-up; drive-push-pull; - slew-rate = <3>; + slew-rate = <1>; }; }; @@ -650,13 +650,13 @@ <STM32_PINMUX('G', 7, AF11)>; /* QSPI_BK2_IO3 */ bias-disable; drive-push-pull; - slew-rate = <3>; + slew-rate = <1>; }; pins2 { pinmux = <STM32_PINMUX('C', 0, AF10)>; /* QSPI_BK2_NCS */ bias-pull-up; drive-push-pull; - slew-rate = <3>; + slew-rate = <1>; }; }; diff --git a/arch/arm/dts/stm32mp157c-ev1.dts b/arch/arm/dts/stm32mp157c-ev1.dts index 89d29b50c3..aa5892b156 100644 --- a/arch/arm/dts/stm32mp157c-ev1.dts +++ b/arch/arm/dts/stm32mp157c-ev1.dts @@ -189,8 +189,8 @@ clocks = <&clk_ext_camera>; clock-names = "xclk"; DOVDD-supply = <&v2v8>; - powerdown-gpios = <&stmfx_pinctrl 18 GPIO_ACTIVE_HIGH>; - reset-gpios = <&stmfx_pinctrl 19 GPIO_ACTIVE_LOW>; + powerdown-gpios = <&stmfx_pinctrl 18 (GPIO_ACTIVE_HIGH | GPIO_PUSH_PULL)>; + reset-gpios = <&stmfx_pinctrl 19 (GPIO_ACTIVE_LOW | GPIO_PUSH_PULL)>; rotation = <180>; status = "okay"; @@ -223,7 +223,6 @@ joystick_pins: joystick { pins = "gpio0", "gpio1", "gpio2", "gpio3", "gpio4"; - drive-push-pull; bias-pull-down; }; diff --git a/arch/arm/dts/stm32mp157c.dtsi b/arch/arm/dts/stm32mp157c.dtsi index 41aea75213..28a7e4c08a 100644 --- a/arch/arm/dts/stm32mp157c.dtsi +++ b/arch/arm/dts/stm32mp157c.dtsi @@ -939,7 +939,7 @@ interrupt-names = "int0", "int1"; clocks = <&rcc CK_HSE>, <&rcc FDCAN_K>; clock-names = "hclk", "cclk"; - bosch,mram-cfg = <0x1400 0 0 32 0 0 2 2>; + bosch,mram-cfg = <0x0 0 0 32 0 0 2 2>; status = "disabled"; }; @@ -952,7 +952,7 @@ interrupt-names = "int0", "int1"; clocks = <&rcc CK_HSE>, <&rcc FDCAN_K>; clock-names = "hclk", "cclk"; - bosch,mram-cfg = <0x0 0 0 32 0 0 2 2>; + bosch,mram-cfg = <0x1400 0 0 32 0 0 2 2>; status = "disabled"; }; diff --git a/doc/device-tree-bindings/mtd/stm32-fmc2-nand.txt b/doc/device-tree-bindings/mtd/stm32-fmc2-nand.txt index 70e76be2a3..ad2bef8265 100644 --- a/doc/device-tree-bindings/mtd/stm32-fmc2-nand.txt +++ b/doc/device-tree-bindings/mtd/stm32-fmc2-nand.txt @@ -18,8 +18,10 @@ Optional properties: - dmas: DMA specifiers (see: dma/stm32-mdma.txt) - dma-names: Must be "tx", "rx" and "ecc" -Optional children nodes: -Children nodes represent the available NAND chips. +* NAND device bindings: + +Required properties: +- reg: describes the CS lines assigned to the NAND device. Optional properties: - nand-on-flash-bbt: see nand.txt
Device tree and binding alignment with kernel v5.4 Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> --- arch/arm/dts/stm32mp157-pinctrl.dtsi | 8 ++++---- arch/arm/dts/stm32mp157c-ev1.dts | 5 ++--- arch/arm/dts/stm32mp157c.dtsi | 4 ++-- doc/device-tree-bindings/mtd/stm32-fmc2-nand.txt | 6 ++++-- 4 files changed, 12 insertions(+), 11 deletions(-)