diff options
author | Tom Rini <trini@konsulko.com> | 2019-10-14 07:30:16 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-10-14 07:30:16 -0400 |
commit | cd5ffc5de5a26f5b785e25654977fee25779b3e4 (patch) | |
tree | 7b63fdbb8683a9c3258f1901573c4633deec98c7 /arch | |
parent | fae79480111be47944cf66a9c052ff3934a09ce5 (diff) | |
parent | d68ed0fad6bb880bd2bbcc1d86cfc9ba971f856f (diff) | |
download | u-boot-cd5ffc5de5a26f5b785e25654977fee25779b3e4.tar.gz |
Merge tag 'video-for-2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot-video
- panel bridge support in stm32 ltdc
- DSI host uclass
- sandbox DSI host uclass test driver and DSI host test
- MIPI DSI helpers
- Synopsys Designware MIPI DSI host bridge driver
- STM32 DSI controller driver
- OTM800A and RM68200 panel support
- DSI host updates for stm32f769 and stm32mp1 dtsi files
- splash screen for stm32f769 and stm32mp1 boards
- stm32 defconfig updates for display support
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/dts/stm32f769-disco-u-boot.dtsi | 62 | ||||
-rw-r--r-- | arch/arm/dts/stm32mp157c-dk2-u-boot.dtsi | 7 | ||||
-rw-r--r-- | arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 5 | ||||
-rw-r--r-- | arch/sandbox/dts/sandbox.dts | 6 | ||||
-rw-r--r-- | arch/sandbox/dts/test.dts | 4 |
5 files changed, 83 insertions, 1 deletions
diff --git a/arch/arm/dts/stm32f769-disco-u-boot.dtsi b/arch/arm/dts/stm32f769-disco-u-boot.dtsi index 209a82c9cf..c1d7d6b8f5 100644 --- a/arch/arm/dts/stm32f769-disco-u-boot.dtsi +++ b/arch/arm/dts/stm32f769-disco-u-boot.dtsi @@ -28,10 +28,72 @@ button-gpio = <&gpioa 0 0>; }; + dsi_host: dsi_host { + compatible = "synopsys,dw-mipi-dsi"; + status = "okay"; + }; + led1 { compatible = "st,led1"; led-gpio = <&gpioj 5 0>; }; + + panel: panel { + compatible = "orisetech,otm8009a"; + reset-gpios = <&gpioj 15 1>; + status = "okay"; + + port { + panel_in: endpoint { + remote-endpoint = <&dsi_out>; + }; + }; + }; + + soc { + dsi: dsi@40016c00 { + compatible = "st,stm32-dsi"; + reg = <0x40016C00 0x800>; + resets = <&rcc STM32F7_APB2_RESET(DSI)>; + clocks = <&rcc 0 STM32F7_APB2_CLOCK(DSI)>, + <&rcc 0 STM32F7_APB2_CLOCK(LTDC)>, + <&clk_hse>; + clock-names = "pclk", "px_clk", "ref"; + u-boot,dm-pre-reloc; + status = "okay"; + + ports { + port@0 { + dsi_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + port@1 { + dsi_in: endpoint { + remote-endpoint = <&dp_out>; + }; + }; + }; + }; + + ltdc: display-controller@40016800 { + compatible = "st,stm32-ltdc"; + reg = <0x40016800 0x200>; + resets = <&rcc STM32F7_APB2_RESET(LTDC)>; + clocks = <&rcc 0 STM32F7_APB2_CLOCK(LTDC)>; + + status = "okay"; + u-boot,dm-pre-reloc; + + ports { + port@0 { + dp_out: endpoint { + remote-endpoint = <&dsi_in>; + }; + }; + }; + }; + }; }; &fmc { diff --git a/arch/arm/dts/stm32mp157c-dk2-u-boot.dtsi b/arch/arm/dts/stm32mp157c-dk2-u-boot.dtsi index 18ac1e3cb2..cd9947f166 100644 --- a/arch/arm/dts/stm32mp157c-dk2-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157c-dk2-u-boot.dtsi @@ -5,6 +5,13 @@ #include "stm32mp157a-dk1-u-boot.dtsi" +/ { + dsi_host: dsi_host { + compatible = "synopsys,dw-mipi-dsi"; + status = "okay"; + }; +}; + &i2c1 { hdmi-transmitter@39 { reset-gpios = <&gpioa 10 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi index ec60486f41..af5945d20b 100644 --- a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi @@ -14,6 +14,11 @@ spi0 = &qspi; usb0 = &usbotg_hs; }; + + dsi_host: dsi_host { + compatible = "synopsys,dw-mipi-dsi"; + status = "okay"; + }; }; &flash0 { diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts index 16a33db87d..f1637c80f6 100644 --- a/arch/sandbox/dts/sandbox.dts +++ b/arch/sandbox/dts/sandbox.dts @@ -25,6 +25,11 @@ compatible = "google,cros-ec-sandbox"; }; + dsi_host: dsi_host { + compatible = "sandbox,dsi-host"; + status = "okay"; + }; + ethrawbus { compatible = "sandbox,eth-raw-bus"; skip-localhost = <0>; @@ -63,7 +68,6 @@ compatible = "sandbox,spi"; cs-gpios = <0>, <&gpio_a 0>; }; - }; #include "sandbox.dtsi" diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 25cac056bb..5d9ab3724f 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -76,6 +76,10 @@ }; }; + dsi_host: dsi_host { + compatible = "sandbox,dsi-host"; + }; + a-test { reg = <0 1>; compatible = "denx,u-boot-fdt-test"; |