board: atmel: Convert to support video driver model

PATCH New Wenyou Yang 2 participants 7 messages Sep 18, 2017 – Sep 29, 2017

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/Microchip (AT91) SoC support

lore

Share & tools

lore

Wenyou Yang

author

2017-09-18 07:25 UTC #0 lore raw

v3 cover board: atmel: Convert to support video driver model

Convert the boards to support the driver model of LCD/video via enabling CONFIG_DM_VIDEO, remove CONFIG_LCD and the unnecessary code.

Changes in v3:
- Collect the Reviewed-by tags.

Changes in v2:
- Rebase the u-boot/master (5541543f686).
- Drop the applied patches.
- Improve the commit log.

Wenyou Yang (5):
board: sama5d2_xplained: Convert to CONFIG_DM_VIDEO
board: sama5d3xek: Convert to CONFIG_DM_VIDEO
board: sama5d4ek: Convert to CONFIG_DM_VIDEO
board: sama5d4_xplained: Convert to CONFIG_DM_VIDEO
board: at91sam9x5ek: Convert to CONFIG_DM_VIDEO

 arch/arm/dts/at91-sama5d2_xplained.dts          |  60 +++++++++++++
 arch/arm/dts/at91-sama5d4_xplained.dts          |  25 ++++++
 arch/arm/dts/at91-sama5d4ek.dts                 |  26 ++++++
 arch/arm/dts/sama5d2.dtsi                       |   7 ++
 arch/arm/dts/sama5d36ek_cmp.dts                 |   1 +
 arch/arm/dts/sama5d3_lcd.dtsi                   |  21 +----
 arch/arm/dts/sama5d3xdm.dtsi                    |  26 ++++++
 arch/arm/dts/sama5d4.dtsi                       |  21 +----
 arch/arm/mach-at91/Kconfig                      |   4 +
 board/atmel/at91sam9x5ek/at91sam9x5ek.c         | 111 ++----------------------
 board/atmel/common/video_display.c              |   2 +-
 board/atmel/sama5d2_xplained/sama5d2_xplained.c |  95 ++------------------
 board/atmel/sama5d3xek/sama5d3xek.c             |  83 +-----------------
 board/atmel/sama5d4_xplained/sama5d4_xplained.c | 102 ++--------------------
 board/atmel/sama5d4ek/sama5d4ek.c               |  97 ++-------------------
 configs/at91sam9x5ek_dataflash_defconfig        |   3 +-
 configs/at91sam9x5ek_mmc_defconfig              |   3 +-
 configs/at91sam9x5ek_nandflash_defconfig        |   3 +-
 configs/at91sam9x5ek_spiflash_defconfig         |   3 +-
 configs/sama5d2_xplained_mmc_defconfig          |   2 +
 configs/sama5d2_xplained_spiflash_defconfig     |   2 +
 configs/sama5d36ek_cmp_mmc_defconfig            |   3 +-
 configs/sama5d36ek_cmp_nandflash_defconfig      |   3 +-
 configs/sama5d36ek_cmp_spiflash_defconfig       |   3 +-
 configs/sama5d3xek_mmc_defconfig                |   3 +-
 configs/sama5d3xek_nandflash_defconfig          |   3 +-
 configs/sama5d3xek_spiflash_defconfig           |   3 +-
 configs/sama5d4_xplained_mmc_defconfig          |   2 +
 configs/sama5d4_xplained_nandflash_defconfig    |   2 +
 configs/sama5d4_xplained_spiflash_defconfig     |   2 +
 configs/sama5d4ek_mmc_defconfig                 |   3 +-
 configs/sama5d4ek_nandflash_defconfig           |   3 +-
 configs/sama5d4ek_spiflash_defconfig            |   3 +-
 include/configs/at91sam9x5ek.h                  |  10 ---
 include/configs/sama5d2_xplained.h              |  12 ---
 include/configs/sama5d3xek.h                    |   9 --
 include/configs/sama5d4_xplained.h              |  11 ---
 include/configs/sama5d4ek.h                     |   9 --
 38 files changed, 217 insertions(+), 564 deletions(-)

Signature · 1 line

2.13.0

Wenyou Yang

author

2017-09-18 07:25 UTC #1 lore raw

PATCH v3 1/5 board: sama5d2_xplained: Convert to CONFIG_DM_VIDEO

Convert the board to support the video driver model, add the device tree node, and remove the unnecessary code.

Signed-off-by Wenyou Yang <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v3: None
Changes in v2: None

 arch/arm/dts/at91-sama5d2_xplained.dts          | 60 ++++++++++++++++
 arch/arm/dts/sama5d2.dtsi                       |  7 ++
 arch/arm/mach-at91/Kconfig                      |  1 +
 board/atmel/sama5d2_xplained/sama5d2_xplained.c | 95 ++-----------------------
 configs/sama5d2_xplained_mmc_defconfig          |  2 +
 configs/sama5d2_xplained_spiflash_defconfig     |  2 +
 include/configs/sama5d2_xplained.h              | 12 ----
 7 files changed, 79 insertions(+), 100 deletions(-)

arch/arm/dts/at91-sama5d2_xplained.dts +60 -0

index b00aaa2c79..01326a1ee0 100644
@@ -41,6 +41,31 @@
 		};
 
 		apb {
+			hlcdc: hlcdc at f0000000 {
+				atmel,vl-bpix = <4>;
+				atmel,guard-time = <1>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb666>;
+				status = "okay";
+				u-boot,dm-pre-reloc;
+
+				display-timings {
+					u-boot,dm-pre-reloc;
+					480x272 {
+						clock-frequency = <9000000>;
+						hactive = <480>;
+						vactive = <272>;
+						hsync-len = <41>;
+						hfront-porch = <2>;
+						hback-porch = <2>;
+						vfront-porch = <2>;
+						vback-porch = <2>;
+						vsync-len = <11>;
+						u-boot,dm-pre-reloc;
+					};
+				};
+			};
+
 			qspi0: spi at f0020000 {
 				status = "okay";

@@ -117,6 +142,41 @@
 						bias-disable;
 					};
 
+					pinctrl_lcd_base: pinctrl_lcd_base {
+						pinmux = <PIN_PC30__LCDVSYNC>,
+							<PIN_PC31__LCDHSYNC>,
+							<PIN_PD1__LCDDEN>,
+							<PIN_PD0__LCDPCK>;
+						bias-disable;
+					};
+
+					pinctrl_lcd_pwm: pinctrl_lcd_pwm {
+						pinmux = <PIN_PC28__LCDPWM>;
+						bias-disable;
+					};
+
+					pinctrl_lcd_rgb666: pinctrl_lcd_rgb666 {
+						pinmux = <PIN_PC10__LCDDAT2>,
+							<PIN_PC11__LCDDAT3>,
+							<PIN_PC12__LCDDAT4>,
+							<PIN_PC13__LCDDAT5>,
+							<PIN_PC14__LCDDAT6>,
+							<PIN_PC15__LCDDAT7>,
+							<PIN_PC16__LCDDAT10>,
+							<PIN_PC17__LCDDAT11>,
+							<PIN_PC18__LCDDAT12>,
+							<PIN_PC19__LCDDAT13>,
+							<PIN_PC20__LCDDAT14>,
+							<PIN_PC21__LCDDAT15>,
+							<PIN_PC22__LCDDAT18>,
+							<PIN_PC23__LCDDAT19>,
+							<PIN_PC24__LCDDAT20>,
+							<PIN_PC25__LCDDAT21>,
+							<PIN_PC26__LCDDAT22>,
+							<PIN_PC27__LCDDAT23>;
+						bias-disable;
+					};
+
 					pinctrl_macb0_phy_irq: macb0_phy_irq {
 						pinmux = <PIN_PC9__GPIO>;
 						bias-disable;

arch/arm/dts/sama5d2.dtsi +7 -0

index b02a602378..7520446dc1 100644
@@ -69,6 +69,13 @@
 			#size-cells = <1>;
 			u-boot,dm-pre-reloc;
 
+			hlcdc: hlcdc at f0000000 {
+				compatible = "atmel,at91sam9x5-hlcdc";
+				reg = <0xf0000000 0x2000>;
+				clocks = <&lcdc_clk>;
+				status = "disabled";
+			};
+
 			pmc: pmc at f0014000 {
 				compatible = "atmel,sama5d2-pmc", "syscon";
 				reg = <0xf0014000 0x160>;

arch/arm/mach-at91/Kconfig +1 -0

index 0e71b69a19..abc79d9637 100644
@@ -153,6 +153,7 @@ config TARGET_SAMA5D2_XPLAINED
 	select SAMA5D2
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
+	select BOARD_LATE_INIT
 
 config TARGET_SAMA5D27_SOM1_EK
 	bool "SAMA5D27 SOM1 EK board"

board/atmel/sama5d2_xplained/sama5d2_xplained.c +7 ~~-88~~

116 lines not on this page · raw message

configs/sama5d2_xplained_mmc_defconfig +2 -0

index 215961a65c..87fc049b6d 100644
@@ -82,3 +82,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

configs/sama5d2_xplained_spiflash_defconfig +2 -0

index 869d405838..37572489e2 100644
@@ -79,3 +79,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

include/configs/sama5d2_xplained.h +0 ~~-12~~

index 4f24a56899..545ba1740d 100644
@@ -35,18 +35,6 @@
 #define CONFIG_SF_DEFAULT_SPEED		30000000
 #endif
 
-/* LCD */
-
-#ifdef CONFIG_LCD
-#define LCD_BPP				LCD_COLOR16
-#define LCD_OUTPUT_BPP                  24
-#define CONFIG_LCD_LOGO
-#define CONFIG_LCD_INFO
-#define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_ATMEL_HLCD
-#define CONFIG_ATMEL_LCD_RGB565
-#endif
-
 #ifdef CONFIG_SD_BOOT
 
 /* bootstrap + u-boot + env in sd card */

Signature · 1 line

2.13.0

Wenyou Yang

author

2017-09-18 07:25 UTC #2 lore raw

PATCH v3 2/5 board: sama5d3xek: Convert to CONFIG_DM_VIDEO

In reply to Wenyou Yang

From: Wenyou Yang <[email protected]>

Convert the board to support the video driver model, add the device tree node, and remove the unnecessary code.

Signed-off-by Wenyou Yang <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v3: None
Changes in v2: None

 arch/arm/dts/sama5d36ek_cmp.dts            |  1 +
 arch/arm/dts/sama5d3_lcd.dtsi              | 21 +-------
 arch/arm/dts/sama5d3xdm.dtsi               | 26 ++++++++++
 board/atmel/sama5d3xek/sama5d3xek.c        | 83 ++----------------------------
 configs/sama5d36ek_cmp_mmc_defconfig       |  3 +-
 configs/sama5d36ek_cmp_nandflash_defconfig |  3 +-
 configs/sama5d36ek_cmp_spiflash_defconfig  |  3 +-
 configs/sama5d3xek_mmc_defconfig           |  3 +-
 configs/sama5d3xek_nandflash_defconfig     |  3 +-
 configs/sama5d3xek_spiflash_defconfig      |  3 +-
 include/configs/sama5d3xek.h               |  9 ----
 11 files changed, 43 insertions(+), 115 deletions(-)

arch/arm/dts/sama5d36ek_cmp.dts +1 -0

index be41490f63..c17bc9f0dc 100644
@@ -8,6 +8,7 @@
 /dts-v1/;
 #include "sama5d36.dtsi"
 #include "sama5d3xmb_cmp.dtsi"
+#include "sama5d3xdm.dtsi"
 
 / {
 	model = "Atmel SAMA5D36-EK";

arch/arm/dts/sama5d3_lcd.dtsi +1 ~~-20~~

index 14d7c2bc75..10fb3a97ea 100644
@@ -14,31 +14,12 @@
 	ahb {
 		apb {
 			hlcdc: hlcdc at f0030000 {
-				compatible = "atmel,sama5d3-hlcdc";
+				compatible = "atmel,at91sam9x5-hlcdc";
 				reg = <0xf0030000 0x2000>;
 				interrupts = <36 IRQ_TYPE_LEVEL_HIGH 0>;
 				clocks = <&lcdc_clk>, <&lcdck>, <&clk32k>;
 				clock-names = "periph_clk","sys_clk", "slow_clk";
 				status = "disabled";
-
-				hlcdc-display-controller {
-					compatible = "atmel,hlcdc-display-controller";
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					port at 0 {
-						#address-cells = <1>;
-						#size-cells = <0>;
-						reg = <0>;
-					};
-				};
-
-				hlcdc_pwm: hlcdc-pwm {
-					compatible = "atmel,hlcdc-pwm";
-					pinctrl-names = "default";
-					pinctrl-0 = <&pinctrl_lcd_pwm>;
-					#pwm-cells = <3>;
-				};
 			};
 
 			pinctrl at fffff200 {

arch/arm/dts/sama5d3xdm.dtsi +26 -0

index 035ab72b39..b3df9af2b4 100644
@@ -10,6 +10,32 @@
 / {
 	ahb {
 		apb {
+			hlcdc: hlcdc at f0030000 {
+				atmel,vl-bpix = <4>;
+				atmel,output-mode = <24>;
+				atmel,guard-time = <1>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb888_alt>;
+				status = "okay";
+				u-boot,dm-pre-reloc;
+
+				display-timings {
+					u-boot,dm-pre-reloc;
+					800x480 {
+						clock-frequency = <24000000>;
+						hactive = <800>;
+						vactive = <480>;
+						hsync-len = <5>;
+						hfront-porch = <64>;
+						hback-porch = <64>;
+						vfront-porch = <22>;
+						vback-porch = <21>;
+						vsync-len = <5>;
+						u-boot,dm-pre-reloc;
+					};
+				};
+			};
+
 			i2c1: i2c at f0018000 {
 				qt1070: keyboard at 1b {
 					compatible = "qt1070";

board/atmel/sama5d3xek/sama5d3xek.c +3 ~~-80~~

108 lines not on this page · raw message

configs/sama5d36ek_cmp_mmc_defconfig +2 -1

index b6c60cbcae..7c27812c3f 100644
@@ -55,4 +55,5 @@ CONFIG_DM_SPI=y
 CONFIG_ATMEL_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
-CONFIG_LCD=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

configs/sama5d36ek_cmp_nandflash_defconfig +2 -1

index 01b57efe03..09508dafa4 100644
@@ -55,5 +55,6 @@ CONFIG_DM_SPI=y
 CONFIG_ATMEL_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
-CONFIG_LCD=y
 CONFIG_FAT_WRITE=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

configs/sama5d36ek_cmp_spiflash_defconfig +2 -1

index e29e3a8098..1c004ef2ac 100644
@@ -55,5 +55,6 @@ CONFIG_DM_SPI=y
 CONFIG_ATMEL_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
-CONFIG_LCD=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y
 CONFIG_FAT_WRITE=y

configs/sama5d3xek_mmc_defconfig +2 -1

index f45449fd93..8b4c37a125 100644
@@ -81,4 +81,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
-CONFIG_LCD=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

configs/sama5d3xek_nandflash_defconfig +2 -1

index 6217600f01..f9d4b8db3a 100644
@@ -76,5 +76,6 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
-CONFIG_LCD=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y
 CONFIG_FAT_WRITE=y

configs/sama5d3xek_spiflash_defconfig +2 -1

index 2fe08e4e59..7399b3e51f 100644
@@ -77,5 +77,6 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
-CONFIG_LCD=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y
 CONFIG_FAT_WRITE=y

include/configs/sama5d3xek.h +0 -9

index bd93a1e84c..9ec1e76052 100644
@@ -28,15 +28,6 @@
  */
 #define ATMEL_PMC_UHP			(1 <<  6)
 
-/* LCD */
-#define LCD_BPP				LCD_COLOR16
-#define LCD_OUTPUT_BPP                  24
-#define CONFIG_LCD_LOGO
-#define CONFIG_LCD_INFO
-#define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_ATMEL_HLCD
-#define CONFIG_ATMEL_LCD_RGB565
-
 /* board specific (not enough SRAM) */
 #define CONFIG_SAMA5D3_LCD_BASE		0x23E00000

Signature · 1 line

2.13.0

Wenyou Yang

author

2017-09-18 07:25 UTC #3 lore raw

PATCH v3 3/5 board: sama5d4ek: Convert to CONFIG_DM_VIDEO

In reply to Wenyou Yang

From: Wenyou Yang <[email protected]>

Convert the board to support the video driver model, add the device tree node, and remove the unnecessary code.

Signed-off-by Wenyou Yang <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v3: None
Changes in v2: None

 arch/arm/dts/at91-sama5d4ek.dts       | 26 ++++++++++
 arch/arm/mach-at91/Kconfig            |  1 +
 board/atmel/sama5d4ek/sama5d4ek.c     | 97 +++--------------------------------
 configs/sama5d4ek_mmc_defconfig       |  3 +-
 configs/sama5d4ek_nandflash_defconfig |  3 +-
 configs/sama5d4ek_spiflash_defconfig  |  3 +-
 include/configs/sama5d4ek.h           |  9 ----
 7 files changed, 39 insertions(+), 103 deletions(-)

arch/arm/dts/at91-sama5d4ek.dts +26 -0

index b965f5b39d..a5d75452cf 100644
@@ -75,6 +75,32 @@
 
 	ahb {
 		apb {
+			hlcdc: hlcdc at f0000000 {
+				atmel,vl-bpix = <4>;
+				atmel,output-mode = <18>;
+				atmel,guard-time = <1>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb666>;
+				status = "okay";
+				u-boot,dm-pre-reloc;
+
+				display-timings {
+					u-boot,dm-pre-reloc;
+					800x480 {
+						clock-frequency = <33260000>;
+						hactive = <800>;
+						vactive = <480>;
+						hsync-len = <5>;
+						hfront-porch = <128>;
+						hback-porch = <0>;
+						vfront-porch = <23>;
+						vback-porch = <22>;
+						vsync-len = <5>;
+						u-boot,dm-pre-reloc;
+					};
+				};
+			};
+
 			adc0: adc at fc034000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <

arch/arm/mach-at91/Kconfig +1 -0

index abc79d9637..b4967f9203 100644
@@ -192,6 +192,7 @@ config TARGET_SAMA5D4EK
 	select SAMA5D4
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
+	select BOARD_LATE_INIT
 
 config TARGET_MA5D4EVK
 	bool "Aries MA5D4EVK Evaluation Kit"

board/atmel/sama5d4ek/sama5d4ek.c +6 ~~-91~~

119 lines not on this page · raw message

configs/sama5d4ek_mmc_defconfig +2 -1

index aaa5855b22..7367b6cb7a 100644
@@ -78,4 +78,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
-CONFIG_LCD=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

configs/sama5d4ek_nandflash_defconfig +2 -1

index 901d17bfa3..94970c6e7f 100644
@@ -75,4 +75,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
-CONFIG_LCD=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

configs/sama5d4ek_spiflash_defconfig +2 -1

index 535031024b..160ed127bd 100644
@@ -74,4 +74,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
-CONFIG_LCD=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

include/configs/sama5d4ek.h +0 -9

index 94e8e893c0..a46e3508bf 100644
@@ -45,15 +45,6 @@
 #define CONFIG_ATMEL_NAND_HW_PMECC
 #endif
 
-/* LCD */
-#define LCD_BPP				LCD_COLOR16
-#define LCD_OUTPUT_BPP                  18
-#define CONFIG_LCD_LOGO
-#define CONFIG_LCD_INFO
-#define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_ATMEL_HLCD
-#define CONFIG_ATMEL_LCD_RGB565
-
 /* SPL */
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x200000

Signature · 1 line

2.13.0

Wenyou Yang

author

2017-09-18 07:26 UTC #4 lore raw

PATCH v3 4/5 board: sama5d4_xplained: Convert to CONFIG_DM_VIDEO

In reply to Wenyou Yang

From: Wenyou Yang <[email protected]>

Convert the board to support the video driver model, add the device tree node, and remove the unnecessary code.

Signed-off-by Wenyou Yang <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v3: None
Changes in v2: None

 arch/arm/dts/at91-sama5d4_xplained.dts          |  25 ++++++
 arch/arm/dts/sama5d4.dtsi                       |  21 +----
 arch/arm/mach-at91/Kconfig                      |   1 +
 board/atmel/common/video_display.c              |   2 +-
 board/atmel/sama5d4_xplained/sama5d4_xplained.c | 102 ++----------------------
 configs/sama5d4_xplained_mmc_defconfig          |   2 +
 configs/sama5d4_xplained_nandflash_defconfig    |   2 +
 configs/sama5d4_xplained_spiflash_defconfig     |   2 +
 include/configs/sama5d4_xplained.h              |  11 ---
 9 files changed, 40 insertions(+), 128 deletions(-)

arch/arm/dts/at91-sama5d4_xplained.dts +25 -0

index 0592b31b91..ea35dc21b6 100644
@@ -74,6 +74,31 @@
 
 	ahb {
 		apb {
+			hlcdc: hlcdc at f0000000 {
+				atmel,vl-bpix = <4>;
+				atmel,guard-time = <1>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb888>;
+				status = "okay";
+				u-boot,dm-pre-reloc;
+
+				display-timings {
+					u-boot,dm-pre-reloc;
+					480x272 {
+						clock-frequency = <9000000>;
+						hactive = <480>;
+						vactive = <272>;
+						hsync-len = <41>;
+						hfront-porch = <2>;
+						hback-porch = <2>;
+						vfront-porch = <2>;
+						vback-porch = <2>;
+						vsync-len = <11>;
+						u-boot,dm-pre-reloc;
+					};
+				};
+			};
+
 			spi0: spi at f8010000 {
 				u-boot,dm-pre-reloc;
 				cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;

arch/arm/dts/sama5d4.dtsi +1 ~~-20~~

index c6512ae437..8072b8a4f2 100644
@@ -320,31 +320,12 @@
 			u-boot,dm-pre-reloc;
 
 			hlcdc: hlcdc at f0000000 {
-				compatible = "atmel,sama5d4-hlcdc";
+				compatible = "atmel,at91sam9x5-hlcdc";
 				reg = <0xf0000000 0x4000>;
 				interrupts = <51 IRQ_TYPE_LEVEL_HIGH 0>;
 				clocks = <&lcdc_clk>, <&lcdck>, <&clk32k>;
 				clock-names = "periph_clk","sys_clk", "slow_clk";
 				status = "disabled";
-
-				hlcdc-display-controller {
-					compatible = "atmel,hlcdc-display-controller";
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					port at 0 {
-						#address-cells = <1>;
-						#size-cells = <0>;
-						reg = <0>;
-					};
-				};
-
-				hlcdc_pwm: hlcdc-pwm {
-					compatible = "atmel,hlcdc-pwm";
-					pinctrl-names = "default";
-					pinctrl-0 = <&pinctrl_lcd_pwm>;
-					#pwm-cells = <3>;
-				};
 			};
 
 			dma1: dma-controller at f0004000 {

arch/arm/mach-at91/Kconfig +1 -0

index b4967f9203..ebd865ab5b 100644
@@ -186,6 +186,7 @@ config TARGET_SAMA5D4_XPLAINED
 	select SAMA5D4
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
+	select BOARD_LATE_INIT
 
 config TARGET_SAMA5D4EK
 	bool "SAMA5D4 Evaluation Kit"

board/atmel/common/video_display.c +1 -1

index 39ad619819..b20abc7386 100644
@@ -43,7 +43,7 @@ int at91_video_show_board_info(void)
 	nand_size = 0;
 #ifdef CONFIG_NAND_ATMEL
 	for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
-		nand_size += nand_info[i]->size;
+		nand_size += get_nand_dev_by_index(i)->size;
 #endif
 
 	len += sprintf(&buf[len], "%ld MB SDRAM, %ld MB NAND\n",

board/atmel/sama5d4_xplained/sama5d4_xplained.c +6 ~~-96~~

124 lines not on this page · raw message

configs/sama5d4_xplained_mmc_defconfig +2 -0

index dabbf605c5..8ecba5b7d4 100644
@@ -78,3 +78,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

configs/sama5d4_xplained_nandflash_defconfig +2 -0

index 85157878cd..bd3131f4cc 100644
@@ -75,3 +75,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

configs/sama5d4_xplained_spiflash_defconfig +2 -0

index 4061720b3a..d37be67eb6 100644
@@ -77,3 +77,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

include/configs/sama5d4_xplained.h +0 ~~-11~~

index 5dc5e7dd0c..6aa4bcc5c5 100644
@@ -47,17 +47,6 @@
 #define CONFIG_ATMEL_NAND_HW_PMECC
 #endif
 
-/* LCD */
-#ifdef CONFIG_LCD
-#define LCD_BPP				LCD_COLOR16
-#define LCD_OUTPUT_BPP                  24
-#define CONFIG_LCD_LOGO
-#define CONFIG_LCD_INFO
-#define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_ATMEL_HLCD
-#define CONFIG_ATMEL_LCD_RGB565
-#endif
-
 /* SPL */
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x200000

Signature · 1 line

2.13.0

Wenyou Yang

author

2017-09-18 07:26 UTC #5 lore raw

PATCH v3 5/5 board: at91sam9x5ek: Convert to CONFIG_DM_VIDEO

In reply to Wenyou Yang

Convert the board to support the video driver model, add the device tree node, and remove the unnecessary code.

Signed-off-by Wenyou Yang <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v3:
- Collect the Reviewed-by tags.

Changes in v2:
- Rebase the u-boot/master (5541543f686).
- Drop the applied patches.
- Improve the commit log.

 arch/arm/mach-at91/Kconfig               |   1 +
 board/atmel/at91sam9x5ek/at91sam9x5ek.c  | 111 ++-----------------------------
 configs/at91sam9x5ek_dataflash_defconfig |   3 +-
 configs/at91sam9x5ek_mmc_defconfig       |   3 +-
 configs/at91sam9x5ek_nandflash_defconfig |   3 +-
 configs/at91sam9x5ek_spiflash_defconfig  |   3 +-
 include/configs/at91sam9x5ek.h           |  10 ---
 7 files changed, 16 insertions(+), 118 deletions(-)

arch/arm/mach-at91/Kconfig +1 -0

index ebd865ab5b..7e85b69679 100644
@@ -141,6 +141,7 @@ config TARGET_AT91SAM9X5EK
 	select AT91SAM9X5
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
+	select BOARD_LATE_INIT
 
 config TARGET_SAMA5D2_PTC
 	bool "SAMA5D2 PTC board"

board/atmel/at91sam9x5ek/at91sam9x5ek.c +7 ~~-104~~

131 lines not on this page · raw message

configs/at91sam9x5ek_dataflash_defconfig +2 -1

index 9d61dd8de0..c417eb8c10 100644
@@ -60,4 +60,5 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_LCD=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

configs/at91sam9x5ek_mmc_defconfig +2 -1

index 9fa4801480..e0a24a5b48 100644
@@ -60,4 +60,5 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_LCD=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

configs/at91sam9x5ek_nandflash_defconfig +2 -1

index b28bec7f0b..0e8c07f609 100644
@@ -60,4 +60,5 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_LCD=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

configs/at91sam9x5ek_spiflash_defconfig +2 -1

index 838d8a0ad7..70e96ecc2f 100644
@@ -60,4 +60,5 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_LCD=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y

include/configs/at91sam9x5ek.h +0 ~~-10~~

index 1d4971c59f..9450784521 100644
@@ -23,16 +23,6 @@
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY		/* required until (g)pio is fixed */
 
-/* LCD */
-#define LCD_BPP			LCD_COLOR16
-#define LCD_OUTPUT_BPP		24
-#define CONFIG_LCD_LOGO
-#define CONFIG_LCD_INFO
-#define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_ATMEL_HLCD
-#define CONFIG_ATMEL_LCD_RGB565
-
-
 /*
  * BOOTP options
  */

Signature · 1 line

2.13.0

Anatolij Gustschin

2017-09-29 16:13 UTC #6 lore raw

v3 cover board: atmel: Convert to support video driver model

In reply to Wenyou Yang

Quoted 5 lines · On Mon, 18 Sep 2017 15:25:56 +0800 Wenyou Yang wenyou.yang at microchip.com…

Convert the boards to support the driver model of LCD/video via enabling CONFIG_DM_VIDEO, remove CONFIG_LCD and the unnecessary code.
Changes in v3:
- Collect the Reviewed-by tags.

Note that resubmitting with collected Reviewed-by tags is not necessary, patchwork collects them automatically.

Series applied to u-boot-video/master, thanks!

--
Anatolij