On 03/04/2016 12:40 PM, Adam Ford wrote: > Since there are a few different LogicPD Display Panel options, > this patch creates two dtsi files which can be included based on > which display panel is available. > > Signed-off-by: Adam Ford <aford173@xxxxxxxxx> > --- Dumb question: any reason we cannot do this as device tree overlays? > arch/arm/boot/dts/logicpd-display_panel-15.dtsi | 47 +++++++++++++++++++++++ > arch/arm/boot/dts/logicpd-display_panel-28.dtsi | 40 +++++++++++++++++++ > arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 37 ++++-------------- > 3 files changed, 95 insertions(+), 29 deletions(-) > create mode 100644 arch/arm/boot/dts/logicpd-display_panel-15.dtsi > create mode 100644 arch/arm/boot/dts/logicpd-display_panel-28.dtsi > > diff --git a/arch/arm/boot/dts/logicpd-display_panel-15.dtsi b/arch/arm/boot/dts/logicpd-display_panel-15.dtsi > new file mode 100644 > index 0000000..8594526d2 > --- /dev/null > +++ b/arch/arm/boot/dts/logicpd-display_panel-15.dtsi > @@ -0,0 +1,47 @@ > +/* > + * Common file for LogicPD Type 15 Display Panel > + * > + * Note that the board specific DTS file needs to specify > + * pinctrl and enable-gpios. > + */ > + > +/ { > + aliases { > + display0 = &lcd0; > + }; > + > + video_reg: video_reg { > + compatible = "regulator-fixed"; > + regulator-name = "fixed-supply"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + }; > + > + lcd0: display@0 { > + compatible = "panel-dpi"; > + label = "15"; > + status = "okay"; > + port { > + lcd_in: endpoint { > + remote-endpoint = <&dpi_out>; > + }; > + }; > + > + panel-timing { > + clock-frequency = <9000000>; > + hactive = <480>; > + vactive = <272>; > + hfront-porch = <3>; > + hback-porch = <2>; > + hsync-len = <42>; > + vback-porch = <3>; > + vfront-porch = <4>; > + vsync-len = <11>; > + hsync-active = <0>; > + vsync-active = <0>; > + de-active = <1>; > + pixelclk-active = <1>; > + }; > + }; > +}; > + > diff --git a/arch/arm/boot/dts/logicpd-display_panel-28.dtsi b/arch/arm/boot/dts/logicpd-display_panel-28.dtsi > new file mode 100644 > index 0000000..89ebeb9 > --- /dev/null > +++ b/arch/arm/boot/dts/logicpd-display_panel-28.dtsi > @@ -0,0 +1,40 @@ > +/* > + * Common file for LogicPD Type 15 Display Panel > + * > + * Note that the board specific DTS file needs to specify > + * pinctrl and enable-gpios. > + */ > + > +/ { > + aliases { > + display0 = &lcd0; > + }; > + > + lcd0: display@0 { > + compatible = "panel-dpi"; > + label = "28"; > + status = "okay"; > + port { > + lcd_in: endpoint { > + remote-endpoint = <&dpi_out>; > + }; > + }; > + > + panel-timing { > + clock-frequency = <9000000>; > + hactive = <480>; > + vactive = <272>; > + hfront-porch = <3>; > + hback-porch = <2>; > + hsync-len = <42>; > + vback-porch = <3>; > + vfront-porch = <2>; > + vsync-len = <11>; > + hsync-active = <1>; > + vsync-active = <1>; > + de-active = <1>; > + pixelclk-active = <0>; > + }; > + }; > +}; > + > diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts > index 4ed3652..a9904f4 100644 > --- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts > +++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts > @@ -132,10 +132,6 @@ > }; > > / { > - aliases { > - display0 = &lcd0; > - }; > - > video_reg: video_reg { > compatible = "regulator-fixed"; > regulator-name = "fixed-supply"; > @@ -144,34 +140,9 @@ > }; > > lcd0: display@0 { > - compatible = "panel-dpi"; > - label = "28"; > - status = "okay"; > - /* default-on; */ > pinctrl-names = "default"; > pinctrl-0 = <&lcd_enable_pin>; > enable-gpios = <&gpio5 27 GPIO_ACTIVE_HIGH>; /* gpio155, lcd INI */ > - port { > - lcd_in: endpoint { > - remote-endpoint = <&dpi_out>; > - }; > - }; > - > - panel-timing { > - clock-frequency = <9000000>; > - hactive = <480>; > - vactive = <272>; > - hfront-porch = <3>; > - hback-porch = <2>; > - hsync-len = <42>; > - vback-porch = <3>; > - vfront-porch = <2>; > - vsync-len = <11>; > - hsync-active = <1>; > - vsync-active = <1>; > - de-active = <1>; > - pixelclk-active = <0>; > - }; > }; > > bl: backlight { > @@ -185,6 +156,14 @@ > }; > }; > > +/* > + * The current production Panel is Type 28. > + * For people with older, Type 15 displays, include > + * logicpd-display_panel-15.dtsi instead > + */ > +#include "logicpd-display_panel-28.dtsi" > + > + > &mmc1 { > interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>; > pinctrl-names = "default"; > -- Regards, Nishanth Menon -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html