Merge branch 'v2021.10/master' into v2021.10/maint

Signed-off-by: Hector Palacios <[email protected]>

Author: hpalacio

Kconfig

@@ -66,15 +66,9 @@ config DEPRECATED
 	  code that relies on deprecated features that will be removed and
 	  the conversion deadline has passed.
 
-config ENV_AES
-	bool "Encrypt U-Boot environment"
-	select AES
-	help
-	  Define to encrypt the whole environment block with AES-128-CBC.
-
 config ENV_AES_CAAM_KEY
-	bool "Use CAAM internal key"
-	depends on ENV_AES
+	bool "Encrypt U-Boot environment with CAAM internal key"
+	depends on HAS_CAAM
 	help
 	  Use the internal CAAM secure key for environment encryption which
 	  uses AES-256-CCM.

Makefile

@@ -2,8 +2,8 @@
 
 VERSION = 2021
 PATCHLEVEL = 10
-SUBLEVEL = r1
-EXTRAVERSION = .2
+SUBLEVEL = r2
+EXTRAVERSION = .1-git
 NAME =
 
 # *DOCUMENTATION*
@@ -327,14 +327,14 @@ os_x_before	= $(shell if [ $(DARWIN_MAJOR_VERSION) -le $(1) -a \
 	$(DARWIN_MINOR_VERSION) -le $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;)
 
 os_x_after = $(shell if [ $(DARWIN_MAJOR_VERSION) -ge $(1) -a \
-	$(DARWIN_MINOR_VERSION) -ge $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;)
+	$(DARWIN_MINOR_VERSION) -ge $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;)	
 
 # Snow Leopards build environment has no longer restrictions as described above
 HOSTCC       = $(call os_x_before, 10, 5, "cc", "gcc")
 KBUILD_HOSTCFLAGS  += $(call os_x_before, 10, 4, "-traditional-cpp")
 KBUILD_HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress")
 
-# macOS Mojave (10.14.X)
+# macOS Mojave (10.14.X) 
 # Undefined symbols for architecture x86_64: "_PyArg_ParseTuple"
 KBUILD_HOSTLDFLAGS += $(call os_x_after, 10, 14, "-lpython -dynamclib", "")
 endif

arch/arm/dts/Makefile

@@ -1086,12 +1086,10 @@ dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb
 
 dtb-$(CONFIG_STM32MP13x) += \
 	ccmp13-dvk.dtb \
-	stm32mp135d-dk.dtb \
 	stm32mp135f-dk.dtb
 
 dtb-$(CONFIG_STM32MP15x) += \
 	ccmp15-dvk.dtb \
-	stm32mp157a-avenger96.dtb \
 	stm32mp157a-dk1.dtb \
 	stm32mp157a-ed1.dtb \
 	stm32mp157a-ev1.dtb \

arch/arm/dts/ccmp13-dvk.dts

@@ -19,6 +19,8 @@
 		ethernet0 = &eth1;
 		ethernet1 = &eth2;
 		serial0 = &uart5;
+		i2c2 = &i2c2;
+		i2c3 = &i2c3;
 	};
 
 	chosen {
@@ -125,32 +127,32 @@
 		phy0_eth2: ethernet-phy@0 {
 			reg = <0>;
 			compatible = "ethernet-phy-id0007.c0f0"; /* PHY ID for SMSC LAN8720Ai */
-			reset-gpios = <&gpioi 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+			reset-gpios = <&gpioh 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
 		};
 	};
 };
 
-&i2c1 {
+&i2c2 {
 	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&i2c1_pins_a>;
-	pinctrl-1 = <&i2c1_sleep_pins_a>;
-	i2c-scl-rising-time-ns = <96>;
-	i2c-scl-falling-time-ns = <3>;
-	clock-frequency = <1000000>;
+	pinctrl-0 = <&ccmp13_i2c2_pins_a>;
+	pinctrl-1 = <&ccmp13_i2c2_sleep_pins_a>;
+	i2c-scl-rising-time-ns = <170>;
+	i2c-scl-falling-time-ns = <5>;
+	clock-frequency = <400000>;
 	status = "okay";
 	/* spare dmas for other usage */
 	/delete-property/dmas;
 	/delete-property/dma-names;
 };
 
-&i2c5 {
+&i2c3 {
 	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&i2c5_pins_a>;
-	pinctrl-1 = <&i2c5_sleep_pins_a>;
+	pinctrl-0 = <&ccmp13_i2c3_pins_a>;
+	pinctrl-1 = <&ccmp13_i2c3_sleep_pins_a>;
 	i2c-scl-rising-time-ns = <170>;
 	i2c-scl-falling-time-ns = <5>;
 	clock-frequency = <400000>;
-	status = "disabled";
+	status = "okay";
 	/* spare dmas for other usage */
 	/delete-property/dmas;
 	/delete-property/dma-names;
@@ -299,6 +301,8 @@
 };
 
 &usbotg_hs {
+	u-boot,force-b-session-valid;
+	dr_mode = "peripheral";
 	phys = <&usbphyc_port1 0>;
 	phy-names = "usb2-phy";
 	usb-role-switch;
@@ -347,6 +351,40 @@
 };
 
 &pinctrl {
+	ccmp13_i2c2_pins_a: ccmp13_i2c2-0 {
+		pins {
+			pinmux = <STM32_PINMUX('F', 2, AF4)>, /* I2C2_SCL */
+				 <STM32_PINMUX('F', 1, AF4)>; /* I2C2_SDA */
+			bias-disable;
+			drive-open-drain;
+			slew-rate = <0>;
+		};
+	};
+
+	ccmp13_i2c2_sleep_pins_a: ccmp13_i2c2-sleep-0 {
+		pins {
+			pinmux = <STM32_PINMUX('F', 2, ANALOG)>, /* I2C2_SCL */
+				 <STM32_PINMUX('F', 1, ANALOG)>; /* I2C2_SDA */
+		};
+	};
+
+	ccmp13_i2c3_pins_a: ccmp13_i2c3-0 {
+		pins {
+			pinmux = <STM32_PINMUX('B', 8, AF5)>, /* I2C3_SCL */
+				 <STM32_PINMUX('H', 14, AF4)>; /* I2C3_SDA */
+			bias-disable;
+			drive-open-drain;
+			slew-rate = <0>;
+		};
+	};
+
+	ccmp13_i2c3_sleep_pins_a: ccmp13_i2c3-sleep-0 {
+		pins {
+			pinmux = <STM32_PINMUX('B', 8, ANALOG)>, /* I2C3_SCL */
+				 <STM32_PINMUX('H', 14, ANALOG)>; /* I2C3_SDA */
+		};
+	};
+
 	ccmp13_eth1_rgmii_pins: ccmp13-eth1-rgmii-1 {
 		pins1 {
 			pinmux = <STM32_PINMUX('F', 12, AF11)>, /* ETH1_CLK125 */
@@ -402,7 +440,7 @@
 		pins1 {
 			pinmux = <STM32_PINMUX('F', 7,  AF11)>, /* ETH2_TXD0 */
 				 <STM32_PINMUX('G', 11, AF10)>, /* ETH2_TXD1 */
-				 <STM32_PINMUX('H', 11, AF11)>, /* ETH2_REF_CLK */
+				 <STM32_PINMUX('A', 11, AF13)>, /* ETH2_CLK */
 				 <STM32_PINMUX('F', 6,  AF11)>, /* ETH2_TX_EN */
 				 <STM32_PINMUX('B', 2,  AF11)>, /* ETH2_MDIO */
 				 <STM32_PINMUX('G', 5,  AF10)>; /* ETH2_MDC */
@@ -414,7 +452,8 @@
 		pins2 {
 			pinmux = <STM32_PINMUX('F', 4,  AF11)>, /* ETH2_RXD0 */
 				 <STM32_PINMUX('E', 2,  AF10)>, /* ETH2_RXD1 */
-				 <STM32_PINMUX('A', 12, AF11)>; /* ETH2_RX_DV */
+				 <STM32_PINMUX('A', 12, AF11)>, /* ETH2_RX_DV */
+				 <STM32_PINMUX('F', 11, AF12)>; /* ETH2_RX_ER */
 			bias-disable;
 		};
 	};
@@ -423,13 +462,14 @@
 		pins1 {
 			pinmux = <STM32_PINMUX('F', 7,  ANALOG)>, /* ETH2_TXD0 */
 				 <STM32_PINMUX('G', 11, ANALOG)>, /* ETH2_TXD1 */
-				 <STM32_PINMUX('H', 11, ANALOG)>, /* ETH2_REF_CLK */
+				 <STM32_PINMUX('A', 11, ANALOG)>, /* ETH2_CLK */
 				 <STM32_PINMUX('F', 6,  ANALOG)>, /* ETH2_TX_EN */
 				 <STM32_PINMUX('B', 2,  ANALOG)>, /* ETH2_MDIO */
 				 <STM32_PINMUX('G', 5,  ANALOG)>, /* ETH2_MDC */
 				 <STM32_PINMUX('F', 4,  ANALOG)>, /* ETH2_RXD0 */
 				 <STM32_PINMUX('E', 2,  ANALOG)>, /* ETH2_RXD1 */
-				 <STM32_PINMUX('A', 12, ANALOG)>; /* ETH2_RX_DV */
+				 <STM32_PINMUX('A', 12, ANALOG)>, /* ETH2_RX_DV */
+				 <STM32_PINMUX('F', 11, ANALOG)>; /* ETH2_RX_ER */
 		};
 	};
 

arch/arm/dts/ccmp15-dvk-u-boot.dtsi

@@ -220,11 +220,6 @@
 	};
 };
 
-&usbotg_hs {
-	u-boot,force-b-session-valid;
-	dr_mode = "peripheral";
-};
-
 #if defined(CONFIG_STM32MP15x_STM32IMAGE)
 &binman {
 	u-boot-stm32 {

arch/arm/dts/ccmp15-dvk.dts

@@ -109,17 +109,6 @@
 	};
 };
 
-&ltdc {
-	status = "okay";
-
-	port {
-		ltdc_ep0_out: endpoint@0 {
-			reg = <0>;
-			remote-endpoint = <&dsi_in>;
-		};
-	};
-};
-
 &dsi {
 	#address-cells = <1>;
 	#size-cells = <0>;
@@ -209,6 +198,43 @@
 	};
 };
 
+&i2c2 {
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&i2c2_pins_a>;
+	pinctrl-1 = <&i2c2_sleep_pins_a>;
+	i2c-scl-rising-time-ns = <185>;
+	i2c-scl-falling-time-ns = <20>;
+	clock-frequency = <400000>;
+	status = "okay";
+	/* spare dmas for other usage */
+	/delete-property/dmas;
+	/delete-property/dma-names;
+};
+
+&i2c6 {
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&ccmp15_i2c6_pins_a>;
+	pinctrl-1 = <&ccmp15_i2c6_sleep_pins_a>;
+	i2c-scl-rising-time-ns = <185>;
+	i2c-scl-falling-time-ns = <20>;
+	clock-frequency = <400000>;
+	status = "okay";
+	/* spare dmas for other usage */
+	/delete-property/dmas;
+	/delete-property/dma-names;
+};
+
+&ltdc {
+	status = "okay";
+
+	port {
+		ltdc_ep0_out: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&dsi_in>;
+		};
+	};
+};
+
 /* Micro SD */
 &sdmmc2 {
 	pinctrl-names = "default", "opendrain", "sleep";
@@ -330,3 +356,22 @@
 		 };
 	};
 };
+
+&pinctrl_z {
+	ccmp15_i2c6_pins_a: ccmp15_i2c6-0 {
+		pins {
+			pinmux = <STM32_PINMUX('Z', 0, AF2)>, /* I2C6_SCL */
+				 <STM32_PINMUX('Z', 3, AF2)>; /* I2C6_SDA */
+			bias-disable;
+			drive-open-drain;
+			slew-rate = <0>;
+		};
+	};
+
+	ccmp15_i2c6_sleep_pins_a: ccmp15_i2c6-sleep-0 {
+		pins {
+			pinmux = <STM32_PINMUX('Z', 0, ANALOG)>, /* I2C6_SCL */
+				 <STM32_PINMUX('Z', 3, ANALOG)>; /* I2C6_SDA */
+		};
+	};
+};

arch/arm/dts/ccmp15.dtsi

@@ -204,7 +204,7 @@
 	pmic: stpmic@33 {
 		compatible = "st,stpmic1";
 		reg = <0x33>;
-		interrupts-extended = <&exti_pwr 55 IRQ_TYPE_EDGE_FALLING>;
+		interrupts-extended = <&exti 55 IRQ_TYPE_EDGE_FALLING>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 		status = "okay";