Skip to contentSkip to conversation

imx6ul: opos6ul: migrate to DM_ETH

PATCH Superseded Sébastien Szymanski 3 participants 7 messages Sep 30, 2019 – Oct 9, 2019

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 imx6ul: opos6ul: migrate to DM_ETH

Migrate to DM_ETH and remove code that is no longer necessary.

---
 arch/arm/mach-imx/mx6/opos6ul.c | 76 +++------------------------------
 configs/opos6uldev_defconfig    |  2 +
 include/configs/opos6uldev.h    |  8 ----
 3 files changed, 8 insertions(+), 78 deletions(-)
arch/arm/mach-imx/mx6/opos6ul.c +6 -70
index c5fafb9f8e..50aec5171c 100644
@@ -6,11 +6,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
-#include <asm/arch/iomux.h>
-#include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/gpio.h>
-#include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <common.h>
 #include <env.h>
@@ -20,43 +16,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #ifdef CONFIG_FEC_MXC
 #include <miiphy.h>
 
-#define MDIO_PAD_CTRL ( \
-	PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
-	PAD_CTL_DSE_40ohm \
-)
-
-#define ENET_PAD_CTRL_PU ( \
-	PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
-	PAD_CTL_DSE_40ohm \
-)
-
-#define ENET_PAD_CTRL_PD ( \
-	PAD_CTL_HYS | PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED | \
-	PAD_CTL_DSE_40ohm \
-)
-
-#define ENET_CLK_PAD_CTRL ( \
-	PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_LOW | \
-	PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST \
-)
-
-static iomux_v3_cfg_t const fec1_pads[] = {
-	MX6_PAD_GPIO1_IO06__ENET1_MDIO        | MUX_PAD_CTRL(MDIO_PAD_CTRL),
-	MX6_PAD_GPIO1_IO07__ENET1_MDC         | MUX_PAD_CTRL(MDIO_PAD_CTRL),
-	MX6_PAD_ENET1_RX_ER__ENET1_RX_ER      | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
-	MX6_PAD_ENET1_RX_EN__ENET1_RX_EN      | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
-	MX6_PAD_ENET1_RX_DATA1__ENET1_RDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
-	MX6_PAD_ENET1_RX_DATA0__ENET1_RDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
-	MX6_PAD_ENET1_TX_DATA0__ENET1_TDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL_PU),
-	MX6_PAD_ENET1_TX_DATA1__ENET1_TDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL_PU),
-	MX6_PAD_ENET1_TX_EN__ENET1_TX_EN      | MUX_PAD_CTRL(ENET_PAD_CTRL_PU),
-	/* PHY Int */
-	MX6_PAD_NAND_DQS__GPIO4_IO16          | MUX_PAD_CTRL(ENET_PAD_CTRL_PU),
-	/* PHY Reset */
-	MX6_PAD_NAND_DATA00__GPIO4_IO02       | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
-	MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1  | MUX_PAD_CTRL(ENET_CLK_PAD_CTRL),
-};
-
 int board_phy_config(struct phy_device *phydev)
 {
 	phy_write(phydev, MDIO_DEVAD_NONE, 0x1f, 0x8190);
@@ -67,43 +26,16 @@ int board_phy_config(struct phy_device *phydev)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
+static int setup_fec(void)
 {
 	struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
-	struct gpio_desc rst;
-	int ret;
 
 	/* Use 50M anatop loopback REF_CLK1 for ENET1,
 	 * clear gpr1[13], set gpr1[17] */
 	clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC1_MASK,
 			IOMUX_GPR1_FEC1_CLOCK_MUX1_SEL_MASK);
 
-	ret = enable_fec_anatop_clock(0, ENET_50MHZ);
-	if (ret)
-		return ret;
-
-	enable_enet_clk(1);
-
-	imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
-
-	ret = dm_gpio_lookup_name("GPIO4_2", &rst);
-	if (ret) {
-		printf("Cannot get GPIO4_2\n");
-		return ret;
-	}
-
-	ret = dm_gpio_request(&rst, "phy-rst");
-	if (ret) {
-		printf("Cannot request GPIO4_2\n");
-		return ret;
-	}
-
-	dm_gpio_set_dir_flags(&rst, GPIOD_IS_OUT);
-	dm_gpio_set_value(&rst, 0);
-	udelay(1000);
-	dm_gpio_set_value(&rst, 1);
-
-	return fecmxc_initialize(bis);
+	return enable_fec_anatop_clock(0, ENET_50MHZ);
 }
 #endif /* CONFIG_FEC_MXC */
 
@@ -112,6 +44,10 @@ int board_init(void)
 	/* Address of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
+#ifdef CONFIG_FEC_MXC
+	setup_fec();
+#endif
+
 	return 0;
 }
 
configs/opos6uldev_defconfig +2 -0
index 5eef6527cd..44236e99bc 100644
@@ -73,6 +73,8 @@ CONFIG_FSL_USDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ8XXX=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
include/configs/opos6uldev.h +0 -8
index b13e476027..b10071eaaf 100644
@@ -41,14 +41,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
 #endif
 
-/* Ethernet */
-#ifdef CONFIG_FEC_MXC
-#define IMX_FEC_BASE			ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR          0x1
-#define CONFIG_FEC_XCV_TYPE             RMII
-#define CONFIG_ETHPRIME			"FEC"
-#endif
-
 /* LCD */
 #ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_VIDEO
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/3 opos6uldev: migrate to DM_VIDEO

Migrate to DM_VIDEO, update the device tree and remove code that is no longer necessary.

---
 arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi | 10 ++++++
 arch/arm/dts/imx6ul-opos6uldev.dts         |  4 +--
 board/armadeus/opos6uldev/board.c          | 36 ----------------------
 configs/opos6uldev_defconfig               |  3 +-
 include/configs/opos6uldev.h               |  6 +++-
 5 files changed, 19 insertions(+), 40 deletions(-)
arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi +10 -0
index da8b0392ef..3f351ef0c4 100644
@@ -7,6 +7,12 @@
 
 #include "imx6ul-opos6ul-u-boot.dtsi"
 
+/ {
+	aliases {
+		display0 = &lcdif;
+	};
+};
+
 &aips1 {
 	u-boot,dm-spl;
 
@@ -15,6 +21,10 @@
 	};
 };
 
+&lcdif {
+	u-boot,dm-pre-proper;
+};
+
 &pinctrl_uart1 {
 	u-boot,dm-spl;
 };
arch/arm/dts/imx6ul-opos6uldev.dts +2 -2
index 0e59ee57fd..4a541be6b0 100644
@@ -187,7 +187,7 @@
 	status = "okay";
 
 	display0: display0 {
-		bits-per-pixel = <32>;
+		bits-per-pixel = <18>;
 		bus-width = <18>;
 
 		display-timings {
@@ -202,7 +202,7 @@
 				hsync-len = <64>;
 				vsync-len = <4>;
 				de-active = <1>;
-				pixelclk-active = <0>;
+				pixelclk-active = <1>;
 			};
 		};
 	};
board/armadeus/opos6uldev/board.c +0 -36
index cbf40d5c4a..ade155c5ad 100644
@@ -3,53 +3,17 @@
  * Copyright (C) 2018 Armadeus Systems
  */
 
-#include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <common.h>
 
 #ifdef CONFIG_VIDEO_MXS
-#define LCD_PAD_CTRL ( \
-	PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \
-	PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm \
-)
-
-static iomux_v3_cfg_t const lcd_pads[] = {
-	MX6_PAD_LCD_CLK__LCDIF_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_ENABLE__LCDIF_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_HSYNC__LCDIF_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_VSYNC__LCDIF_VSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA00__LCDIF_DATA00 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA01__LCDIF_DATA01 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA02__LCDIF_DATA02 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA03__LCDIF_DATA03 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA04__LCDIF_DATA04 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA05__LCDIF_DATA05 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA06__LCDIF_DATA06 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA07__LCDIF_DATA07 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA08__LCDIF_DATA08 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA09__LCDIF_DATA09 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA10__LCDIF_DATA10 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA11__LCDIF_DATA11 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA12__LCDIF_DATA12 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA13__LCDIF_DATA13 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA14__LCDIF_DATA14 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA15__LCDIF_DATA15 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA16__LCDIF_DATA16 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA17__LCDIF_DATA17 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-
-	MX6_PAD_NAND_ALE__GPIO4_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL)
-};
-
 int setup_lcd(void)
 {
 	struct gpio_desc backlight;
 	int ret;
 
-	imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
-
 	/* Set Brightness to high */
 	ret = dm_gpio_lookup_name("GPIO4_10", &backlight);
 	if (ret) {
configs/opos6uldev_defconfig +2 -1
index 44236e99bc..352d10a0d8 100644
@@ -95,6 +95,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_VIDEO=y
+CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 # CONFIG_EFI_LOADER is not set
include/configs/opos6uldev.h +5 -1
index b10071eaaf..11face21a1 100644
@@ -43,7 +43,7 @@
 
 /* LCD */
 #ifndef CONFIG_SPL_BUILD
-#ifdef CONFIG_VIDEO
+#ifdef CONFIG_DM_VIDEO
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
@@ -51,6 +51,8 @@
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_BMP_16BPP
+#define CONFIG_BMP_24BPP
+#define CONFIG_BMP_32BPP
 #define CONFIG_VIDEO_MXS
 #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
 #endif
@@ -87,6 +89,8 @@
 	"mmcroot=/dev/mmcblk0p2 ro\0"                                                           \
 	"mmcrootfstype=ext4 rootwait\0"                                                         \
 	"kernelimg="           __stringify(CONFIG_BOARD_NAME)          "-linux.bin\0"           \
+	"splashpos=0,0\0"									\
+	"splashimage="		__stringify(CONFIG_LOADADDR) 		"\0"			\
 	"videomode=video=ctfb:x:800,y:480,depth:18,pclk:33033,le:96,ri:96,up:20,lo:21,hs:64,vs:4,sync:0,vmode:0\0" \
 	"check_env=if test -n ${flash_env_version}; "                                           \
 		"then env default env_version; "                                                \
Signature · 1 line
2.21.0
#2 lore raw

PATCH 2/3 opos6uldev: migrate to DM_VIDEO

Quoted 192 lines

Subject: [PATCH 2/3] opos6uldev: migrate to DM_VIDEO

Migrate to DM_VIDEO, update the device tree and remove code that is no longer necessary.

---
 arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi | 10 ++++++
 arch/arm/dts/imx6ul-opos6uldev.dts         |  4 +--
 board/armadeus/opos6uldev/board.c          | 36 ----------------------
 configs/opos6uldev_defconfig               |  3 +-
 include/configs/opos6uldev.h               |  6 +++-
 5 files changed, 19 insertions(+), 40 deletions(-)
arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi +10 -0
index da8b0392ef..3f351ef0c4 100644
@@ -7,6 +7,12 @@
 
 #include "imx6ul-opos6ul-u-boot.dtsi"
 
+/ {
+	aliases {
+		display0 = &lcdif;
+	};
+};
+
 &aips1 {
 	u-boot,dm-spl;
 
@@ -15,6 +21,10 @@
 	};
 };
 
+&lcdif {
+	u-boot,dm-pre-proper;
+};
+
 &pinctrl_uart1 {
 	u-boot,dm-spl;
 };
arch/arm/dts/imx6ul-opos6uldev.dts +2 -2
index 0e59ee57fd..4a541be6b0 100644
@@ -187,7 +187,7 @@
 	status = "okay";
 
 	display0: display0 {
-		bits-per-pixel = <32>;
+		bits-per-pixel = <18>;
 		bus-width = <18>;
 
 		display-timings {
@@ -202,7 +202,7 @@
 				hsync-len = <64>;
 				vsync-len = <4>;
 				de-active = <1>;
-				pixelclk-active = <0>;
+				pixelclk-active = <1>;
 			};
 		};
 	};
board/armadeus/opos6uldev/board.c +0 -18
index cbf40d5c4a..ade155c5ad 100644
@@ -3,53 +3,17 @@
  * Copyright (C) 2018 Armadeus Systems
  */
 
-#include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <common.h>
 
 #ifdef CONFIG_VIDEO_MXS
-#define LCD_PAD_CTRL ( \
-	PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \
-	PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm \
-)
-
-static iomux_v3_cfg_t const lcd_pads[] = {
-	MX6_PAD_LCD_CLK__LCDIF_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_ENABLE__LCDIF_ENABLE |
 MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_HSYNC__LCDIF_HSYNC |
 MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_VSYNC__LCDIF_VSYNC |
 MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA00__LCDIF_DATA00 |
 MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA01__LCDIF_DATA01 |
 MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA02__LCDIF_DATA02 |
 MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA03__LCDIF_DATA03 |
 MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA04__LCDIF_DATA04 |
 MUX_PAD_CTRL(LCD_PAD_CTRL),
-	MX6_PAD_LCD_DATA05__LCDIF_DATA05 |

MUX_PAD_CTRL(LCD_PAD_CTRL),

board/armadeus/opos6uldev/board.c +0 -1
-	MX6_PAD_LCD_DATA06__LCDIF_DATA06 |

MUX_PAD_CTRL(LCD_PAD_CTRL),

board/armadeus/opos6uldev/board.c +0 -1
-	MX6_PAD_LCD_DATA07__LCDIF_DATA07 |

MUX_PAD_CTRL(LCD_PAD_CTRL),

board/armadeus/opos6uldev/board.c +0 -1
-	MX6_PAD_LCD_DATA08__LCDIF_DATA08 |

MUX_PAD_CTRL(LCD_PAD_CTRL),

board/armadeus/opos6uldev/board.c +0 -1
-	MX6_PAD_LCD_DATA09__LCDIF_DATA09 |

MUX_PAD_CTRL(LCD_PAD_CTRL),

board/armadeus/opos6uldev/board.c +0 -1
-	MX6_PAD_LCD_DATA10__LCDIF_DATA10 |

MUX_PAD_CTRL(LCD_PAD_CTRL),

board/armadeus/opos6uldev/board.c +0 -1
-	MX6_PAD_LCD_DATA11__LCDIF_DATA11 |

MUX_PAD_CTRL(LCD_PAD_CTRL),

board/armadeus/opos6uldev/board.c +0 -1
-	MX6_PAD_LCD_DATA12__LCDIF_DATA12 |

MUX_PAD_CTRL(LCD_PAD_CTRL),

board/armadeus/opos6uldev/board.c +0 -1
-	MX6_PAD_LCD_DATA13__LCDIF_DATA13 |

MUX_PAD_CTRL(LCD_PAD_CTRL),

board/armadeus/opos6uldev/board.c +0 -1
-	MX6_PAD_LCD_DATA14__LCDIF_DATA14 |

MUX_PAD_CTRL(LCD_PAD_CTRL),

board/armadeus/opos6uldev/board.c +0 -1
-	MX6_PAD_LCD_DATA15__LCDIF_DATA15 |

MUX_PAD_CTRL(LCD_PAD_CTRL),

board/armadeus/opos6uldev/board.c +0 -1
-	MX6_PAD_LCD_DATA16__LCDIF_DATA16 |

MUX_PAD_CTRL(LCD_PAD_CTRL),

board/armadeus/opos6uldev/board.c +0 -1
-	MX6_PAD_LCD_DATA17__LCDIF_DATA17 |

MUX_PAD_CTRL(LCD_PAD_CTRL),

board/armadeus/opos6uldev/board.c +0 -6
-
-	MX6_PAD_NAND_ALE__GPIO4_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL)
-};
-
 int setup_lcd(void)
 {
 	struct gpio_desc backlight;
 	int ret;
 
-	imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
-
 	/* Set Brightness to high */
 	ret = dm_gpio_lookup_name("GPIO4_10", &backlight);
 	if (ret) {
configs/opos6uldev_defconfig +2 -1
index 44236e99bc..352d10a0d8 100644
@@ -95,6 +95,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_VIDEO=y
+CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 # CONFIG_EFI_LOADER is not set
include/configs/opos6uldev.h index renamed from include/configs/opos6uldev.h +0 -0

b10071eaaf..11face21a1 100644

include/configs/opos6uldev.h +4 -1
@@ -43,7 +43,7 @@
 
 /* LCD */
 #ifndef CONFIG_SPL_BUILD
-#ifdef CONFIG_VIDEO
+#ifdef CONFIG_DM_VIDEO
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
@@ -51,6 +51,8 @@
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_BMP_16BPP
+#define CONFIG_BMP_24BPP
+#define CONFIG_BMP_32BPP
 #define CONFIG_VIDEO_MXS
 #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR  #endif @@ -87,6
+89,8 @@
 	"mmcroot=/dev/mmcblk0p2 ro\0"

\
"mmcrootfstype=ext4 rootwait\0"
\
"kernelimg=" __stringify(CONFIG_BOARD_NAME)
"-linux.bin\0" \

include/configs/opos6uldev.h +2 -0
+	"splashpos=0,0\0"									\
+	"splashimage="		__stringify(CONFIG_LOADADDR) 		"\0"
	\

	"videomode=video=ctfb:x:800,y:480,depth:18,pclk:33033,le:96,ri:96,up:2
Quoted 6 lines

0,lo:21,hs:64,vs:4,sync:0,vmode:0\0" \
"check_env=if test -n ${flash_env_version}; "
\
"then env default env_version; "
\
--

Quoted 1 line

2.21.0

#3 lore raw

PATCH 3/3 video: mxsfb: set gd->fb_base

In reply to Sébastien Szymanski

Set gd->fb_base so it can be shown with bdinfo command.

---
 drivers/video/mxsfb.c | 1 +
 1 file changed, 1 insertion(+)
drivers/video/mxsfb.c +1 -0
index 6922a130c6..ce67f3f32b 100644
@@ -367,6 +367,7 @@ static int mxs_video_probe(struct udevice *dev)
 	mmu_set_region_dcache_behaviour(fb_start, fb_end - fb_start,
 					DCACHE_WRITEBACK);
 	video_set_flush_dcache(dev, true);
+	gd->fb_base = fb_start;
 
 	return ret;
 }
Signature · 1 line
2.21.0
#4 lore raw

PATCH 3/3 video: mxsfb: set gd->fb_base

Quoted 14 lines

Subject: [PATCH 3/3] video: mxsfb: set gd->fb_base

Set gd->fb_base so it can be shown with bdinfo command.

---
 drivers/video/mxsfb.c | 1 +
 1 file changed, 1 insertion(+)
drivers/video/mxsfb.c index renamed from drivers/video/mxsfb.c +0 -0

6922a130c6..ce67f3f32b 100644

drivers/video/mxsfb.c static int mxs_video_probe(struct udevice *dev) · line 370

Quoted 4 lines
drivers/video/mxsfb.c +1 -0
@@ -367,6 +367,7 @@ static int mxs_video_probe(struct udevice *dev)
 	mmu_set_region_dcache_behaviour(fb_start, fb_end - fb_start,
 					DCACHE_WRITEBACK);
 	video_set_flush_dcache(dev, true);
+	gd->fb_base = fb_start;

Should this be gd->fb_base = plat->base?

Regards,
Peng.

Quoted 5 lines
drivers/video/mxsfb.c +0 -1
 	return ret;
 }
--

2.21.0

#5 lore raw

PATCH 3/3 video: mxsfb: set gd->fb_base

On Wed, 9 Oct 2019 06:30:36 +0000
Peng Fan peng.fan at nxp.com wrote:
...

Quoted 3 lines

drivers/video/mxsfb.c static int mxs_video_probe(struct udevice *dev) · line 370

Quoted 1 line
drivers/video/mxsfb.c +1 -0
+	gd->fb_base = fb_start;  

Should this be gd->fb_base = plat->base?

yes, please use plat->base here.

--
Anatolij

#6 lore raw

PATCH 1/3 imx6ul: opos6ul: migrate to DM_ETH

In reply to Sébastien Szymanski
Quoted 163 lines

Subject: [PATCH 1/3] imx6ul: opos6ul: migrate to DM_ETH

Migrate to DM_ETH and remove code that is no longer necessary.

---
 arch/arm/mach-imx/mx6/opos6ul.c | 76 +++------------------------------
 configs/opos6uldev_defconfig    |  2 +
 include/configs/opos6uldev.h    |  8 ----
 3 files changed, 8 insertions(+), 78 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-imx/mx6/opos6ul.c index c5fafb9f8e..50aec5171c 100644

arch/arm/mach-imx/mx6/opos6ul.c +0 -4
@@ -6,11 +6,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
-#include <asm/arch/iomux.h>
-#include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/gpio.h>
-#include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <common.h>
 #include <env.h>
@@ -20,43 +16,6 @@ DECLARE_GLOBAL_DATA_PTR;  #ifdef

CONFIG_FEC_MXC #include <miiphy.h>

arch/arm/mach-imx/mx6/opos6ul.c +0 -12
-#define MDIO_PAD_CTRL ( \
-	PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
-	PAD_CTL_DSE_40ohm \
-)
-
-#define ENET_PAD_CTRL_PU ( \
-	PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
-	PAD_CTL_DSE_40ohm \
-)
-
-#define ENET_PAD_CTRL_PD ( \
-	PAD_CTL_HYS | PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED |

\

arch/arm/mach-imx/mx6/opos6ul.c +0 -10
-	PAD_CTL_DSE_40ohm \
-)
-
-#define ENET_CLK_PAD_CTRL ( \
-	PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_LOW | \
-	PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST \
-)
-
-static iomux_v3_cfg_t const fec1_pads[] = {
-	MX6_PAD_GPIO1_IO06__ENET1_MDIO        |

MUX_PAD_CTRL(MDIO_PAD_CTRL),

arch/arm/mach-imx/mx6/opos6ul.c +0 -1
-	MX6_PAD_GPIO1_IO07__ENET1_MDC         |

MUX_PAD_CTRL(MDIO_PAD_CTRL),

arch/arm/mach-imx/mx6/opos6ul.c +0 -1
-	MX6_PAD_ENET1_RX_ER__ENET1_RX_ER      |

MUX_PAD_CTRL(ENET_PAD_CTRL_PD),

arch/arm/mach-imx/mx6/opos6ul.c +0 -1
-	MX6_PAD_ENET1_RX_EN__ENET1_RX_EN      |

MUX_PAD_CTRL(ENET_PAD_CTRL_PD),

arch/arm/mach-imx/mx6/opos6ul.c +0 -1
-	MX6_PAD_ENET1_RX_DATA1__ENET1_RDATA01 |

MUX_PAD_CTRL(ENET_PAD_CTRL_PD),

arch/arm/mach-imx/mx6/opos6ul.c +0 -1
-	MX6_PAD_ENET1_RX_DATA0__ENET1_RDATA00 |

MUX_PAD_CTRL(ENET_PAD_CTRL_PD),

arch/arm/mach-imx/mx6/opos6ul.c +0 -1
-	MX6_PAD_ENET1_TX_DATA0__ENET1_TDATA00 |

MUX_PAD_CTRL(ENET_PAD_CTRL_PU),

arch/arm/mach-imx/mx6/opos6ul.c +0 -1
-	MX6_PAD_ENET1_TX_DATA1__ENET1_TDATA01 |

MUX_PAD_CTRL(ENET_PAD_CTRL_PU),

arch/arm/mach-imx/mx6/opos6ul.c +0 -1
-	MX6_PAD_ENET1_TX_EN__ENET1_TX_EN      |

MUX_PAD_CTRL(ENET_PAD_CTRL_PU),

arch/arm/mach-imx/mx6/opos6ul.c +0 -2
-	/* PHY Int */
-	MX6_PAD_NAND_DQS__GPIO4_IO16          |

MUX_PAD_CTRL(ENET_PAD_CTRL_PU),

arch/arm/mach-imx/mx6/opos6ul.c +0 -2
-	/* PHY Reset */
-	MX6_PAD_NAND_DATA00__GPIO4_IO02       |

MUX_PAD_CTRL(ENET_PAD_CTRL_PD),

arch/arm/mach-imx/mx6/opos6ul.c +0 -1
-	MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1  |

MUX_PAD_CTRL(ENET_CLK_PAD_CTRL),

arch/arm/mach-imx/mx6/opos6ul.c +2 -3
-};
-
 int board_phy_config(struct phy_device *phydev)  {
 	phy_write(phydev, MDIO_DEVAD_NONE, 0x1f, 0x8190); @@ -67,43
+26,16 @@ int board_phy_config(struct phy_device *phydev)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
+static int setup_fec(void)
 {
 	struct iomuxc *const iomuxc_regs = (struct iomuxc

*)IOMUXC_BASE_ADDR;

arch/arm/mach-imx/mx6/opos6ul.c +0 -9
-	struct gpio_desc rst;
-	int ret;
 
 	/* Use 50M anatop loopback REF_CLK1 for ENET1,
 	 * clear gpr1[13], set gpr1[17] */
 	clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC1_MASK,
 			IOMUX_GPR1_FEC1_CLOCK_MUX1_SEL_MASK);
 
-	ret = enable_fec_anatop_clock(0, ENET_50MHZ);
-	if (ret)
-		return ret;
-
-	enable_enet_clk(1);
-
-	imx_iomux_v3_setup_multiple_pads(fec1_pads,

ARRAY_SIZE(fec1_pads));

arch/arm/mach-imx/mx6/opos6ul.c +5 -19
-
-	ret = dm_gpio_lookup_name("GPIO4_2", &rst);
-	if (ret) {
-		printf("Cannot get GPIO4_2\n");
-		return ret;
-	}
-
-	ret = dm_gpio_request(&rst, "phy-rst");
-	if (ret) {
-		printf("Cannot request GPIO4_2\n");
-		return ret;
-	}
-
-	dm_gpio_set_dir_flags(&rst, GPIOD_IS_OUT);
-	dm_gpio_set_value(&rst, 0);
-	udelay(1000);
-	dm_gpio_set_value(&rst, 1);
-
-	return fecmxc_initialize(bis);
+	return enable_fec_anatop_clock(0, ENET_50MHZ);
 }
 #endif /* CONFIG_FEC_MXC */
@@ -112,6 +44,10 @@ int board_init(void)
 	/* Address of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
+#ifdef CONFIG_FEC_MXC
+	setup_fec();
+#endif
+
 	return 0;
 }
 
configs/opos6uldev_defconfig +2 -0
index 5eef6527cd..44236e99bc 100644
@@ -73,6 +73,8 @@ CONFIG_FSL_USDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ8XXX=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
include/configs/opos6uldev.h index renamed from include/configs/opos6uldev.h +0 -0

b13e476027..b10071eaaf 100644

include/configs/opos6uldev.h +0 -1
@@ -41,14 +41,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
 #endif
 
-/* Ethernet */

include/configs/opos6uldev.h line 46

Quoted 10 lines
include/configs/opos6uldev.h +0 -7
-#ifdef CONFIG_FEC_MXC
-#define IMX_FEC_BASE			ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR          0x1
-#define CONFIG_FEC_XCV_TYPE             RMII
-#define CONFIG_ETHPRIME			"FEC"
-#endif
-
 /* LCD */
 #ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_VIDEO
Quoted 2 lines

--
2.21.0