imx: iomux-v3: Add iomux-mx25.h
Subsystems (2)
PATCH 1/6 imx: iomux-v3: Add iomux-mx25.h
Allow usage of the imx-common/iomux-v3.h framework by including pad settings for the i.MX25. The content of the file is taken from Linux kernel at commit 267dd34, plus the required changes to make it work in U-Boot.
--- arch/arm/imx-common/Makefile | 5 +- arch/arm/include/asm/arch-mx25/imx-regs.h | 1 + arch/arm/include/asm/arch-mx25/iomux-mx25.h | 545 +++++++++++++++++++++++++++ 3 files changed, 550 insertions(+), 1 deletion(-) create mode 100644 arch/arm/include/asm/arch-mx25/iomux-mx25.h
arch/arm/imx-common/Makefile +4 -1
@@ -27,8 +27,11 @@ include $(TOPDIR)/config.mk LIB = $(obj)libimx-common.o +ifeq ($(SOC),$(filter $(SOC),mx25 mx5 mx6)) +COBJS-y = iomux-v3.o +endif ifeq ($(SOC),$(filter $(SOC),mx5 mx6)) -COBJS-y = iomux-v3.o timer.o cpu.o speed.o +COBJS-y = timer.o cpu.o speed.o COBJS-$(CONFIG_I2C_MXC) += i2c-mxv7.o endif ifeq ($(SOC),$(filter $(SOC),mx6 mxs))
arch/arm/include/asm/arch-mx25/imx-regs.h +1 -0
@@ -187,6 +187,7 @@ struct aips_regs {#define IMX_CSPI1_BASE (0x43FA4000)#define IMX_KPP_BASE (0x43FA8000)#define IMX_IOPADMUX_BASE (0x43FAC000) +#define IOMUXC_BASE_ADDR IMX_IOPADMUX_BASE#define IMX_IOPADCTL_BASE (0x43FAC22C)#define IMX_IOPADGRPCTL_BASE (0x43FAC418)#define IMX_IOPADINPUTSEL_BASE (0x43FAC460)
arch/arm/include/asm/arch-mx25/iomux-mx25.h new file +545 -0
545 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 2/6 imx: mx25pdk: Convert to iomux-v3
There is no change of behavior, even if some pad control values could probably be simplified.
--- board/freescale/mx25pdk/mx25pdk.c | 128 ++++++++++++++++++++++--------------- 1 file changed, 75 insertions(+), 53 deletions(-)
board/freescale/mx25pdk/mx25pdk.c +75 -53
@@ -21,8 +21,7 @@#include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/imx25-pinmux.h> -#include <asm/arch/sys_proto.h> +#include <asm/arch/iomux-mx25.h> #include <asm/arch/clock.h> #include <mmc.h> #include <fsl_esdhc.h>
@@ -43,29 +42,42 @@ struct fsl_esdhc_cfg esdhc_cfg[1] = { };#endif +/* +* FIXME: need to revisit this +* The original code enabled PUE and 100-k pull-down without PKE, so the right +* value here is likely: +* 0 for no pull +* or: +* PAD_CTL_PUS_100K_DOWN for 100-k pull-down +*/ +#define FEC_OUT_PAD_CTRL 0 + +#define I2C_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | \ + PAD_CTL_ODE) +static void mx25pdk_fec_init (void ) { -struct iomuxc_mux_ctl *muxctl; -struct iomuxc_pad_ctl *padctl; -u32 gpio_mux_mode =MX25_PIN_MUX_MODE (5 ); -u32 gpio_mux_mode0_sion =MX25_PIN_MUX_MODE (0 ) |MX25_PIN_MUX_SION ; - -/* FEC pin init is generic */ -mx25_fec_init_pins (); - - muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE ; - padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE ; -/* -* Set up FEC_RESET_B and FEC_ENABLE_B -* -* FEC_RESET_B: gpio2_3 is ALT 5 mode of pin D12 -* FEC_ENABLE_B: gpio4_8 is ALT 5 mode of pin A17 -*/ -writel (gpio_mux_mode, &muxctl->pad_d12); -writel (gpio_mux_mode, &muxctl->pad_a17); - -writel (0x0 , &padctl->pad_d12); -writel (0x0 , &padctl->pad_a17); +static const iomux_v3_cfg_t fec_pads[] = { +MX25_PAD_FEC_TX_CLK__FEC_TX_CLK , +MX25_PAD_FEC_RX_DV__FEC_RX_DV , +MX25_PAD_FEC_RDATA0__FEC_RDATA0 , +NEW_PAD_CTRL (MX25_PAD_FEC_TDATA0__FEC_TDATA0 ,FEC_OUT_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_FEC_TX_EN__FEC_TX_EN ,FEC_OUT_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_FEC_MDC__FEC_MDC ,FEC_OUT_PAD_CTRL ), +MX25_PAD_FEC_MDIO__FEC_MDIO , +MX25_PAD_FEC_RDATA1__FEC_RDATA1 , +NEW_PAD_CTRL (MX25_PAD_FEC_TDATA1__FEC_TDATA1 ,FEC_OUT_PAD_CTRL ), + +NEW_PAD_CTRL (MX25_PAD_D12__GPIO_4_8 ,0 ),/* FEC_RESET_B */ +NEW_PAD_CTRL (MX25_PAD_A17__GPIO_2_3 ,0 ),/* FEC_ENABLE_B */ + }; + +static const iomux_v3_cfg_t i2c_pads[] = { +NEW_PAD_CTRL (MX25_PAD_I2C1_CLK__I2C1_CLK ,I2C_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_I2C1_DAT__I2C1_DAT ,I2C_PAD_CTRL ), + }; + +imx_iomux_v3_setup_multiple_pads (fec_pads,ARRAY_SIZE (fec_pads));/* Assert RESET and ENABLE low */ gpio_direction_output (FEC_RESET_B ,0 );
@@ -78,10 +90,7 @@ static void mx25pdk_fec_init(void)gpio_set_value (FEC_ENABLE_B ,1 );/* Setup I2C pins so that PMIC can turn on PHY supply */ -writel (gpio_mux_mode0_sion, &muxctl->pad_i2c1_clk); -writel (gpio_mux_mode0_sion, &muxctl->pad_i2c1_dat); -writel (0x1E8 , &padctl->pad_i2c1_clk); -writel (0x1E8 , &padctl->pad_i2c1_dat); +imx_iomux_v3_setup_multiple_pads (i2c_pads,ARRAY_SIZE (i2c_pads)); }int dram_init (void )
@@ -92,9 +101,35 @@ int dram_init(void)return 0 ; } +/* +* Set up input pins with hysteresis and 100-k pull-ups +*/ +#define UART1_IN_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP) +/* +* FIXME: need to revisit this +* The original code enabled PUE and 100-k pull-down without PKE, so the right +* value here is likely: +* 0 for no pull +* or: +* PAD_CTL_PUS_100K_DOWN for 100-k pull-down +*/ +#define UART1_OUT_PAD_CTRL 0 + +static void mx25pdk_uart1_init (void ) +{ +static const iomux_v3_cfg_t uart1_pads[] = { +NEW_PAD_CTRL (MX25_PAD_UART1_RXD__UART1_RXD ,UART1_IN_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_UART1_TXD__UART1_TXD ,UART1_OUT_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_UART1_RTS__UART1_RTS ,UART1_OUT_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_UART1_CTS__UART1_CTS ,UART1_IN_PAD_CTRL ), + }; + +imx_iomux_v3_setup_multiple_pads (uart1_pads,ARRAY_SIZE (uart1_pads)); +} +int board_early_init_f (void ) { -mx25_uart1_init_pins (); +mx25pdk_uart1_init ();return 0 ; }
@@ -131,21 +166,8 @@ int board_late_init(void)#ifdef CONFIG_FSL_ESDHC int board_mmc_getcd (struct mmc *mmc) { -struct iomuxc_mux_ctl *muxctl; -struct iomuxc_pad_ctl *padctl; -u32 gpio_mux_mode =MX25_PIN_MUX_MODE (5 ); - -/* -* Set up the Card Detect pin. -* -* SD1_GPIO_CD: gpio2_1 is ALT 5 mode of pin A15 -* -*/ - muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE ; - padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE ; - -writel (gpio_mux_mode, &muxctl->pad_a15); -writel (0x0 , &padctl->pad_a15); +/* Set up the Card Detect pin. */ +imx_iomux_v3_setup_pad (NEW_PAD_CTRL (MX25_PAD_A15__GPIO_2_1 ,0 ));gpio_direction_input (CARD_DETECT );return !gpio_get_value (CARD_DETECT );
@@ -153,16 +175,16 @@ int board_mmc_getcd(struct mmc *mmc)int board_mmc_init (bd_t *bis) { -struct iomuxc_mux_ctl *muxctl; -u32 sdhc1_mux_mode =MX25_PIN_MUX_MODE (0 ) |MX25_PIN_MUX_SION ; - - muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE ; -writel (sdhc1_mux_mode, &muxctl->pad_sd1_cmd); -writel (sdhc1_mux_mode, &muxctl->pad_sd1_clk); -writel (sdhc1_mux_mode, &muxctl->pad_sd1_data0); -writel (sdhc1_mux_mode, &muxctl->pad_sd1_data1); -writel (sdhc1_mux_mode, &muxctl->pad_sd1_data2); -writel (sdhc1_mux_mode, &muxctl->pad_sd1_data3); +static const iomux_v3_cfg_t sdhc1_pads[] = { +NEW_PAD_CTRL (MX25_PAD_SD1_CMD__SD1_CMD ,NO_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_SD1_CLK__SD1_CLK ,NO_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_SD1_DATA0__SD1_DATA0 ,NO_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_SD1_DATA1__SD1_DATA1 ,NO_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_SD1_DATA2__SD1_DATA2 ,NO_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_SD1_DATA3__SD1_DATA3 ,NO_PAD_CTRL ), + }; + +imx_iomux_v3_setup_multiple_pads (sdhc1_pads,ARRAY_SIZE (sdhc1_pads)); esdhc_cfg[0 ].sdhc_clk =mxc_get_clock (MXC_ESDHC1_CLK );return fsl_esdhc_initialize (bis, &esdhc_cfg[0 ]);
Signature · 1 line
1.7.10.4
PATCH 3/6 imx: mx25pdk: Fix GPIO assignments
In reply to Benoît Thébaudeau--- board/freescale/mx25pdk/mx25pdk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
board/freescale/mx25pdk/mx25pdk.c +2 -2
@@ -30,8 +30,8 @@#include <fsl_pmic.h> #include <mc34704.h> -#define FEC_RESET_B IMX_GPIO_NR(2, 3) -#define FEC_ENABLE_B IMX_GPIO_NR(4, 8) +#define FEC_RESET_B IMX_GPIO_NR(4, 8) +#define FEC_ENABLE_B IMX_GPIO_NR(2, 3)#define CARD_DETECT IMX_GPIO_NR(2, 1)DECLARE_GLOBAL_DATA_PTR ;
Signature · 1 line
1.7.10.4
PATCH 4/6 imx: tx25: Convert to iomux-v3
In reply to Benoît ThébaudeauThere is no change of behavior, even if some pad control values could probably be simplified.
--- board/karo/tx25/tx25.c | 107 ++++++++++++++++++++++++++++++------------------ 1 file changed, 68 insertions(+), 39 deletions(-)
board/karo/tx25/tx25.c +68 -39
@@ -27,9 +27,8 @@#include <common.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/imx25-pinmux.h> +#include <asm/arch/iomux-mx25.h> #include <asm/gpio.h> -#include <asm/arch/sys_proto.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -42,36 +41,44 @@ void board_init_f(ulong bootflag)#endif #ifdef CONFIG_FEC_MXC +/* +* FIXME: need to revisit this +* The original code enabled PUE and 100-k pull-down without PKE, so the right +* value here is likely: +* 0 for no pull +* or: +* PAD_CTL_PUS_100K_DOWN for 100-k pull-down +*/ +#define FEC_OUT_PAD_CTRL 0 +#define GPIO_FEC_RESET_B IMX_GPIO_NR(4, 7)#define GPIO_FEC_ENABLE_B IMX_GPIO_NR(4, 9)void tx25_fec_init (void ) { -struct iomuxc_mux_ctl *muxctl; -struct iomuxc_pad_ctl *padctl; -u32 gpio_mux_mode =MX25_PIN_MUX_MODE (5 ); -u32 saved_rdata0_mode, saved_rdata1_mode, saved_rx_dv_mode; +static const iomux_v3_cfg_t fec_pads[] = { +MX25_PAD_FEC_TX_CLK__FEC_TX_CLK , +MX25_PAD_FEC_RX_DV__FEC_RX_DV , +MX25_PAD_FEC_RDATA0__FEC_RDATA0 , +NEW_PAD_CTRL (MX25_PAD_FEC_TDATA0__FEC_TDATA0 ,FEC_OUT_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_FEC_TX_EN__FEC_TX_EN ,FEC_OUT_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_FEC_MDC__FEC_MDC ,FEC_OUT_PAD_CTRL ), +MX25_PAD_FEC_MDIO__FEC_MDIO , +MX25_PAD_FEC_RDATA1__FEC_RDATA1 , +NEW_PAD_CTRL (MX25_PAD_FEC_TDATA1__FEC_TDATA1 ,FEC_OUT_PAD_CTRL ), + +NEW_PAD_CTRL (MX25_PAD_D13__GPIO_4_7 ,0 ),/* FEC_RESET_B */ +NEW_PAD_CTRL (MX25_PAD_D11__GPIO_4_9 ,0 ),/* FEC_ENABLE_B */ + }; + +static const iomux_v3_cfg_t fec_cfg_pads[] = { +MX25_PAD_FEC_RDATA0__GPIO_3_10 , +MX25_PAD_FEC_RDATA1__GPIO_3_11 , +MX25_PAD_FEC_RX_DV__GPIO_3_12 , + };debug ("tx25_fec_init\n" ); -/* -* fec pin init is generic -*/ -mx25_fec_init_pins (); - -/* -* Set up the FEC_RESET_B and FEC_ENABLE GPIO pins. -* -* FEC_RESET_B: gpio4[7] is ALT 5 mode of pin D13 -* FEC_ENABLE_B: gpio4[9] is ALT 5 mode of pin D11 -*/ - muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE ; - padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE ; - -writel (gpio_mux_mode, &muxctl->pad_d13); -writel (gpio_mux_mode, &muxctl->pad_d11); - -writel (0x0 , &padctl->pad_d13); -writel (0x0 , &padctl->pad_d11); +imx_iomux_v3_setup_multiple_pads (fec_pads,ARRAY_SIZE (fec_pads));/* drop PHY power and assert reset (low) */ gpio_direction_output (GPIO_FEC_RESET_B ,0 );
@@ -99,15 +106,10 @@ void tx25_fec_init(void)* RMII mode is selected by FEC_RX_DV which is GPIO 3_12 in mux mode */ /* -* save three current mux modes and set each to gpio mode +* set each mux mode to gpio mode */ - saved_rdata0_mode =readl (&muxctl->pad_fec_rdata0); - saved_rdata1_mode =readl (&muxctl->pad_fec_rdata1); - saved_rx_dv_mode =readl (&muxctl->pad_fec_rx_dv); - -writel (gpio_mux_mode, &muxctl->pad_fec_rdata0); -writel (gpio_mux_mode, &muxctl->pad_fec_rdata1); -writel (gpio_mux_mode, &muxctl->pad_fec_rx_dv); +imx_iomux_v3_setup_multiple_pads (fec_cfg_pads, +ARRAY_SIZE (fec_cfg_pads));/* * set each to 1 and make each an output
@@ -128,19 +130,46 @@ void tx25_fec_init(void)/* * set FEC pins back */ -writel (saved_rdata0_mode, &muxctl->pad_fec_rdata0); -writel (saved_rdata1_mode, &muxctl->pad_fec_rdata1); - writel(saved_rx_dv_mode, &muxctl->pad_fec_rx_dv); + imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads)); }#else #define tx25_fec_init ()#endif -int board_init () -{#ifdef CONFIG_MXC_UART -mx25_uart1_init_pins (); +/* +* Set up input pins with hysteresis and 100-k pull-ups +*/ +#define UART1_IN_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP) +/* +* FIXME: need to revisit this +* The original code enabled PUE and 100-k pull-down without PKE, so the right +* value here is likely: +* 0 for no pull +* or: +* PAD_CTL_PUS_100K_DOWN for 100-k pull-down +*/ +#define UART1_OUT_PAD_CTRL 0 + +static void tx25_uart1_init (void ) +{ +static const iomux_v3_cfg_t uart1_pads[] = { +NEW_PAD_CTRL (MX25_PAD_UART1_RXD__UART1_RXD ,UART1_IN_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_UART1_TXD__UART1_TXD ,UART1_OUT_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_UART1_RTS__UART1_RTS ,UART1_OUT_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_UART1_CTS__UART1_CTS ,UART1_IN_PAD_CTRL ), + }; + +imx_iomux_v3_setup_multiple_pads (uart1_pads,ARRAY_SIZE (uart1_pads)); +} +#else +#define tx25_uart1_init ()#endif + +int board_init () +{ +tx25_uart1_init (); +/* board id for linux */ gd->bd->bi_boot_params =PHYS_SDRAM_1 +0x100 ;return 0 ;
Signature · 1 line
1.7.10.4
PATCH 5/6 imx: zmx25: Convert to iomux-v3
In reply to Benoît ThébaudeauThere is no change of behavior, even if some pad control values could probably be simplified.
--- board/syteco/zmx25/zmx25.c | 143 ++++++++++++++++++++++---------------------- 1 file changed, 72 insertions(+), 71 deletions(-)
board/syteco/zmx25/zmx25.c +72 -71
@@ -32,91 +32,85 @@#include <asm/gpio.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/imx25-pinmux.h> -#include <asm/arch/sys_proto.h> +#include <asm/arch/iomux-mx25.h> DECLARE_GLOBAL_DATA_PTR ;int board_init () { -struct iomuxc_mux_ctl *muxctl; -struct iomuxc_pad_ctl *padctl; -struct iomuxc_pad_input_select *inputselect; -u32 gpio_mux_mode0_sion =MX25_PIN_MUX_MODE (0 ) |MX25_PIN_MUX_SION ; -u32 gpio_mux_mode1 =MX25_PIN_MUX_MODE (1 ); -u32 gpio_mux_mode5 =MX25_PIN_MUX_MODE (5 ); -u32 gpio_mux_mode6 =MX25_PIN_MUX_MODE (6 ); -u32 input_select1 =MX25_PAD_INPUT_SELECT_DAISY (1 ); -u32 input_select2 =MX25_PAD_INPUT_SELECT_DAISY (2 ); +static const iomux_v3_cfg_t sdhc1_pads[] = { +NEW_PAD_CTRL (MX25_PAD_SD1_CMD__SD1_CMD ,NO_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_SD1_CLK__SD1_CLK ,NO_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_SD1_DATA0__SD1_DATA0 ,NO_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_SD1_DATA1__SD1_DATA1 ,NO_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_SD1_DATA2__SD1_DATA2 ,NO_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_SD1_DATA3__SD1_DATA3 ,NO_PAD_CTRL ), + }; + +static const iomux_v3_cfg_t dig_out_pads[] = { +MX25_PAD_CSI_D8__GPIO_1_7 ,/* Ouput 1 Ctrl */ +MX25_PAD_CSI_D7__GPIO_1_6 ,/* Ouput 2 Ctrl */ +NEW_PAD_CTRL (MX25_PAD_CSI_D6__GPIO_1_31 ,0 ),/* Ouput 1 Stat */ +NEW_PAD_CTRL (MX25_PAD_CSI_D5__GPIO_1_30 ,0 ),/* Ouput 2 Stat */ + }; + +static const iomux_v3_cfg_t led_pads[] = { +MX25_PAD_CSI_D9__GPIO_4_21 , +MX25_PAD_CSI_D4__GPIO_1_29 , + }; + +static const iomux_v3_cfg_t can_pads[] = { +NEW_PAD_CTRL (MX25_PAD_GPIO_A__CAN1_TX ,NO_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_GPIO_B__CAN1_RX ,NO_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_GPIO_C__CAN2_TX ,NO_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_GPIO_D__CAN2_RX ,NO_PAD_CTRL ), + }; + +static const iomux_v3_cfg_t i2c3_pads[] = { +MX25_PAD_CSPI1_SS1__I2C3_DAT , +MX25_PAD_GPIO_E__I2C3_CLK , + };icache_enable (); - muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE ; - padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE ; - inputselect = (struct iomuxc_pad_input_select *)IMX_IOPADINPUTSEL_BASE ; - -/* Setup of core volatage selection pin to run at 1.4V */ -writel (gpio_mux_mode5, &muxctl->pad_ext_armclk);/* VCORE GPIO3[15] */ +/* Setup of core voltage selection pin to run at 1.4V */ +imx_iomux_v3_setup_pad (MX25_PAD_EXT_ARMCLK__GPIO_3_15 );/* VCORE */ gpio_direction_output (IMX_GPIO_NR (3 ,15 ),1 ); -/* Setup of input daisy chains for SD card pins*/ -writel (gpio_mux_mode0_sion, &muxctl->pad_sd1_cmd); -writel (gpio_mux_mode0_sion, &muxctl->pad_sd1_clk); -writel (gpio_mux_mode0_sion, &muxctl->pad_sd1_data0); -writel (gpio_mux_mode0_sion, &muxctl->pad_sd1_data1); -writel (gpio_mux_mode0_sion, &muxctl->pad_sd1_data2); -writel (gpio_mux_mode0_sion, &muxctl->pad_sd1_data3); +/* Setup of SD card pins*/ +imx_iomux_v3_setup_multiple_pads (sdhc1_pads,ARRAY_SIZE (sdhc1_pads));/* Setup of digital output for USB power and OC */ -writel (gpio_mux_mode5, &muxctl->pad_csi_d3);/* USB Power GPIO1[28] */ +imx_iomux_v3_setup_pad (MX25_PAD_CSI_D3__GPIO_1_28 );/* USB Power */ gpio_direction_output (IMX_GPIO_NR (1 ,28 ),1 ); -writel (gpio_mux_mode5, &muxctl->pad_csi_d2);/* USB OC GPIO1[27] */ +imx_iomux_v3_setup_pad (MX25_PAD_CSI_D2__GPIO_1_27 );/* USB OC */ gpio_direction_input (IMX_GPIO_NR (1 ,18 ));/* Setup of digital output control pins */ -writel (gpio_mux_mode5, &muxctl->pad_csi_d8);/* Ouput 1 Ctrl GPIO1[7] */ -writel (gpio_mux_mode5, &muxctl->pad_csi_d7);/* Ouput 2 Ctrl GPIO1[6] */ -writel (gpio_mux_mode5, &muxctl->pad_csi_d6);/* Ouput 1 Stat GPIO1[31]*/ -writel (gpio_mux_mode5, &muxctl->pad_csi_d5);/* Ouput 2 Stat GPIO1[30]*/ - -writel (0 , &padctl->pad_csi_d6);/* Ouput 1 Stat pull up off */ -writel (0 , &padctl->pad_csi_d5);/* Ouput 2 Stat pull up off */ +imx_iomux_v3_setup_multiple_pads (dig_out_pads, +ARRAY_SIZE (dig_out_pads));/* Switch both output drivers off */ gpio_direction_output (IMX_GPIO_NR (1 ,7 ),0 );gpio_direction_output (IMX_GPIO_NR (1 ,6 ),0 ); -/* Setup of key input pin GPIO2[29]*/ -writel (gpio_mux_mode5 |MX25_PIN_MUX_SION , &muxctl->pad_kpp_row0); -writel (0 , &padctl->pad_kpp_row0);/* Key pull up off */ +/* Setup of key input pin */ +imx_iomux_v3_setup_pad (NEW_PAD_CTRL (MX25_PAD_KPP_ROW0__GPIO_2_29 ,0 ));gpio_direction_input (IMX_GPIO_NR (2 ,29 ));/* Setup of status LED outputs */ -writel (gpio_mux_mode5, &muxctl->pad_csi_d9);/* GPIO4[21] */ -writel (gpio_mux_mode5, &muxctl->pad_csi_d4);/* GPIO1[29] */ +imx_iomux_v3_setup_multiple_pads (led_pads,ARRAY_SIZE (led_pads));/* Switch both LEDs off */ gpio_direction_output (IMX_GPIO_NR (4 ,21 ),0 );gpio_direction_output (IMX_GPIO_NR (1 ,29 ),0 );/* Setup of CAN1 and CAN2 signals */ -writel (gpio_mux_mode6, &muxctl->pad_gpio_a);/* CAN1 TX */ -writel (gpio_mux_mode6, &muxctl->pad_gpio_b);/* CAN1 RX */ -writel (gpio_mux_mode6, &muxctl->pad_gpio_c);/* CAN2 TX */ -writel (gpio_mux_mode6, &muxctl->pad_gpio_d);/* CAN2 RX */ - -/* Setup of input daisy chains for CAN signals*/ -writel (input_select1, &inputselect->can1_ipp_ind_canrx);/* CAN1 RX */ -writel (input_select1, &inputselect->can2_ipp_ind_canrx);/* CAN2 RX */ +imx_iomux_v3_setup_multiple_pads (can_pads,ARRAY_SIZE (can_pads));/* Setup of I2C3 signals */ -writel (gpio_mux_mode1, &muxctl->pad_cspi1_ss1);/* I2C3 SDA */ -writel (gpio_mux_mode1, &muxctl->pad_gpio_e);/* I2C3 SCL */ - -/* Setup of input daisy chains for I2C3 signals*/ -writel (input_select1, &inputselect->i2c3_ipp_sda_in);/* I2C3 SDA */ -writel (input_select2, &inputselect->i2c3_ipp_scl_in);/* I2C3 SCL */ +imx_iomux_v3_setup_multiple_pads (i2c3_pads,ARRAY_SIZE (i2c3_pads)); gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ;
@@ -128,25 +122,32 @@ int board_late_init(void)const char *e;#ifdef CONFIG_FEC_MXC -struct iomuxc_mux_ctl *muxctl; -u32 gpio_mux_mode2 =MX25_PIN_MUX_MODE (2 ); -u32 gpio_mux_mode5 =MX25_PIN_MUX_MODE (5 ); - -/* -* fec pin init is generic -*/ -mx25_fec_init_pins (); - -/* -* Set up LAN-RESET and FEC_RX_ERR -* -* LAN-RESET: GPIO3[16] is ALT 5 mode of pin U20 -* FEC_RX_ERR: FEC_RX_ERR is ALT 2 mode of pin R2 -*/ - muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE ; - -writel (gpio_mux_mode5, &muxctl->pad_upll_bypclk); -writel (gpio_mux_mode2, &muxctl->pad_uart2_cts); +/* +* FIXME: need to revisit this +* The original code enabled PUE and 100-k pull-down without PKE, so the right +* value here is likely: +* 0 for no pull +* or: +* PAD_CTL_PUS_100K_DOWN for 100-k pull-down +*/ +#define FEC_OUT_PAD_CTRL 0 + +static const iomux_v3_cfg_t fec_pads[] = { +MX25_PAD_FEC_TX_CLK__FEC_TX_CLK , +MX25_PAD_FEC_RX_DV__FEC_RX_DV , +MX25_PAD_FEC_RDATA0__FEC_RDATA0 , +NEW_PAD_CTRL (MX25_PAD_FEC_TDATA0__FEC_TDATA0 ,FEC_OUT_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_FEC_TX_EN__FEC_TX_EN ,FEC_OUT_PAD_CTRL ), +NEW_PAD_CTRL (MX25_PAD_FEC_MDC__FEC_MDC ,FEC_OUT_PAD_CTRL ), +MX25_PAD_FEC_MDIO__FEC_MDIO , +MX25_PAD_FEC_RDATA1__FEC_RDATA1 , +NEW_PAD_CTRL (MX25_PAD_FEC_TDATA1__FEC_TDATA1 ,FEC_OUT_PAD_CTRL ), + +MX25_PAD_UPLL_BYPCLK__GPIO_3_16 ,/* LAN-RESET */ +MX25_PAD_UART2_CTS__FEC_RX_ER ,/* FEC_RX_ERR */ + }; + +imx_iomux_v3_setup_multiple_pads (fec_pads,ARRAY_SIZE (fec_pads));/* assert PHY reset (low) */ gpio_direction_output (IMX_GPIO_NR (3 ,16 ),0 );
Signature · 1 line
1.7.10.4
PATCH 6/6 imx: mx25: Remove legacy iomux support
In reply to Benoît ThébaudeauLegacy iomux support is no longer needed now that all boards have been converted to iomux-v3.
--- arch/arm/cpu/arm926ejs/mx25/generic.c | 117 ------- arch/arm/include/asm/arch-mx25/imx25-pinmux.h | 421 ------------------------- arch/arm/include/asm/arch-mx25/sys_proto.h | 32 -- 3 files changed, 570 deletions(-) delete mode 100644 arch/arm/include/asm/arch-mx25/imx25-pinmux.h delete mode 100644 arch/arm/include/asm/arch-mx25/sys_proto.h
arch/arm/cpu/arm926ejs/mx25/generic.c +0 -117
@@ -27,7 +27,6 @@#include <netdev.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/imx25-pinmux.h> #include <asm/arch/clock.h> #ifdef CONFIG_FSL_ESDHC
@@ -248,123 +247,7 @@ int cpu_mmc_init(bd_t *bis) }#endif -#ifdef CONFIG_MXC_UART -void mx25_uart1_init_pins (void ) -{ -struct iomuxc_mux_ctl *muxctl; -struct iomuxc_pad_ctl *padctl; -u32 inpadctl; -u32 outpadctl; -u32 muxmode0; - - muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE ; - padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE ; - muxmode0 =MX25_PIN_MUX_MODE (0 ); -/* -* set up input pins with hysteresis and 100K pull-ups -*/ - inpadctl =MX25_PIN_PAD_CTL_HYS - |MX25_PIN_PAD_CTL_PKE - |MX25_PIN_PAD_CTL_PUE |MX25_PIN_PAD_CTL_100K_PU ; - -/* -* set up output pins with 100K pull-downs -* FIXME: need to revisit this -* PUE is ignored if PKE is not set -* so the right value here is likely -* 0x0 for no pull up/down -* or -* 0xc0 for 100k pull down -*/ - outpadctl =MX25_PIN_PAD_CTL_PUE |MX25_PIN_PAD_CTL_100K_PD ; - -/* UART1 */ -/* rxd */ -writel (muxmode0, &muxctl->pad_uart1_rxd); -writel (inpadctl, &padctl->pad_uart1_rxd); - -/* txd */ -writel (muxmode0, &muxctl->pad_uart1_txd); -writel (outpadctl, &padctl->pad_uart1_txd); - -/* rts */ -writel (muxmode0, &muxctl->pad_uart1_rts); -writel (outpadctl, &padctl->pad_uart1_rts); - -/* cts */ -writel (muxmode0, &muxctl->pad_uart1_cts); -writel (inpadctl, &padctl->pad_uart1_cts); -} -#endif /* CONFIG_MXC_UART */ -#ifdef CONFIG_FEC_MXC -void mx25_fec_init_pins (void ) -{ -struct iomuxc_mux_ctl *muxctl; -struct iomuxc_pad_ctl *padctl; -u32 inpadctl_100kpd; -u32 inpadctl_22kpu; -u32 outpadctl; -u32 muxmode0; - - muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE ; - padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE ; - muxmode0 =MX25_PIN_MUX_MODE (0 ); - inpadctl_100kpd =MX25_PIN_PAD_CTL_HYS - |MX25_PIN_PAD_CTL_PKE - |MX25_PIN_PAD_CTL_PUE |MX25_PIN_PAD_CTL_100K_PD ; - inpadctl_22kpu =MX25_PIN_PAD_CTL_HYS - |MX25_PIN_PAD_CTL_PKE - |MX25_PIN_PAD_CTL_PUE |MX25_PIN_PAD_CTL_22K_PU ; -/* -* set up output pins with 100K pull-downs -* FIXME: need to revisit this -* PUE is ignored if PKE is not set -* so the right value here is likely -* 0x0 for no pull -* or -* 0xc0 for 100k pull down -*/ - outpadctl =MX25_PIN_PAD_CTL_PUE |MX25_PIN_PAD_CTL_100K_PD ; - -/* FEC_TX_CLK */ -writel (muxmode0, &muxctl->pad_fec_tx_clk); -writel (inpadctl_100kpd, &padctl->pad_fec_tx_clk); - -/* FEC_RX_DV */ -writel (muxmode0, &muxctl->pad_fec_rx_dv); -writel (inpadctl_100kpd, &padctl->pad_fec_rx_dv); - -/* FEC_RDATA0 */ -writel (muxmode0, &muxctl->pad_fec_rdata0); -writel (inpadctl_100kpd, &padctl->pad_fec_rdata0); - -/* FEC_TDATA0 */ -writel (muxmode0, &muxctl->pad_fec_tdata0); -writel (outpadctl, &padctl->pad_fec_tdata0); - -/* FEC_TX_EN */ -writel (muxmode0, &muxctl->pad_fec_tx_en); -writel (outpadctl, &padctl->pad_fec_tx_en); - -/* FEC_MDC */ -writel (muxmode0, &muxctl->pad_fec_mdc); -writel (outpadctl, &padctl->pad_fec_mdc); - -/* FEC_MDIO */ -writel (muxmode0, &muxctl->pad_fec_mdio); -writel (inpadctl_22kpu, &padctl->pad_fec_mdio); - -/* FEC_RDATA1 */ -writel (muxmode0, &muxctl->pad_fec_rdata1); -writel (inpadctl_100kpd, &padctl->pad_fec_rdata1); - -/* FEC_TDATA1 */ -writel (muxmode0, &muxctl->pad_fec_tdata1); -writel (outpadctl, &padctl->pad_fec_tdata1); - -} -void imx_get_mac_from_fuse (int dev_id,unsigned char *mac) {int i;
arch/arm/include/asm/arch-mx25/imx25-pinmux.h deleted +0 -421
421 lines not on this page · raw message
arch/arm/include/asm/arch-mx25/sys_proto.h deleted +0 -32
@@ -1,32 +0,0 @@ -/* -* (C) Copyright 2009 -* Stefano Babic, DENX Software Engineering, [email protected]. -* -* See file CREDITS for list of people who contributed to this -* project. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of -* the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA -*/ - -#ifndef _SYS_PROTO_H_ -#define _SYS_PROTO_H_ - -void mx25_uart1_init_pins (void ); -#if definedCONFIG_FEC_MXC -extern void mx25_fec_init_pins (void ); -#endif - -#endif
Signature · 1 line
1.7.10.4