[bootlin/training-materials updates] master: lab-data/buildroot: refresh kernel patches to Linux 5.10.27 (7f16aa04)

[Thomas Petazzoni]

Repository : https://github.com/bootlin/training-materials
On branch  : master
Link       : https://github.com/bootlin/training-materials/commit/7f16aa041695335f15fe6a653b0a2d3f8030ca22

>---------------------------------------------------------------

commit 7f16aa041695335f15fe6a653b0a2d3f8030ca22
Author: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Date:   Sat May 29 14:38:40 2021 +0200

    lab-data/buildroot: refresh kernel patches to Linux 5.10.27
    
    Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>


>---------------------------------------------------------------

7f16aa041695335f15fe6a653b0a2d3f8030ca22
 .../buildroot-rootfs/linux/0001-Add-nunchuk-driver.patch | 14 +++++++-------
 .../linux/0002-Add-i2c1-and-nunchuk-nodes-in-dts.patch   | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lab-data/buildroot/buildroot-rootfs/linux/0001-Add-nunchuk-driver.patch b/lab-data/buildroot/buildroot-rootfs/linux/0001-Add-nunchuk-driver.patch
index 1e3b8034..c85729ef 100644
--- a/lab-data/buildroot/buildroot-rootfs/linux/0001-Add-nunchuk-driver.patch
+++ b/lab-data/buildroot/buildroot-rootfs/linux/0001-Add-nunchuk-driver.patch
@@ -1,4 +1,4 @@
-From 2e5025ebffc3c4d3bb697695409bb97b9fa8362b Mon Sep 17 00:00:00 2001
+From f887f52465c0c9d3dc14893d684343651571097f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Antoine=20T=C3=A9nart?= <antoine.tenart at bootlin.com>
 Date: Mon, 7 Apr 2014 11:55:31 +0200
 Subject: [PATCH 1/2] Add nunchuk driver
@@ -16,10 +16,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
  create mode 100644 drivers/input/joystick/wiichuck.c
 
 diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
-index 312b854b5506..95dfbe49de75 100644
+index b080f0cfb068..e28371e399d2 100644
 --- a/drivers/input/joystick/Kconfig
 +++ b/drivers/input/joystick/Kconfig
-@@ -194,6 +194,19 @@ config JOYSTICK_TWIDJOY
+@@ -205,6 +205,19 @@ config JOYSTICK_TWIDJOY
  	  To compile this driver as a module, choose M here: the
  	  module will be called twidjoy.
  
@@ -40,10 +40,10 @@ index 312b854b5506..95dfbe49de75 100644
  	tristate "5-byte Zhenhua RC transmitter"
  	select SERIO
 diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile
-index 8656023f6ef5..75483596c895 100644
+index 58232b3057d3..c3991d71aa6e 100644
 --- a/drivers/input/joystick/Makefile
 +++ b/drivers/input/joystick/Makefile
-@@ -34,6 +34,7 @@ obj-$(CONFIG_JOYSTICK_TURBOGRAFX)	+= turbografx.o
+@@ -35,6 +35,7 @@ obj-$(CONFIG_JOYSTICK_TURBOGRAFX)	+= turbografx.o
  obj-$(CONFIG_JOYSTICK_TWIDJOY)		+= twidjoy.o
  obj-$(CONFIG_JOYSTICK_WARRIOR)		+= warrior.o
  obj-$(CONFIG_JOYSTICK_WALKERA0701)	+= walkera0701.o
@@ -53,7 +53,7 @@ index 8656023f6ef5..75483596c895 100644
  
 diff --git a/drivers/input/joystick/wiichuck.c b/drivers/input/joystick/wiichuck.c
 new file mode 100644
-index 000000000000..939cf0c27100
+index 000000000000..7b82e70c87dc
 --- /dev/null
 +++ b/drivers/input/joystick/wiichuck.c
 @@ -0,0 +1,423 @@
@@ -481,5 +481,5 @@ index 000000000000..939cf0c27100
 +}
 +module_exit(wiichuck_exit);
 -- 
-2.25.1
+2.31.1
 
diff --git a/lab-data/buildroot/buildroot-rootfs/linux/0002-Add-i2c1-and-nunchuk-nodes-in-dts.patch b/lab-data/buildroot/buildroot-rootfs/linux/0002-Add-i2c1-and-nunchuk-nodes-in-dts.patch
index 9235d1ae..e40c5242 100644
--- a/lab-data/buildroot/buildroot-rootfs/linux/0002-Add-i2c1-and-nunchuk-nodes-in-dts.patch
+++ b/lab-data/buildroot/buildroot-rootfs/linux/0002-Add-i2c1-and-nunchuk-nodes-in-dts.patch
@@ -1,4 +1,4 @@
-From 95671fdbbed8f9c7cd28bcb107c71d899d9e0fd9 Mon Sep 17 00:00:00 2001
+From b44dddb0899b2643885cec0a88ae28518b0c903a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Antoine=20T=C3=A9nart?= <antoine.tenart at bootlin.com>
 Date: Mon, 7 Apr 2014 11:55:56 +0200
 Subject: [PATCH 2/2] Add i2c1 and nunchuk nodes in dts
@@ -14,17 +14,17 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
  2 files changed, 20 insertions(+)
 
 diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 89b4cf2cb7f8..c7ea2dd45f26 100644
+index 2d51d4bba6d4..267adc621203 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -89,6 +89,13 @@
+@@ -89,6 +89,13 @@ AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_INPUT_PULLUP, MUX_MODE3)	/* uart1_rtsn
  		>;
  	};
  
 +	i2c1_pins: pinmux_i2c1_pins {
 +		pinctrl-single,pins = <
-+			0x158 (PIN_INPUT_PULLUP | MUX_MODE2)    /* spi0_d1.i2c1_sda */
-+			0x15c (PIN_INPUT_PULLUP | MUX_MODE2)    /* spi0_cs0.i2c1_scl */
++			AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT_PULLUP, MUX_MODE2)		/* spi0_d1.i2c1_sda */
++			AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT_PULLUP, MUX_MODE2)	/* spi0_cs0.i2c1_scl */
 +		>;
 +	};
 +
@@ -32,10 +32,10 @@ index 89b4cf2cb7f8..c7ea2dd45f26 100644
  		pinctrl-single,pins = <
  			AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
 diff --git a/arch/arm/boot/dts/am335x-boneblack-common.dtsi b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
-index 91f93bc89716..fb48d82b535e 100644
+index 64c3e9269f40..31dd69eb3f39 100644
 --- a/arch/arm/boot/dts/am335x-boneblack-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
-@@ -166,3 +166,16 @@
+@@ -167,3 +167,16 @@ simple-audio-card,codec {
  		};
  	};
  };
@@ -53,5 +53,5 @@ index 91f93bc89716..fb48d82b535e 100644
 +	 };
 +};
 -- 
-2.25.1
+2.31.1