Merge tag 'stm32-dt-for-v5.4-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into arm/fixes

STM32 DT fixes for v5.4, round 2

Highlights:
-----------

Fixes for STM32MP157:
-Fix CAN RAM mapping
-Change stmfx pinctrl definition for joystick and camera. Due to
stmfx pinctrl fix done in v5.4-rc cycle, camera and joystick were no
longer functional.

* tag 'stm32-dt-for-v5.4-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: dts: stm32: change joystick pinctrl definition on stm32mp157c-ev1
ARM: dts: stm32: remove OV5640 pinctrl definition on stm32mp157c-ev1
ARM: dts: stm32: Fix CAN RAM mapping on stm32mp157c
ARM: dts: stm32: relax qspi pins slew-rate for stm32mp157

Link: https://lore.kernel.org/r/d316b81f-a8d7-e9be-fe3c-73a242e7d941@st.com
Signed-off-by: Olof Johansson <olof@lixom.net>

Changed files
+4 -13
arch
+2 -11
arch/arm/boot/dts/stm32mp157c-ev1.dts
··· 183 183 184 184 ov5640: camera@3c { 185 185 compatible = "ovti,ov5640"; 186 - pinctrl-names = "default"; 187 - pinctrl-0 = <&ov5640_pins>; 188 186 reg = <0x3c>; 189 187 clocks = <&clk_ext_camera>; 190 188 clock-names = "xclk"; 191 189 DOVDD-supply = <&v2v8>; 192 - powerdown-gpios = <&stmfx_pinctrl 18 GPIO_ACTIVE_HIGH>; 193 - reset-gpios = <&stmfx_pinctrl 19 GPIO_ACTIVE_LOW>; 190 + powerdown-gpios = <&stmfx_pinctrl 18 (GPIO_ACTIVE_HIGH | GPIO_PUSH_PULL)>; 191 + reset-gpios = <&stmfx_pinctrl 19 (GPIO_ACTIVE_LOW | GPIO_PUSH_PULL)>; 194 192 rotation = <180>; 195 193 status = "okay"; 196 194 ··· 221 223 222 224 joystick_pins: joystick { 223 225 pins = "gpio0", "gpio1", "gpio2", "gpio3", "gpio4"; 224 - drive-push-pull; 225 226 bias-pull-down; 226 - }; 227 - 228 - ov5640_pins: camera { 229 - pins = "agpio2", "agpio3"; /* stmfx pins 18 & 19 */ 230 - drive-push-pull; 231 - output-low; 232 227 }; 233 228 }; 234 229 };
+2 -2
arch/arm/boot/dts/stm32mp157c.dtsi
··· 932 932 interrupt-names = "int0", "int1"; 933 933 clocks = <&rcc CK_HSE>, <&rcc FDCAN_K>; 934 934 clock-names = "hclk", "cclk"; 935 - bosch,mram-cfg = <0x1400 0 0 32 0 0 2 2>; 935 + bosch,mram-cfg = <0x0 0 0 32 0 0 2 2>; 936 936 status = "disabled"; 937 937 }; 938 938 ··· 945 945 interrupt-names = "int0", "int1"; 946 946 clocks = <&rcc CK_HSE>, <&rcc FDCAN_K>; 947 947 clock-names = "hclk", "cclk"; 948 - bosch,mram-cfg = <0x0 0 0 32 0 0 2 2>; 948 + bosch,mram-cfg = <0x1400 0 0 32 0 0 2 2>; 949 949 status = "disabled"; 950 950 }; 951 951