Message ID | 20231207141723.108004-11-dario.binacchi@amarulasolutions.com |
---|---|
State | New |
Headers | show |
Series | Add displays support for bsh-smm-s2/pro boards | expand |
On Thu, Dec 07, 2023 at 03:16:39PM +0100, Dario Binacchi wrote: > From: Michael Trimarchi <michael@amarulasolutions.com> > > Add the display and nodes required for its operation. > > Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > > --- > > (no changes since v3) > > Changes in v3: > - Replace "synaptics,r63353" compatible with "syna,r63353", as > required by vendor-prefixes.yaml. > - Squash patch [09/11] dt-bindings: ili9805: add compatible string for Tianma TM041XDHG01 > into [07/11] dt-bindings: display: panel: Add Ilitek ili9805 panel controller. > > Changes in v2: > - Adjust the mipi_dsi node based on the latest patches merged into > the mainline in the dtsi files it includes. > - Added to the series the following patches: > - 0001 drm/bridge: Fix bridge disable logic > - 0002 drm/bridge: Fix a use case in the bridge disable logic > - 0003 samsung-dsim: enter display mode in the enable() callback > - 0004 drm: bridge: samsung-dsim: complete the CLKLANE_STOP setting > > .../freescale/imx8mn-bsh-smm-s2-common.dtsi | 1 + > .../freescale/imx8mn-bsh-smm-s2-display.dtsi | 121 ++++++++++++++++++ > 2 files changed, 122 insertions(+) > create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-display.dtsi > > diff --git a/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-common.dtsi b/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-common.dtsi > index 22a754d438f1..bbb07c650da9 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-common.dtsi > +++ b/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-common.dtsi > @@ -7,6 +7,7 @@ > /dts-v1/; > > #include "imx8mn.dtsi" > +#include "imx8mn-bsh-smm-s2-display.dtsi" > > / { > chosen { > diff --git a/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-display.dtsi b/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-display.dtsi > new file mode 100644 > index 000000000000..f0a924cbe548 > --- /dev/null > +++ b/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-display.dtsi > @@ -0,0 +1,121 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright 2021 BSH > + */ > + > +/ { > + backlight: backlight { > + compatible = "pwm-backlight"; > + pwms = <&pwm1 0 700000 0>; /* 700000 ns = 1337Hz */ > + brightness-levels = <0 100>; > + num-interpolated-steps = <100>; > + default-brightness-level = <50>; > + status = "okay"; > + }; > + > + reg_3v3_dvdd: regulator-3v3-O3 { > + compatible = "regulator-fixed"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_dvdd>; > + regulator-name = "3v3-dvdd-supply"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + gpio = <&gpio1 7 GPIO_ACTIVE_LOW>; > + }; > + > + reg_v3v3_avdd: regulator-3v3-O2 { > + compatible = "regulator-fixed"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_avdd>; > + regulator-name = "3v3-avdd-supply"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + gpio = <&gpio1 5 GPIO_ACTIVE_LOW>; > + }; > +}; > + > +&pwm1 { > + status = "okay"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_bl>; We usually end property list with 'status'. > +}; > + > +&lcdif { > + status = "okay"; Ditto > + assigned-clocks = <&clk IMX8MN_VIDEO_PLL1>; > + assigned-clock-rates = <594000000>; > +}; > + > +&pgc_dispmix { > + assigned-clocks = <&clk IMX8MN_CLK_DISP_AXI>, <&clk IMX8MN_CLK_DISP_APB>; > + assigned-clock-parents = <&clk IMX8MN_SYS_PLL2_1000M>, <&clk IMX8MN_SYS_PLL1_800M>; > + assigned-clock-rates = <500000000>, <200000000>; > +}; > + > +&mipi_dsi { > + #address-cells = <1>; > + #size-cells = <0>; > + status = "okay"; Ditto > + samsung,esc-clock-frequency = <20000000>; > + samsung,pll-clock-frequency = <12000000>; > + > + panel@0 { > + compatible = "sharp,ls068b3sx02", "syna,r63353"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_panel>; > + reg = <0>; > + > + backlight = <&backlight>; > + dvdd-supply = <®_3v3_dvdd>; > + avdd-supply = <®_v3v3_avdd>; > + reset-gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>; > + > + port { > + panel_in: endpoint { > + remote-endpoint = <&mipi_dsi_out>; > + }; > + }; > + > + }; > + > + ports { > + port@1 { > + reg = <1>; Have a newline between properties and child node. > + mipi_dsi_out: endpoint { > + remote-endpoint = <&panel_in>; > + }; > + }; > + }; > +}; > + > +&gpu { > + status = "okay"; > +}; > + > +&iomuxc { > + > + /* This is for both PWM and voltage regulators for display */ > + pinctrl_bl: pwm1grp { > + fsl,pins = < > + MX8MN_IOMUXC_GPIO1_IO01_PWM1_OUT 0x16 > + >; > + }; > + > + pinctrl_panel: panelgrp { > + fsl,pins = < > + MX8MN_IOMUXC_SAI3_RXC_GPIO4_IO29 0x16 /* panel reset */ > + >; > + }; > + > + pinctrl_dvdd: dvddgrp { > + fsl,pins = < > + MX8MN_IOMUXC_GPIO1_IO07_GPIO1_IO7 0x16 /* VDD 3V3_VO3 */ > + >; > + }; > + > + pinctrl_avdd: avddgrp { Can we sort the pinctrl node alphabetically? Shawn > + fsl,pins = < > + MX8MN_IOMUXC_GPIO1_IO05_GPIO1_IO5 0x16 /* VDD 3V3_VO2 */ > + >; > + }; > +}; > -- > 2.43.0 >
diff --git a/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-common.dtsi b/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-common.dtsi index 22a754d438f1..bbb07c650da9 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-common.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-common.dtsi @@ -7,6 +7,7 @@ /dts-v1/; #include "imx8mn.dtsi" +#include "imx8mn-bsh-smm-s2-display.dtsi" / { chosen { diff --git a/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-display.dtsi b/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-display.dtsi new file mode 100644 index 000000000000..f0a924cbe548 --- /dev/null +++ b/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-display.dtsi @@ -0,0 +1,121 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright 2021 BSH + */ + +/ { + backlight: backlight { + compatible = "pwm-backlight"; + pwms = <&pwm1 0 700000 0>; /* 700000 ns = 1337Hz */ + brightness-levels = <0 100>; + num-interpolated-steps = <100>; + default-brightness-level = <50>; + status = "okay"; + }; + + reg_3v3_dvdd: regulator-3v3-O3 { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_dvdd>; + regulator-name = "3v3-dvdd-supply"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio1 7 GPIO_ACTIVE_LOW>; + }; + + reg_v3v3_avdd: regulator-3v3-O2 { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_avdd>; + regulator-name = "3v3-avdd-supply"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio1 5 GPIO_ACTIVE_LOW>; + }; +}; + +&pwm1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_bl>; +}; + +&lcdif { + status = "okay"; + assigned-clocks = <&clk IMX8MN_VIDEO_PLL1>; + assigned-clock-rates = <594000000>; +}; + +&pgc_dispmix { + assigned-clocks = <&clk IMX8MN_CLK_DISP_AXI>, <&clk IMX8MN_CLK_DISP_APB>; + assigned-clock-parents = <&clk IMX8MN_SYS_PLL2_1000M>, <&clk IMX8MN_SYS_PLL1_800M>; + assigned-clock-rates = <500000000>, <200000000>; +}; + +&mipi_dsi { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + samsung,esc-clock-frequency = <20000000>; + samsung,pll-clock-frequency = <12000000>; + + panel@0 { + compatible = "sharp,ls068b3sx02", "syna,r63353"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_panel>; + reg = <0>; + + backlight = <&backlight>; + dvdd-supply = <®_3v3_dvdd>; + avdd-supply = <®_v3v3_avdd>; + reset-gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>; + + port { + panel_in: endpoint { + remote-endpoint = <&mipi_dsi_out>; + }; + }; + + }; + + ports { + port@1 { + reg = <1>; + mipi_dsi_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; +}; + +&gpu { + status = "okay"; +}; + +&iomuxc { + + /* This is for both PWM and voltage regulators for display */ + pinctrl_bl: pwm1grp { + fsl,pins = < + MX8MN_IOMUXC_GPIO1_IO01_PWM1_OUT 0x16 + >; + }; + + pinctrl_panel: panelgrp { + fsl,pins = < + MX8MN_IOMUXC_SAI3_RXC_GPIO4_IO29 0x16 /* panel reset */ + >; + }; + + pinctrl_dvdd: dvddgrp { + fsl,pins = < + MX8MN_IOMUXC_GPIO1_IO07_GPIO1_IO7 0x16 /* VDD 3V3_VO3 */ + >; + }; + + pinctrl_avdd: avddgrp { + fsl,pins = < + MX8MN_IOMUXC_GPIO1_IO05_GPIO1_IO5 0x16 /* VDD 3V3_VO2 */ + >; + }; +};