On 10/13/11 23:11, Ilya Yanok wrote: > AM3517 specific CONTROL_PADCONF_* defines moved from board-specific > files to <asm/arch-omap3/mux.h>
Thanks, this is something I wanted to do a long time before, but had no time to get my hands on... > > Signed-off-by: Ilya Yanok <[email protected]> Acked-by: Igor Grinberg <[email protected]> > --- > arch/arm/include/asm/arch-omap3/mux.h | 41 > +++++++++++++++++++++++++++++++++ > board/logicpd/am3517evm/am3517evm.h | 40 -------------------------------- > board/ti/am3517crane/am3517crane.h | 39 ------------------------------- > 3 files changed, 41 insertions(+), 79 deletions(-) > > diff --git a/arch/arm/include/asm/arch-omap3/mux.h > b/arch/arm/include/asm/arch-omap3/mux.h > index 0c01c73..6daef49 100644 > --- a/arch/arm/include/asm/arch-omap3/mux.h > +++ b/arch/arm/include/asm/arch-omap3/mux.h > @@ -404,6 +404,47 @@ > #define CONTROL_PADCONF_SDRC_CKE0 0x0262 > #define CONTROL_PADCONF_SDRC_CKE1 0x0264 > > +/* AM3517 specific mux configuration */ > +#define CONTROL_PADCONF_SYS_NRESWARM 0x0A08 > +/* CCDC */ > +#define CONTROL_PADCONF_CCDC_PCLK 0x01E4 > +#define CONTROL_PADCONF_CCDC_FIELD 0x01E6 > +#define CONTROL_PADCONF_CCDC_HD 0x01E8 > +#define CONTROL_PADCONF_CCDC_VD 0x01EA > +#define CONTROL_PADCONF_CCDC_WEN 0x01EC > +#define CONTROL_PADCONF_CCDC_DATA0 0x01EE > +#define CONTROL_PADCONF_CCDC_DATA1 0x01F0 > +#define CONTROL_PADCONF_CCDC_DATA2 0x01F2 > +#define CONTROL_PADCONF_CCDC_DATA3 0x01F4 > +#define CONTROL_PADCONF_CCDC_DATA4 0x01F6 > +#define CONTROL_PADCONF_CCDC_DATA5 0x01F8 > +#define CONTROL_PADCONF_CCDC_DATA6 0x01FA > +#define CONTROL_PADCONF_CCDC_DATA7 0x01FC > +/* RMII */ > +#define CONTROL_PADCONF_RMII_MDIO_DATA 0x01FE > +#define CONTROL_PADCONF_RMII_MDIO_CLK 0x0200 > +#define CONTROL_PADCONF_RMII_RXD0 0x0202 > +#define CONTROL_PADCONF_RMII_RXD1 0x0204 > +#define CONTROL_PADCONF_RMII_CRS_DV 0x0206 > +#define CONTROL_PADCONF_RMII_RXER 0x0208 > +#define CONTROL_PADCONF_RMII_TXD0 0x020A > +#define CONTROL_PADCONF_RMII_TXD1 0x020C > +#define CONTROL_PADCONF_RMII_TXEN 0x020E > +#define CONTROL_PADCONF_RMII_50MHZ_CLK 0x0210 > +#define CONTROL_PADCONF_USB0_DRVBUS 0x0212 > +/* CAN */ > +#define CONTROL_PADCONF_HECC1_TXD 0x0214 > +#define CONTROL_PADCONF_HECC1_RXD 0x0216 > + > +#define CONTROL_PADCONF_SYS_BOOT7 0x0218 > +#define CONTROL_PADCONF_SDRC_DQS0N 0x021A > +#define CONTROL_PADCONF_SDRC_DQS1N 0x021C > +#define CONTROL_PADCONF_SDRC_DQS2N 0x021E > +#define CONTROL_PADCONF_SDRC_DQS3N 0x0220 > +#define CONTROL_PADCONF_STRBEN_DLY0 0x0222 > +#define CONTROL_PADCONF_STRBEN_DLY1 0x0224 > +#define CONTROL_PADCONF_SYS_BOOT8 0x0226 > + > #define MUX_VAL(OFFSET,VALUE)\ > writew((VALUE), OMAP34XX_CTRL_BASE + (OFFSET)); > > diff --git a/board/logicpd/am3517evm/am3517evm.h > b/board/logicpd/am3517evm/am3517evm.h > index 3d74ef1..68d746c 100644 > --- a/board/logicpd/am3517evm/am3517evm.h > +++ b/board/logicpd/am3517evm/am3517evm.h > @@ -31,46 +31,6 @@ const omap3_sysinfo sysinfo = { > "AM3517EVM Board", > "NAND", > }; > -/* AM3517 specific mux configuration */ > -#define CONTROL_PADCONF_SYS_NRESWARM 0x0A08 > -/* CCDC */ > -#define CONTROL_PADCONF_CCDC_PCLK 0x01E4 > -#define CONTROL_PADCONF_CCDC_FIELD 0x01E6 > -#define CONTROL_PADCONF_CCDC_HD 0x01E8 > -#define CONTROL_PADCONF_CCDC_VD 0x01EA > -#define CONTROL_PADCONF_CCDC_WEN 0x01EC > -#define CONTROL_PADCONF_CCDC_DATA0 0x01EE > -#define CONTROL_PADCONF_CCDC_DATA1 0x01F0 > -#define CONTROL_PADCONF_CCDC_DATA2 0x01F2 > -#define CONTROL_PADCONF_CCDC_DATA3 0x01F4 > -#define CONTROL_PADCONF_CCDC_DATA4 0x01F6 > -#define CONTROL_PADCONF_CCDC_DATA5 0x01F8 > -#define CONTROL_PADCONF_CCDC_DATA6 0x01FA > -#define CONTROL_PADCONF_CCDC_DATA7 0x01FC > -/* RMII */ > -#define CONTROL_PADCONF_RMII_MDIO_DATA 0x01FE > -#define CONTROL_PADCONF_RMII_MDIO_CLK 0x0200 > -#define CONTROL_PADCONF_RMII_RXD0 0x0202 > -#define CONTROL_PADCONF_RMII_RXD1 0x0204 > -#define CONTROL_PADCONF_RMII_CRS_DV 0x0206 > -#define CONTROL_PADCONF_RMII_RXER 0x0208 > -#define CONTROL_PADCONF_RMII_TXD0 0x020A > -#define CONTROL_PADCONF_RMII_TXD1 0x020C > -#define CONTROL_PADCONF_RMII_TXEN 0x020E > -#define CONTROL_PADCONF_RMII_50MHZ_CLK 0x0210 > -#define CONTROL_PADCONF_USB0_DRVBUS 0x0212 > -/* CAN */ > -#define CONTROL_PADCONF_HECC1_TXD 0x0214 > -#define CONTROL_PADCONF_HECC1_RXD 0x0216 > - > -#define CONTROL_PADCONF_SYS_BOOT7 0x0218 > -#define CONTROL_PADCONF_SDRC_DQS0N 0x021A > -#define CONTROL_PADCONF_SDRC_DQS1N 0x021C > -#define CONTROL_PADCONF_SDRC_DQS2N 0x021E > -#define CONTROL_PADCONF_SDRC_DQS3N 0x0220 > -#define CONTROL_PADCONF_STRBEN_DLY0 0x0222 > -#define CONTROL_PADCONF_STRBEN_DLY1 0x0224 > -#define CONTROL_PADCONF_SYS_BOOT8 0x0226 > > /* > * IEN - Input Enable > diff --git a/board/ti/am3517crane/am3517crane.h > b/board/ti/am3517crane/am3517crane.h > index 41db972..71335a3 100644 > --- a/board/ti/am3517crane/am3517crane.h > +++ b/board/ti/am3517crane/am3517crane.h > @@ -30,45 +30,6 @@ const omap3_sysinfo sysinfo = { > "CraneBoard", > "NAND", > }; > -/* AM3517 specific mux configuration */ > -#define CONTROL_PADCONF_SYS_NRESWARM 0x0A08 > -/* CCDC */ > -#define CONTROL_PADCONF_CCDC_PCLK 0x01E4 > -#define CONTROL_PADCONF_CCDC_FIELD 0x01E6 > -#define CONTROL_PADCONF_CCDC_HD 0x01E8 > -#define CONTROL_PADCONF_CCDC_VD 0x01EA > -#define CONTROL_PADCONF_CCDC_WEN 0x01EC > -#define CONTROL_PADCONF_CCDC_DATA0 0x01EE > -#define CONTROL_PADCONF_CCDC_DATA1 0x01F0 > -#define CONTROL_PADCONF_CCDC_DATA2 0x01F2 > -#define CONTROL_PADCONF_CCDC_DATA3 0x01F4 > -#define CONTROL_PADCONF_CCDC_DATA4 0x01F6 > -#define CONTROL_PADCONF_CCDC_DATA5 0x01F8 > -#define CONTROL_PADCONF_CCDC_DATA6 0x01FA > -#define CONTROL_PADCONF_CCDC_DATA7 0x01FC > -/* RMII */ > -#define CONTROL_PADCONF_RMII_MDIO_DATA 0x01FE > -#define CONTROL_PADCONF_RMII_MDIO_CLK 0x0200 > -#define CONTROL_PADCONF_RMII_RXD0 0x0202 > -#define CONTROL_PADCONF_RMII_RXD1 0x0204 > -#define CONTROL_PADCONF_RMII_CRS_DV 0x0206 > -#define CONTROL_PADCONF_RMII_RXER 0x0208 > -#define CONTROL_PADCONF_RMII_TXD0 0x020A > -#define CONTROL_PADCONF_RMII_TXD1 0x020C > -#define CONTROL_PADCONF_RMII_TXEN 0x020E > -#define CONTROL_PADCONF_RMII_50MHZ_CLK 0x0210 > -#define CONTROL_PADCONF_USB0_DRVBUS 0x0212 > -/* CAN */ > -#define CONTROL_PADCONF_HECC1_TXD 0x0214 > -#define CONTROL_PADCONF_HECC1_RXD 0x0216 > -#define CONTROL_PADCONF_SYS_BOOT7 0x0218 > -#define CONTROL_PADCONF_SDRC_DQS0N 0x021A > -#define CONTROL_PADCONF_SDRC_DQS1N 0x021C > -#define CONTROL_PADCONF_SDRC_DQS2N 0x021E > -#define CONTROL_PADCONF_SDRC_DQS3N 0x0220 > -#define CONTROL_PADCONF_STRBEN_DLY0 0x0222 > -#define CONTROL_PADCONF_STRBEN_DLY1 0x0224 > -#define CONTROL_PADCONF_SYS_BOOT8 0x0226 > > /* > * IEN - Input Enable -- Regards, Igor. _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
