Migrate cx9020 to DM_ETH, DM_USB and distro boot
Subsystems (2)
cover Migrate cx9020 to DM_ETH, DM_USB and distro boot
From: Steffen Dirkwinkel <[email protected]>
This series migrates the cx9020 to DM_ETH and DM_USB. It also switches bootcmds from custom uEnv.txt based booting to distroboot.
DM_USB works but enabling usb keyboards just makes them disappear from the usb device list.
The cx9020 board needs to load a bitstream into an fpga. It's currently easiest to use boot.scr boot scripts to load the bitstream with u-boot. In the future this might be implemented in the kernel driver for the fpga to support full boot with extlinux.conf.
Steffen Dirkwinkel (4):
imx: cx9020: migrate cx9020 to CONFIG_DM_ETH
imx: cx9020: migrate cx9020 to CONFIG_DM_USB
imx: cx9020: enable vidconsole by default
imx: cx9020: use distro boot
arch/arm/dts/imx53-cx9020.dts | 42 ++++++++---- board/beckhoff/mx53cx9020/mx53cx9020.c | 10 --- configs/mx53cx9020_defconfig | 10 +++ include/configs/mx53cx9020.h | 95 ++++++-------------------- 4 files changed, 59 insertions(+), 98 deletions(-)
Signature · 1 line
2.23.0
PATCH 1/4 imx: cx9020: migrate cx9020 to CONFIG_DM_ETH
From: Steffen Dirkwinkel <[email protected]>
---
arch/arm/dts/imx53-cx9020.dts | 31 ++++++++++++++++++++----------- configs/mx53cx9020_defconfig | 2 ++ include/configs/mx53cx9020.h | 4 ---- 3 files changed, 22 insertions(+), 15 deletions(-)
arch/arm/dts/imx53-cx9020.dts +20 -11
@@ -99,17 +99,6 @@ MX53_PAD_KEY_COL1__AUDMUX_AUD5_TXFS 0x80000000 MX53_PAD_KEY_ROW1__AUDMUX_AUD5_RXD 0x80000000 - MX53_PAD_FEC_MDC__FEC_MDC 0x4 - MX53_PAD_FEC_MDIO__FEC_MDIO 0x1fc - MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x180 - MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x180 - MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x180 - MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x180 - MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x180 - MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x4 - MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x4 - MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x4 - MX53_PAD_CSI0_DAT8__I2C1_SDA 0x400001ec MX53_PAD_CSI0_DAT9__I2C1_SCL 0x400001ec
@@ -148,6 +137,21 @@ >; }; + pinctrl_fec0: fec0grp { + fsl,pins = < + MX53_PAD_FEC_MDC__FEC_MDC 0x4 + MX53_PAD_FEC_MDIO__FEC_MDIO 0x1fc + MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x180 + MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x180 + MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x180 + MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x180 + MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x180 + MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x4 + MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x4 + MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x4 + >; + }; + pinctrl_esdhc1: esdhc1grp { fsl,pins = < MX53_PAD_SD1_DATA0__ESDHC1_DAT0 0x1d5
@@ -209,5 +213,10 @@ pinctrl-names = "default"; phy-mode = "rmii"; phy-reset-gpios = <&gpio7 6 0>; + pinctrl-0 = <&pinctrl_fec0>; status = "okay"; + fixed-link { /* RMII fixed link to KZ8863 */ + speed = <100>; + full-duplex; + }; };
configs/mx53cx9020_defconfig +2 -0
@@ -28,7 +28,9 @@ CONFIG_FPGA_CYCLON2=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC_IMX=y +CONFIG_DM_ETH=y CONFIG_FEC_MXC=y +CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX5=y
include/configs/mx53cx9020.h +0 -4
@@ -35,10 +35,6 @@/* bootz: zImage/initrd.img support */ -/* Eth Configs */ -#define IMX_FEC_BASE FEC_BASE_ADDR -#define CONFIG_ETHPRIME "FEC0" -#define CONFIG_FEC_MXC_PHYADDR 0x1F/* USB Configs */ #define CONFIG_MXC_USB_PORT 1
Signature · 1 line
2.23.0
PATCH 2/4 imx: cx9020: migrate cx9020 to CONFIG_DM_USB
In reply to linux-kernel-dev at beckhoff.comFrom: Steffen Dirkwinkel <[email protected]>
Note: gpio7_8 was never used for usb power regulator so we remove it here
---
arch/arm/dts/imx53-cx9020.dts | 11 ++++++++++- board/beckhoff/mx53cx9020/mx53cx9020.c | 10 ---------- configs/mx53cx9020_defconfig | 6 ++++++ 3 files changed, 16 insertions(+), 11 deletions(-)
arch/arm/dts/imx53-cx9020.dts +10 -1
@@ -36,7 +36,6 @@ MX53_PAD_GPIO_1__GPIO1_1 0x80000000 MX53_PAD_GPIO_4__GPIO1_4 0x80000000 MX53_PAD_PATA_DA_0__GPIO7_6 0x80000000 - MX53_PAD_PATA_DA_2__GPIO7_8 0x80000000 MX53_PAD_GPIO_16__GPIO7_11 0x80000000 MX53_PAD_EIM_OE__EMI_WEIM_OE 0x80000000
@@ -220,3 +219,13 @@ full-duplex; }; }; + +&usbh1 { + phy_type = "utmi"; + status = "okay"; +}; + +&usbotg { + dr_mode = "host"; + status = "okay"; +};
board/beckhoff/mx53cx9020/mx53cx9020.c +0 -10
@@ -127,16 +127,6 @@ static void setup_gpio_leds(void)gpio_direction_output (GPIO_LED_PWR_G ,0 ); } -#ifdef CONFIG_USB_EHCI_MX5 -int board_ehci_hcd_init (int port) -{ -/* request VBUS power enable pin, GPIO7_8 */ -gpio_direction_output (IMX_GPIO_NR (7 ,8 ),1 ); -return 0 ; -} -#endif - -static int power_init (void ) {/* nothing to do on CX9020 */
configs/mx53cx9020_defconfig +6 -0
@@ -19,7 +19,13 @@ CONFIG_CMD_PXE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y +CONFIG_CMD_USB=y CONFIG_CMD_FS_GENERIC=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_EHCI_MX5=y +CONFIG_USB_STORAGE=y +CONFIG_DM_REGULATOR=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx53-cx9020" CONFIG_ENV_IS_IN_MMC=y
Signature · 1 line
2.23.0
PATCH 3/4 imx: cx9020: enable vidconsole by default
In reply to linux-kernel-dev at beckhoff.comFrom: Steffen Dirkwinkel <[email protected]>
---
configs/mx53cx9020_defconfig | 1 + include/configs/mx53cx9020.h | 3 +++ 2 files changed, 4 insertions(+)
configs/mx53cx9020_defconfig +1 -0
@@ -43,3 +43,4 @@ CONFIG_PINCTRL_IMX5=y CONFIG_MXC_UART=y CONFIG_DM_VIDEO=y CONFIG_VIDEO_IPUV3=y +CONFIG_SYS_WHITE_ON_BLACK=y
include/configs/mx53cx9020.h +3 -0
@@ -53,6 +53,9 @@"pxefile_addr_r=0x73000000\0" \"ramdisk_addr_r=0x72000000\0" \"console=ttymxc1,115200\0" \ +"stdin=serial\0" \ +"stdout=serial,vidconsole\0" \ +"stderr=serial,vidconsole\0" \"uenv=/boot/uEnv.txt\0" \"optargs=\0" \"cmdline=\0" \
Signature · 1 line
2.23.0
PATCH 4/4 imx: cx9020: use distro boot
In reply to linux-kernel-dev at beckhoff.comFrom: Steffen Dirkwinkel <[email protected]>
We switch from custom boot commands relying on uEnv.txt to distro boot. This removes the automatic fpga bitstream loading in favor of loading bitstreams via custom bootscripts (boot.scr) or after booting the kernel.
---
Checkpatch complains with:
Quoted 1 line
include/configs/mx53cx9020.h:51: check: Macro argument reuse 'func' - possible side-effects?
Is this expected? I can't see what's wrong though i may have missed something obvious.
configs/mx53cx9020_defconfig | 1 + include/configs/mx53cx9020.h | 88 +++++++----------------------------- 2 files changed, 17 insertions(+), 72 deletions(-)
configs/mx53cx9020_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beckhoff/mx53cx9020/imximage.cfg" CONFIG_BOOTDELAY=1 CONFIG_USE_PREBOOT=y +CONFIG_DISTRO_DEFAULTS=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y
include/configs/mx53cx9020.h +16 -72
106 lines not on this page · raw message
Signature · 1 line
2.23.0