[bootlin/training-materials updates] master: Kernel serial lab - Update DT pin definitions (6f65def1)

[Michael Opdenacker]

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

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

commit 6f65def155e90fba0e416203fe00b182b11463d8
Author: Michael Opdenacker <michael.opdenacker at bootlin.com>
Date:   Thu Mar 12 14:58:13 2020 +0100

    Kernel serial lab - Update DT pin definitions
    
    - According to DT definition changes in the latest kernels
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at bootlin.com>


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

6f65def155e90fba0e416203fe00b182b11463d8
 labs/kernel-serial-iomem/kernel-serial-iomem.tex | 2 +-
 labs/kernel-serial-iomem/uarts-pinctrl.dts       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/labs/kernel-serial-iomem/kernel-serial-iomem.tex b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
index e65c8fdf..5eaed746 100644
--- a/labs/kernel-serial-iomem/kernel-serial-iomem.tex
+++ b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
@@ -49,7 +49,7 @@ Now, create again a new
 the standard board DTS file and create a pin muxing section with
 declarations for UART2 and UART4:
 
-{\small \sourcecode{labs/kernel-serial-iomem/uarts-pinctrl.dts}}
+{\scriptsize \sourcecode{labs/kernel-serial-iomem/uarts-pinctrl.dts}}
 
 Then, declare the corresponding devices:
 
diff --git a/labs/kernel-serial-iomem/uarts-pinctrl.dts b/labs/kernel-serial-iomem/uarts-pinctrl.dts
index 82106ea8..1737131c 100644
--- a/labs/kernel-serial-iomem/uarts-pinctrl.dts
+++ b/labs/kernel-serial-iomem/uarts-pinctrl.dts
@@ -1,8 +1,8 @@
 /* Pins 21 (TX) and 22 (RX) of connector P9 */
 uart2_pins: uart2_pins {
 	pinctrl-single,pins = <
-		AM33XX_IOPAD(0x954, PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* spi0_d0.uart2_tx */
-		AM33XX_IOPAD(0x950, PIN_INPUT_PULLUP | MUX_MODE1) /* spi0_sclk.uart2_rx */
+		AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT_PULLUP, MUX_MODE1)       /* (A17) spi0_sclk.uart2_rxd */
+		AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT_PULLDOWN, MUX_MODE1)      /* (B17) spi0_d0.uart2_txd */
 	>;
 };
 
@@ -10,7 +10,7 @@ uart2_pins: uart2_pins {
 
 uart4_pins: uart4_pins {
 	pinctrl-single,pins = <
-		AM33XX_IOPAD(0x870, PIN_INPUT_PULLUP | MUX_MODE6) /* gpmc_wait0.uart4_rx */
-		AM33XX_IOPAD(0x874, PIN_OUTPUT_PULLDOWN | MUX_MODE6) /* gpmc_wpn.uart4_tx */
+		AM33XX_PADCONF(AM335X_PIN_GPMC_WAIT0, PIN_INPUT_PULLUP, MUX_MODE6)      /* (T17) gpmc_wait0.uart4_rxd */
+		AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_OUTPUT_PULLDOWN, MUX_MODE6)     /* (U17) gpmc_wpn.uart4_txd */
 	>;
 };