Unverified Commit ef5dcb1b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'stm32-dt-for-v5.16-1' of... 

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

STM32 DT for v5.16, round 1

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

- MPU:
 - ST boards:
  - Add new stm32mp135f-dk board. It embedds new STM32MP135 SoC,
    with 512 MB of DDR3. Several connections are available on this
    board:
    4*USB2.0, 1*USB2.0 typeC DRD, SDcard, 2*RJ45, HDMI,
    Combo Wifi/BT, ...
    Only SD card, uart4 (console) and watchdog IPs are enabled in
    this tag.
  - Change IRQ level for STUSB1600 on DKx boards.
  - Fix SAI subclocks range.
  - Add ck_usb0_48m clock in USB OHCI node device to match with
    STM32MP15 datasheet.

 - DH boards:
  - Reduce DHCOR SPI NOR frequency to 50 MHz to avoid sporadic issues.
  - Fix SAI pin muxing.

 - Odyssey:
  - Set DCMI pins.

* tag 'stm32-dt-for-v5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: dts: stm32: use usbphyc ck_usbo_48m as USBH OHCI clock on stm32mp151
  ARM: dts: stm32: fix AV96 board SAI2 pin muxing on stm32mp15
  ARM: dts: stm32: fix SAI sub nodes register range
  ARM: dts: stm32: fix STUSB1600 Type-C irq level on stm32mp15xx-dkx
  ARM: dts: stm32: set the DCMI pins on stm32mp157c-odyssey
  ARM: dts: stm32: Reduce DHCOR SPI NOR frequency to 50 MHz
  ARM: dts: stm32: add initial support of stm32mp135f-dk board
  dt-bindings: stm32: document stm32mp135f-dk board
  ARM: dts: stm32: add STM32MP13 SoCs support

Link: https://lore.kernel.org/r/9d52c3e2-a3b9-89f3-1896-7cd3560e7010@foss.st.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f97ee3e9 db7be2cb

Documentation/devicetree/bindings/arm/stm32/stm32.yaml

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ properties: 
          - enum:

              - st,stm32h750i-art-pi

          - const: st,stm32h750

      - items:

          - enum:

              - st,stm32mp135f-dk

          - const: st,stm32mp135

      - items:

          - enum:

              - shiratech,stm32mp157a-iot-box # IoT Box

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1124,6 +1124,7 @@ dtb-$(CONFIG_ARCH_STM32) += \ 
	stm32h743i-eval.dtb \

	stm32h743i-disco.dtb \

	stm32h750i-art-pi.dtb \

	stm32mp135f-dk.dtb \

	stm32mp153c-dhcom-drc02.dtb \

	stm32mp157a-avenger96.dtb \

	stm32mp157a-dhcor-avenger96.dtb \

arch/arm/boot/dts/stm32mp13-pinctrl.dtsi

0 → 100644
+64 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)

/*

 * Copyright (C) STMicroelectronics 2021 - All Rights Reserved

 * Author: Alexandre Torgue <alexandre.torgue@foss.st.com>

 */

#include <dt-bindings/pinctrl/stm32-pinfunc.h>



&pinctrl {

	sdmmc1_b4_pins_a: sdmmc1-b4-0 {

		pins1 {

			pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1_D0 */

				 <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1_D1 */

				 <STM32_PINMUX('C', 10, AF12)>, /* SDMMC1_D2 */

				 <STM32_PINMUX('C', 11, AF12)>, /* SDMMC1_D3 */

				 <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1_CMD */

			slew-rate = <1>;

			drive-push-pull;

			bias-disable;

		};

		pins2 {

			pinmux = <STM32_PINMUX('C', 12, AF12)>; /* SDMMC1_CK */

			slew-rate = <2>;

			drive-push-pull;

			bias-disable;

		};

	};



	sdmmc1_b4_od_pins_a: sdmmc1-b4-od-0 {

		pins1 {

			pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1_D0 */

				 <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1_D1 */

				 <STM32_PINMUX('C', 10, AF12)>, /* SDMMC1_D2 */

				 <STM32_PINMUX('C', 11, AF12)>; /* SDMMC1_D3 */

			slew-rate = <1>;

			drive-push-pull;

			bias-disable;

		};

		pins2 {

			pinmux = <STM32_PINMUX('C', 12, AF12)>; /* SDMMC1_CK */

			slew-rate = <2>;

			drive-push-pull;

			bias-disable;

		};

		pins3 {

			pinmux = <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1_CMD */

			slew-rate = <1>;

			drive-open-drain;

			bias-disable;

		};

	};



	uart4_pins_a: uart4-0 {

		pins1 {

			pinmux = <STM32_PINMUX('D', 6, AF8)>; /* UART4_TX */

			bias-disable;

			drive-push-pull;

			slew-rate = <0>;

		};

		pins2 {

			pinmux = <STM32_PINMUX('D', 8, AF8)>; /* UART4_RX */

			bias-disable;

		};

	};

};

arch/arm/boot/dts/stm32mp131.dtsi

0 → 100644
+283 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)

/*

 * Copyright (C) STMicroelectronics 2021 - All Rights Reserved

 * Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.

 */

#include <dt-bindings/interrupt-controller/arm-gic.h>



/ {

	#address-cells = <1>;

	#size-cells = <1>;



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu0: cpu@0 {

			compatible = "arm,cortex-a7";

			device_type = "cpu";

			reg = <0>;

		};

	};



	arm-pmu {

		compatible = "arm,cortex-a7-pmu";

		interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-affinity = <&cpu0>;

		interrupt-parent = <&intc>;

	};



	clocks {

		clk_axi: clk-axi {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <266500000>;

		};



		clk_hse: clk-hse {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <24000000>;

		};



		clk_hsi: clk-hsi {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <64000000>;

		};



		clk_lsi: clk-lsi {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <32000>;

		};



		clk_pclk3: clk-pclk3 {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <104438965>;

		};



		clk_pclk4: clk-pclk4 {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <133250000>;

		};



		clk_pll4_p: clk-pll4_p {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <50000000>;

		};



		clk_pll4_r: clk-pll4_r {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <99000000>;

		};

	};



	intc: interrupt-controller@a0021000 {

		compatible = "arm,cortex-a7-gic";

		#interrupt-cells = <3>;

		interrupt-controller;

		reg = <0xa0021000 0x1000>,

		      <0xa0022000 0x2000>;

	};



	psci {

		compatible = "arm,psci-1.0";

		method = "smc";

	};



	timer {

		compatible = "arm,armv7-timer";

		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;

		interrupt-parent = <&intc>;

		always-on;

	};



	soc {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		interrupt-parent = <&intc>;

		ranges;



		uart4: serial@40010000 {

			compatible = "st,stm32h7-uart";

			reg = <0x40010000 0x400>;

			interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clk_hsi>;

			status = "disabled";

		};



		syscfg: syscon@50020000 {

			compatible = "st,stm32mp157-syscfg", "syscon";

			reg = <0x50020000 0x400>;

			clocks = <&clk_pclk3>;

		};



		sdmmc1: mmc@58005000 {

			compatible = "arm,pl18x", "arm,primecell";

			arm,primecell-periphid = <0x00253180>;

			reg = <0x58005000 0x1000>, <0x58006000 0x1000>;

			interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "cmd_irq";

			clocks = <&clk_pll4_p>;

			clock-names = "apb_pclk";

			cap-sd-highspeed;

			cap-mmc-highspeed;

			max-frequency = <120000000>;

			status = "disabled";

		};



		iwdg2: watchdog@5a002000 {

			compatible = "st,stm32mp1-iwdg";

			reg = <0x5a002000 0x400>;

			clocks = <&clk_pclk4>, <&clk_lsi>;

			clock-names = "pclk", "lsi";

			status = "disabled";

		};



		bsec: efuse@5c005000 {

			compatible = "st,stm32mp15-bsec";

			reg = <0x5c005000 0x400>;

			#address-cells = <1>;

			#size-cells = <1>;



			part_number_otp: part_number_otp@4 {

				reg = <0x4 0x2>;

			};

			ts_cal1: calib@5c {

				reg = <0x5c 0x2>;

			};

			ts_cal2: calib@5e {

				reg = <0x5e 0x2>;

			};

		};



		/*

		 * Break node order to solve dependency probe issue between

		 * pinctrl and exti.

		 */

		pinctrl: pin-controller@50002000 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "st,stm32mp135-pinctrl";

			ranges = <0 0x50002000 0x8400>;

			pins-are-numbered;



			gpioa: gpio@50002000 {

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				reg = <0x0 0x400>;

				clocks = <&clk_pclk4>;

				st,bank-name = "GPIOA";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 0 16>;

			};



			gpiob: gpio@50003000 {

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				reg = <0x1000 0x400>;

				clocks = <&clk_pclk4>;

				st,bank-name = "GPIOB";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 16 16>;

			};



			gpioc: gpio@50004000 {

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				reg = <0x2000 0x400>;

				clocks = <&clk_pclk4>;

				st,bank-name = "GPIOC";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 32 16>;

			};



			gpiod: gpio@50005000 {

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				reg = <0x3000 0x400>;

				clocks = <&clk_pclk4>;

				st,bank-name = "GPIOD";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 48 16>;

			};



			gpioe: gpio@50006000 {

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				reg = <0x4000 0x400>;

				clocks = <&clk_pclk4>;

				st,bank-name = "GPIOE";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 64 16>;

			};



			gpiof: gpio@50007000 {

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				reg = <0x5000 0x400>;

				clocks = <&clk_pclk4>;

				st,bank-name = "GPIOF";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 80 16>;

			};



			gpiog: gpio@50008000 {

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				reg = <0x6000 0x400>;

				clocks = <&clk_pclk4>;

				st,bank-name = "GPIOG";

				ngpios = <16>;

				gpio-ranges = <&pinctrl 0 96 16>;

			};



			gpioh: gpio@50009000 {

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				reg = <0x7000 0x400>;

				clocks = <&clk_pclk4>;

				st,bank-name = "GPIOH";

				ngpios = <15>;

				gpio-ranges = <&pinctrl 0 112 15>;

			};



			gpioi: gpio@5000a000 {

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				reg = <0x8000 0x400>;

				clocks = <&clk_pclk4>;

				st,bank-name = "GPIOI";

				ngpios = <8>;

				gpio-ranges = <&pinctrl 0 128 8>;

			};

		};

	};

};

arch/arm/boot/dts/stm32mp133.dtsi

0 → 100644
+37 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)

/*

 * Copyright (C) STMicroelectronics 2021 - All Rights Reserved

 * Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.

 */



#include "stm32mp131.dtsi"



/ {

	soc {

		m_can1: can@4400e000 {

			compatible = "bosch,m_can";

			reg = <0x4400e000 0x400>, <0x44011000 0x1400>;

			reg-names = "m_can", "message_ram";

			interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "int0", "int1";

			clocks = <&clk_hse>, <&clk_pll4_r>;

			clock-names = "hclk", "cclk";

			bosch,mram-cfg = <0x0 0 0 32 0 0 2 2>;

			status = "disabled";

		};



		m_can2: can@4400f000 {

			compatible = "bosch,m_can";

			reg = <0x4400f000 0x400>, <0x44011000 0x2800>;

			reg-names = "m_can", "message_ram";

			interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "int0", "int1";

			clocks = <&clk_hse>, <&clk_pll4_r>;

			clock-names = "hclk", "cclk";

			bosch,mram-cfg = <0x1400 0 0 32 0 0 2 2>;

			status = "disabled";

		};

	};

};