ARM: omap3_logic: Remove some manual pin-muxing
PATCH 1/1 ARM: omap3_logic: Remove some manual pin-muxing
With the pinctrl function enabled and the device tree setting up the pins we want to use, this patch removes the manual pinmuxing except for that which is not done by the device tree and minimal pins necessary for SPL (like serial, GPMC, and MMC)
Signed-off-by Adam Ford <[email protected]>
board/logicpd/omap3som/omap3logic.h +0 -127
@@ -131,145 +131,18 @@ void set_muxconf_regs(void)MUX_VAL (CP (GPMC_WAIT2 ), (IEN |PTU |EN |M4 ));/*GPIO_64*/ MUX_VAL (CP (GPMC_WAIT3 ), (IEN |PTU |EN |M0 ));/*GPMC_WAIT3*/ -MUX_VAL (CP (CAM_HS ), (IEN |PTU |EN |M0 ));/*CAM_HS */ -MUX_VAL (CP (CAM_VS ), (IEN |PTU |EN |M0 ));/*CAM_VS */ -MUX_VAL (CP (CAM_XCLKA ), (IDIS |PTD |DIS |M0 ));/*CAM_XCLKA*/ -MUX_VAL (CP (CAM_PCLK ), (IEN |PTU |EN |M0 ));/*CAM_PCLK*/ -MUX_VAL (CP (CAM_FLD ), (IDIS |PTD |DIS |M4 ));/*GPIO_98*/ -MUX_VAL (CP (CAM_D0 ), (IEN |PTD |DIS |M0 ));/*CAM_D0*/ -MUX_VAL (CP (CAM_D1 ), (IEN |PTD |DIS |M0 ));/*CAM_D1*/ -MUX_VAL (CP (CAM_D2 ), (IEN |PTD |DIS |M0 ));/*CAM_D2*/ -MUX_VAL (CP (CAM_D3 ), (IEN |PTD |DIS |M0 ));/*CAM_D3*/ -MUX_VAL (CP (CAM_D4 ), (IEN |PTD |DIS |M0 ));/*CAM_D4*/ -MUX_VAL (CP (CAM_D5 ), (IEN |PTD |DIS |M0 ));/*CAM_D5*/ -MUX_VAL (CP (CAM_D6 ), (IEN |PTD |DIS |M0 ));/*CAM_D6*/ -MUX_VAL (CP (CAM_D7 ), (IEN |PTD |DIS |M0 ));/*CAM_D7*/ -MUX_VAL (CP (CAM_D8 ), (IEN |PTD |DIS |M0 ));/*CAM_D8*/ -MUX_VAL (CP (CAM_D9 ), (IEN |PTD |DIS |M0 ));/*CAM_D9*/ -MUX_VAL (CP (CAM_D10 ), (IEN |PTD |DIS |M0 ));/*CAM_D10*/ -MUX_VAL (CP (CAM_D11 ), (IEN |PTD |DIS |M0 ));/*CAM_D11*/ -MUX_VAL (CP (CAM_XCLKB ), (IDIS |PTD |DIS |M0 ));/*CAM_XCLKB*/ -MUX_VAL (CP (CAM_WEN ), (IEN |PTD |DIS |M4 ));/*GPIO_167*/ -MUX_VAL (CP (CAM_STROBE ), (IDIS |PTD |DIS |M0 ));/*CAM_STROBE*/ - -MUX_VAL (CP (CSI2_DX0 ), (IEN |PTD |DIS |M0 ));/*CSI2_DX0*/ -MUX_VAL (CP (CSI2_DY0 ), (IEN |PTD |DIS |M0 ));/*CSI2_DY0*/ -MUX_VAL (CP (CSI2_DX1 ), (IEN |PTD |DIS |M0 ));/*CSI2_DX1*/ -MUX_VAL (CP (CSI2_DY1 ), (IEN |PTD |DIS |M0 ));/*CSI2_DY1*/ - -MUX_VAL (CP (MCBSP2_FSX ), (IEN |PTD |DIS |M0 ));/*McBSP2_FSX*/ -MUX_VAL (CP (MCBSP2_CLKX ), (IEN |PTD |DIS |M0 ));/*McBSP2_CLKX*/ -MUX_VAL (CP (MCBSP2_DR ), (IEN |PTD |DIS |M0 ));/*McBSP2_DR*/ -MUX_VAL (CP (MCBSP2_DX ), (IDIS |PTD |DIS |M0 ));/*McBSP2_DX*/ -MUX_VAL (CP (MMC1_CLK ), (IDIS |PTU |EN |M0 ));/*MMC1_CLK*/ MUX_VAL (CP (MMC1_CMD ), (IEN |PTU |EN |M0 ));/*MMC1_CMD*/ MUX_VAL (CP (MMC1_DAT0 ), (IEN |PTU |EN |M0 ));/*MMC1_DAT0*/ MUX_VAL (CP (MMC1_DAT1 ), (IEN |PTU |EN |M0 ));/*MMC1_DAT1*/ MUX_VAL (CP (MMC1_DAT2 ), (IEN |PTU |EN |M0 ));/*MMC1_DAT2*/ MUX_VAL (CP (MMC1_DAT3 ), (IEN |PTU |EN |M0 ));/*MMC1_DAT3*/ -MUX_VAL (CP (MMC1_DAT4 ), (IEN |PTU |EN |M0 ));/*MMC1_DAT4*/ -MUX_VAL (CP (MMC1_DAT5 ), (IEN |PTU |EN |M0 ));/*MMC1_DAT5*/ -MUX_VAL (CP (MMC1_DAT6 ), (IEN |PTU |EN |M0 ));/*MMC1_DAT6*/ -MUX_VAL (CP (MMC1_DAT7 ), (IEN |PTU |EN |M0 ));/*MMC1_DAT7*/ - -MUX_VAL (CP (MMC2_CLK ), (IEN |PTD |DIS |M0 ));/*MMC2_CLK*/ -MUX_VAL (CP (MMC2_CMD ), (IEN |PTU |EN |M0 ));/*MMC2_CMD*/ -MUX_VAL (CP (MMC2_DAT0 ), (IEN |PTU |EN |M0 ));/*MMC2_DAT0*/ -MUX_VAL (CP (MMC2_DAT1 ), (IEN |PTU |EN |M0 ));/*MMC2_DAT1*/ -MUX_VAL (CP (MMC2_DAT2 ), (IEN |PTU |EN |M0 ));/*MMC2_DAT2*/ -MUX_VAL (CP (MMC2_DAT3 ), (IEN |PTU |EN |M0 ));/*MMC2_DAT3*/ -MUX_VAL (CP (MMC2_DAT4 ), (IDIS |PTD |DIS |M0 ));/*MMC2_DAT4*/ -MUX_VAL (CP (MMC2_DAT5 ), (IDIS |PTD |DIS |M0 ));/*MMC2_DAT5*/ -MUX_VAL (CP (MMC2_DAT6 ), (IDIS |PTD |DIS |M0 ));/*MMC2_DAT6 */ -MUX_VAL (CP (MMC2_DAT7 ), (IEN |PTU |EN |M0 ));/*MMC2_DAT7*/ - -MUX_VAL (CP (MCBSP3_DX ), (IDIS |PTD |DIS |M0 ));/*McBSP3_DX*/ -MUX_VAL (CP (MCBSP3_DR ), (IEN |PTD |DIS |M0 ));/*McBSP3_DR*/ -MUX_VAL (CP (MCBSP3_CLKX ), (IEN |PTD |DIS |M0 ));/*McBSP3_CLKX*/ -MUX_VAL (CP (MCBSP3_FSX ), (IEN |PTD |DIS |M0 ));/*McBSP3_FSX*/ - -MUX_VAL (CP (UART2_CTS ), (IEN |PTU |EN |M0 ));/*UART2_CTS*/ -MUX_VAL (CP (UART2_RTS ), (IDIS |PTD |DIS |M0 ));/*UART2_RTS*/ -MUX_VAL (CP (UART2_TX ), (IDIS |PTD |DIS |M0 ));/*UART2_TX*/ -MUX_VAL (CP (UART2_RX ), (IEN |PTD |DIS |M0 ));/*UART2_RX*/ MUX_VAL (CP (UART1_TX ), (IDIS |PTD |DIS |M0 ));/*UART1_TX*/ MUX_VAL (CP (UART1_RTS ), (IDIS |PTD |DIS |M0 ));/*UART1_RTS*/ MUX_VAL (CP (UART1_CTS ), (IEN |PTU |DIS |M0 ));/*UART1_CTS*/ MUX_VAL (CP (UART1_RX ), (IEN |PTD |DIS |M0 ));/*UART1_RX*/ -MUX_VAL (CP (MCBSP4_CLKX ), (IDIS |PTD |DIS |M4 ));/*GPIO_152*/ -MUX_VAL (CP (MCBSP4_DR ), (IDIS |PTD |DIS |M4 ));/*GPIO_153*/ - -MUX_VAL (CP (MCBSP1_CLKR ), (IEN |PTD |DIS |M0 ));/*MCBSP1_CLKR*/ -MUX_VAL (CP (MCBSP1_FSR ), (IDIS |PTU |EN |M0 ));/*MCBSP1_FSR*/ -MUX_VAL (CP (MCBSP1_DX ), (IDIS |PTD |DIS |M0 ));/*MCBSP1_DX*/ -MUX_VAL (CP (MCBSP1_DR ), (IEN |PTD |DIS |M0 ));/*MCBSP1_DR*/ -MUX_VAL (CP (MCBSP_CLKS ), (IEN |PTU |DIS |M0 ));/*MCBSP_CLKS*/ -MUX_VAL (CP (MCBSP1_FSX ), (IEN |PTD |DIS |M0 ));/*MCBSP1_FSX*/ -MUX_VAL (CP (MCBSP1_CLKX ), (IEN |PTD |DIS |M0 ));/*MCBSP1_CLKX*/ - -MUX_VAL (CP (UART3_CTS_RCTX ), (IEN |PTD |EN |M0 ));/*UART3_CTS_*/ -MUX_VAL (CP (UART3_RTS_SD ), (IDIS |PTD |DIS |M0 ));/*UART3_RTS_SD */ -MUX_VAL (CP (UART3_RX_IRRX ), (IEN |PTD |DIS |M0 ));/*UART3_RX_IRRX*/ -MUX_VAL (CP (UART3_TX_IRTX ), (IDIS |PTD |DIS |M0 ));/*UART3_TX_IRTX*/ - -MUX_VAL (CP (HSUSB0_CLK ), (IEN |PTD |DIS |M0 ));/*HSUSB0_CLK*/ -MUX_VAL (CP (HSUSB0_STP ), (IDIS |PTU |EN |M0 ));/*HSUSB0_STP*/ -MUX_VAL (CP (HSUSB0_DIR ), (IEN |PTD |DIS |M0 ));/*HSUSB0_DIR*/ -MUX_VAL (CP (HSUSB0_NXT ), (IEN |PTD |DIS |M0 ));/*HSUSB0_NXT*/ -MUX_VAL (CP (HSUSB0_DATA0 ), (IEN |PTD |DIS |M0 ));/*HSUSB0_DATA0*/ -MUX_VAL (CP (HSUSB0_DATA1 ), (IEN |PTD |DIS |M0 ));/*HSUSB0_DATA1*/ -MUX_VAL (CP (HSUSB0_DATA2 ), (IEN |PTD |DIS |M0 ));/*HSUSB0_DATA2*/ -MUX_VAL (CP (HSUSB0_DATA3 ), (IEN |PTD |DIS |M0 ));/*HSUSB0_DATA3*/ -MUX_VAL (CP (HSUSB0_DATA4 ), (IEN |PTD |DIS |M0 ));/*HSUSB0_DATA4*/ -MUX_VAL (CP (HSUSB0_DATA5 ), (IEN |PTD |DIS |M0 ));/*HSUSB0_DATA5*/ -MUX_VAL (CP (HSUSB0_DATA6 ), (IEN |PTD |DIS |M0 ));/*HSUSB0_DATA6*/ -MUX_VAL (CP (HSUSB0_DATA7 ), (IEN |PTD |DIS |M0 ));/*HSUSB0_DATA7*/ - -MUX_VAL (CP (I2C1_SCL ), (IEN |EN |M0 ));/*I2C1_SCL*/ -MUX_VAL (CP (I2C1_SDA ), (IEN |EN |M0 ));/*I2C1_SDA*/ - -MUX_VAL (CP (I2C2_SCL ), (IEN |EN |M0 ));/*I2C2_SCL*/ -MUX_VAL (CP (I2C2_SDA ), (IEN |EN |M0 ));/*I2C2_SDA*/ - -MUX_VAL (CP (I2C3_SCL ), (IEN |EN |M0 ));/*I2C3_SCL*/ -MUX_VAL (CP (I2C3_SDA ), (IEN |EN |M0 ));/*I2C3_SDA*/ - -MUX_VAL (CP (I2C4_SCL ), (IEN |EN |M0 ));/*I2C4_SCL*/ -MUX_VAL (CP (I2C4_SDA ), (IEN |EN |M0 ));/*I2C4_SDA*/ - -MUX_VAL (CP (HDQ_SIO ), (IEN |PTU |EN |M0 ));/*HDQ_SIO*/ - -MUX_VAL (CP (MCSPI1_CLK ), (IEN |PTD |DIS |M0 ));/*McSPI1_CLK*/ -MUX_VAL (CP (MCSPI1_SIMO ), (IEN |PTD |DIS |M0 ));/*McSPI1_SIMO */ -MUX_VAL (CP (MCSPI1_SOMI ), (IEN |PTD |DIS |M0 ));/*McSPI1_SOMI */ -MUX_VAL (CP (MCSPI1_CS0 ), (IEN |PTD |EN |M0 ));/*McSPI1_CS0*/ -MUX_VAL (CP (MCSPI1_CS1 ), (IEN |PTD |EN |M4 ));/*GPIO_175*/ -MUX_VAL (CP (MCSPI1_CS2 ), (IEN |PTU |DIS |M4 ));/*GPIO_176*/ -MUX_VAL (CP (MCSPI1_CS3 ), (IEN |PTD |EN |M0 ));/*McSPI1_CS3*/ - -MUX_VAL (CP (MCSPI2_CLK ), (IEN |PTD |DIS |M0 ));/*McSPI2_CLK*/ -MUX_VAL (CP (MCSPI2_SIMO ), (IEN |PTD |DIS |M0 ));/*McSPI2_SIMO*/ -MUX_VAL (CP (MCSPI2_SOMI ), (IEN |PTD |DIS |M0 ));/*McSPI2_SOMI*/ -MUX_VAL (CP (MCSPI2_CS0 ), (IEN |PTD |EN |M0 ));/*McSPI2_CS0*/ -MUX_VAL (CP (MCSPI2_CS1 ), (IEN |PTD |EN |M0 ));/*McSPI2_CS1*/ - -MUX_VAL (CP (SYS_32K ), (IEN |PTD |DIS |M0 ));/*SYS_32K*/ -MUX_VAL (CP (SYS_CLKREQ ), (IEN |PTD |DIS |M0 ));/*SYS_CLKREQ*/ -MUX_VAL (CP (SYS_NIRQ ), (IEN |PTU |EN |M0 ));/*SYS_nIRQ*/ -MUX_VAL (CP (SYS_BOOT0 ), (IEN |PTD |DIS |M4 ));/*GPIO_2*/ -MUX_VAL (CP (SYS_BOOT1 ), (IEN |PTD |DIS |M4 ));/*GPIO_3 */ -MUX_VAL (CP (SYS_BOOT2 ), (IEN |PTD |DIS |M4 ));/*GPIO_4*/ -MUX_VAL (CP (SYS_BOOT3 ), (IEN |PTD |DIS |M4 ));/*GPIO_5*/ -MUX_VAL (CP (SYS_BOOT4 ), (IEN |PTD |DIS |M4 ));/*GPIO_6*/ -MUX_VAL (CP (SYS_BOOT5 ), (IEN |PTD |DIS |M4 ));/*GPIO_7*/ - -MUX_VAL (CP (SYS_OFF_MODE ), (IEN |PTD |DIS |M0 ));/*SYS_OFF_MODE*/ -MUX_VAL (CP (SYS_CLKOUT1 ), (IEN |PTD |DIS |M0 ));/*SYS_CLKOUT1*/ -MUX_VAL (CP (SYS_CLKOUT2 ), (IEN |PTU |EN |M0 ));/*SYS_CLKOUT2*/ -MUX_VAL (CP (JTAG_TCK ), (IEN |PTD |DIS |M0 ));/*JTAG_TCK*/ MUX_VAL (CP (JTAG_TMS ), (IEN |PTD |DIS |M0 ));/*JTAG_TMS*/ MUX_VAL (CP (JTAG_TDI ), (IEN |PTD |DIS |M0 ));/*JTAG_TDI*/
Signature · 1 line
2.17.1
board/logicpd/omap3som/omap3logic.h
Quoted 9 lines · Adam Ford
With the pinctrl function enabled and the device tree setting up the pins we want to use, this patch removes the manual pinmuxing except for that which is not done by the device tree and minimal pins necessary for SPL (like serial, GPMC, and MMC)
Signed-off-by Adam Ford <[email protected]>board/logicpd/omap3som/omap3logic.h +0
-0
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180929/73486980/attachment.sig>