On 25/04/19 10:59 PM, Andreas Dannenberg wrote:
> Transition to the IOPAD macros as used in Linux in which the pin mux
> mode is specified using a dedicated parameter while also dropping the
> related MUX_MODEx macros that are no longer needed. This transition
> will allow us to keep both Linux and U-Boot DTS in sync more easily.
>
> Signed-off-by: Andreas Dannenberg <dannenb...@ti.com>
> ---
> arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 46 ++++++++++----------
> arch/arm/dts/k3-am654-r5-base-board.dts | 10 ++---
> include/dt-bindings/pinctrl/k3-am65.h | 15 +------
> 3 files changed, 30 insertions(+), 41 deletions(-)
>
> diff --git a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
> b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
> index c5d23d0203..dc8b05c263 100644
> --- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
> +++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
> @@ -144,41 +144,41 @@
> u-boot,dm-spl;
> main_uart0_pins_default: main_uart0_pins_default {
> pinctrl-single,pins = <
> - AM65X_IOPAD(0x01e4, PIN_INPUT | MUX_MODE0) /*
> (AF11) UART0_RXD */
> - AM65X_IOPAD(0x01e8, PIN_OUTPUT | MUX_MODE0) /*
> (AE11) UART0_TXD */
> - AM65X_IOPAD(0x01ec, PIN_INPUT | MUX_MODE0) /*
> (AG11) UART0_CTSn */
> - AM65X_IOPAD(0x01f0, PIN_OUTPUT | MUX_MODE0) /*
> (AD11) UART0_RTSn */
> + AM65X_IOPAD(0x01e4, PIN_INPUT, 0) /* (AF11)
> UART0_RXD */
> + AM65X_IOPAD(0x01e8, PIN_OUTPUT, 0) /* (AE11)
> UART0_TXD */
> + AM65X_IOPAD(0x01ec, PIN_INPUT, 0) /* (AG11)
> UART0_CTSn */
> + AM65X_IOPAD(0x01f0, PIN_OUTPUT, 0) /* (AD11)
> UART0_RTSn */
> >;
> u-boot,dm-spl;
> };
>
> main_mmc0_pins_default: main_mmc0_pins_default {
> pinctrl-single,pins = <
> - AM65X_IOPAD(0x01a8, PIN_INPUT_PULLDOWN | MUX_MODE0) /*
> (B25) MMC0_CLK */
> - AM65X_IOPAD(0x01aC, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (B27) MMC0_CMD */
> - AM65X_IOPAD(0x01a4, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (A26) MMC0_DAT0 */
> - AM65X_IOPAD(0x01a0, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (E25) MMC0_DAT1 */
> - AM65X_IOPAD(0x019c, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (C26) MMC0_DAT2 */
> - AM65X_IOPAD(0x0198, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (A25) MMC0_DAT3 */
> - AM65X_IOPAD(0x0194, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (E24) MMC0_DAT4 */
> - AM65X_IOPAD(0x0190, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (A24) MMC0_DAT5 */
> - AM65X_IOPAD(0x018c, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (B26) MMC0_DAT6 */
> - AM65X_IOPAD(0x0188, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (D25) MMC0_DAT7 */
> - AM65X_IOPAD(0x01b0, PIN_INPUT | MUX_MODE0) /* (C25)
> MMC0_DS */
> + AM65X_IOPAD(0x01a8, PIN_INPUT_PULLDOWN, 0) /*
> (B25) MMC0_CLK */
> + AM65X_IOPAD(0x01aC, PIN_INPUT_PULLUP, 0) /*
> (B27) MMC0_CMD */
> + AM65X_IOPAD(0x01a4, PIN_INPUT_PULLUP, 0) /*
> (A26) MMC0_DAT0 */
> + AM65X_IOPAD(0x01a0, PIN_INPUT_PULLUP, 0) /*
> (E25) MMC0_DAT1 */
> + AM65X_IOPAD(0x019c, PIN_INPUT_PULLUP, 0) /*
> (C26) MMC0_DAT2 */
> + AM65X_IOPAD(0x0198, PIN_INPUT_PULLUP, 0) /*
> (A25) MMC0_DAT3 */
> + AM65X_IOPAD(0x0194, PIN_INPUT_PULLUP, 0) /*
> (E24) MMC0_DAT4 */
> + AM65X_IOPAD(0x0190, PIN_INPUT_PULLUP, 0) /*
> (A24) MMC0_DAT5 */
> + AM65X_IOPAD(0x018c, PIN_INPUT_PULLUP, 0) /*
> (B26) MMC0_DAT6 */
> + AM65X_IOPAD(0x0188, PIN_INPUT_PULLUP, 0) /*
> (D25) MMC0_DAT7 */
> + AM65X_IOPAD(0x01b0, PIN_INPUT, 0)
> /* (C25) MMC0_DS */
> >;
> u-boot,dm-spl;
> };
>
> main_mmc1_pins_default: main_mmc1_pins_default {
> pinctrl-single,pins = <
> - AM65X_IOPAD(0x02d4, PIN_INPUT_PULLDOWN | MUX_MODE0) /*
> (C27) MMC1_CLK */
> - AM65X_IOPAD(0x02d8, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (C28) MMC1_CMD */
> - AM65X_IOPAD(0x02d0, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (D28) MMC1_DAT0 */
> - AM65X_IOPAD(0x02cc, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (E27) MMC1_DAT1 */
> - AM65X_IOPAD(0x02c8, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (D26) MMC1_DAT2 */
> - AM65X_IOPAD(0x02c4, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (D27) MMC1_DAT3 */
> - AM65X_IOPAD(0x02dc, PIN_INPUT_PULLUP | MUX_MODE0) /*
> (B24) MMC1_SDCD */
> - AM65X_IOPAD(0x02e0, PIN_INPUT | MUX_MODE0) /* (C24)
> MMC1_SDWP */
> + AM65X_IOPAD(0x02d4, PIN_INPUT_PULLDOWN, 0) /*
> (C27) MMC1_CLK */
> + AM65X_IOPAD(0x02d8, PIN_INPUT_PULLUP, 0) /*
> (C28) MMC1_CMD */
> + AM65X_IOPAD(0x02d0, PIN_INPUT_PULLUP, 0) /*
> (D28) MMC1_DAT0 */
> + AM65X_IOPAD(0x02cc, PIN_INPUT_PULLUP, 0) /*
> (E27) MMC1_DAT1 */
> + AM65X_IOPAD(0x02c8, PIN_INPUT_PULLUP, 0) /*
> (D26) MMC1_DAT2 */
> + AM65X_IOPAD(0x02c4, PIN_INPUT_PULLUP, 0) /*
> (D27) MMC1_DAT3 */
> + AM65X_IOPAD(0x02dc, PIN_INPUT_PULLUP, 0) /*
> (B24) MMC1_SDCD */
> + AM65X_IOPAD(0x02e0, PIN_INPUT, 0)
> /* (C24) MMC1_SDWP */
> >;
> u-boot,dm-spl;
> };
> diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts
> b/arch/arm/dts/k3-am654-r5-base-board.dts
> index 72039ac870..a07038be70 100644
> --- a/arch/arm/dts/k3-am654-r5-base-board.dts
> +++ b/arch/arm/dts/k3-am654-r5-base-board.dts
> @@ -116,17 +116,17 @@
> u-boot,dm-spl;
> wkup_uart0_pins_default: wkup_uart0_pins_default {
> pinctrl-single,pins = <
> - AM65X_WKUP_IOPAD(0x00a0, PIN_INPUT | MUX_MODE0) /*
> (AB1) WKUP_UART0_RXD */
> - AM65X_WKUP_IOPAD(0x00a4, PIN_OUTPUT | MUX_MODE0) /*
> (AB5) WKUP_UART0_TXD */
> - AM65X_WKUP_IOPAD(0x00c8, PIN_INPUT | MUX_MODE1) /*
> (AC2) WKUP_GPIO0_6.WKUP_UART0_CTSn */
> - AM65X_WKUP_IOPAD(0x00cc, PIN_OUTPUT | MUX_MODE1) /*
> (AC1) WKUP_GPIO0_7.WKUP_UART0_RTSn */
> + AM65X_WKUP_IOPAD(0x00a0, PIN_INPUT, 0) /* (AB1)
> WKUP_UART0_RXD */
> + AM65X_WKUP_IOPAD(0x00a4, PIN_OUTPUT, 0) /* (AB5)
> WKUP_UART0_TXD */
> + AM65X_WKUP_IOPAD(0x00c8, PIN_INPUT, 1) /* (AC2)
> WKUP_GPIO0_6.WKUP_UART0_CTSn */
> + AM65X_WKUP_IOPAD(0x00cc, PIN_OUTPUT, 1) /* (AC1)
> WKUP_GPIO0_7.WKUP_UART0_RTSn */
> >;
> u-boot,dm-spl;
> };
>
> wkup_vtt_pins_default: wkup_vtt_pins_default {
> pinctrl-single,pins = <
> - AM65X_WKUP_IOPAD(0x0040, PIN_OUTPUT_PULLUP | MUX_MODE7)
> /* WKUP_GPIO0_28 */
> + AM65X_WKUP_IOPAD(0x0040, PIN_OUTPUT_PULLUP, 7) /*
> WKUP_GPIO0_28 */
> >;
> u-boot,dm-spl;
> };
> diff --git a/include/dt-bindings/pinctrl/k3-am65.h
> b/include/dt-bindings/pinctrl/k3-am65.h
> index c86c9fd4ce..a67521cdc4 100644
> --- a/include/dt-bindings/pinctrl/k3-am65.h
> +++ b/include/dt-bindings/pinctrl/k3-am65.h
Can you rename it to k3.h?
Thanks and regards,
Lokesh
> @@ -7,17 +7,6 @@
> #ifndef _DT_BINDINGS_PINCTRL_TI_K3_AM65_H
> #define _DT_BINDINGS_PINCTRL_TI_K3_AM65_H
>
> -/* K3 mux mode options for each pin. See TRM for options */
> -#define MUX_MODE0 0
> -#define MUX_MODE1 1
> -#define MUX_MODE2 2
> -#define MUX_MODE3 3
> -#define MUX_MODE4 4
> -#define MUX_MODE5 5
> -#define MUX_MODE6 6
> -#define MUX_MODE7 7
> -#define MUX_MODE15 15
> -
> #define PULL_DISABLE (1 << 16)
> #define PULL_UP (1 << 17)
> #define INPUT_EN (1 << 18)
> @@ -43,7 +32,7 @@
> #define PIN_INPUT_PULLUP (INPUT_EN | PULL_UP)
> #define PIN_INPUT_PULLDOWN (INPUT_EN)
>
> -#define AM65X_IOPAD(pa, val) (((pa) & 0x1fff)) (val)
> -#define AM65X_WKUP_IOPAD(pa, val) (((pa) & 0x1fff)) (val)
> +#define AM65X_IOPAD(pa, val, muxmode) (((pa) & 0x1fff))
> ((val) | (muxmode))
> +#define AM65X_WKUP_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) |
> (muxmode))
>
> #endif
>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
