Skip to content
Snippets Groups Projects
Commit 2ef5caec authored by Jonas Höppner's avatar Jonas Höppner Committed by Tobias Kahlki
Browse files

dts:arm64:tanaro: Move sn65dsi section to tanaro

Rename display enable to lcd enable and remove defines from
tanaro_pinfunc.h
parent e88e11d1
No related branches found
No related tags found
2 merge requests!455CI: Update gitlab-ci,!126dts:arm64:tanaro: Add devicetree files from 5.10 kernel
...@@ -24,9 +24,6 @@ TOUCH_INT PAD_GPIO /* IRQ */ ...@@ -24,9 +24,6 @@ TOUCH_INT PAD_GPIO /* IRQ */
>; >;
}; };
pinctrl_display_enable: display-enable {
fsl,pins = < DISPLAY_ENABLE PAD_GPIO_PD >; /* DISPLAY_ENABLE */
};
}; };
&i2c2 { &i2c2 {
...@@ -48,34 +45,8 @@ eeti@2a { ...@@ -48,34 +45,8 @@ eeti@2a {
}; };
}; };
&i2c3 { &sn65dsi84 {
sn65dsi84@2c {
compatible = "ti,sn65dsi83";
reg = <0x2c>;
status = "okay"; status = "okay";
/* Enable pin is shared with the panel */
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_display_enable>;
enable-gpios = <display_enable GPIO_ACTIVE_HIGH>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
dsi_bridge_in: endpoint {
remote-endpoint = <&mipi_dsi_out>;
data-lanes = <1 2 3 4>;
};
};
port@2 {
reg = <2>;
dsi_bridge_out: endpoint {
remote-endpoint = <&panel1_in>;
};
};
};
};
}; };
/ { / {
...@@ -87,6 +58,8 @@ panel_lvds: panel { ...@@ -87,6 +58,8 @@ panel_lvds: panel {
height-mm = <86>; height-mm = <86>;
backlight = <&backlight1>; backlight = <&backlight1>;
/* Enable pin is shared with the sn65dsi83 */
panel-timing { panel-timing {
clock-frequency = <51206400>; clock-frequency = <51206400>;
hactive = <1024>; hactive = <1024>;
......
...@@ -24,9 +24,6 @@ TOUCH_INT PAD_GPIO /* IRQ */ ...@@ -24,9 +24,6 @@ TOUCH_INT PAD_GPIO /* IRQ */
>; >;
}; };
pinctrl_display_enable: display-enable {
fsl,pins = < DISPLAY_ENABLE PAD_GPIO_PD >; /* DISPLAY_ENABLE */
};
}; };
&i2c2 { &i2c2 {
...@@ -48,34 +45,8 @@ eeti@2a { ...@@ -48,34 +45,8 @@ eeti@2a {
}; };
}; };
&i2c3 { &sn65dsi84 {
sn65dsi84@2c {
compatible = "ti,sn65dsi83";
reg = <0x2c>;
status = "okay"; status = "okay";
/* Enable pin is shared with the panel */
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_display_enable>;
enable-gpios = <display_enable GPIO_ACTIVE_HIGH>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
dsi_bridge_in: endpoint {
remote-endpoint = <&mipi_dsi_out>;
data-lanes = <1 2 3 4>;
};
};
port@2 {
reg = <2>;
dsi_bridge_out: endpoint {
remote-endpoint = <&panel1_in>;
};
};
};
};
}; };
/ { / {
......
...@@ -23,10 +23,6 @@ TOUCH_INT PAD_GPIO /* IRQ */ ...@@ -23,10 +23,6 @@ TOUCH_INT PAD_GPIO /* IRQ */
#endif #endif
>; >;
}; };
pinctrl_display_enable: display-enable {
fsl,pins = < DISPLAY_ENABLE PAD_GPIO_PU >; /* DISPLAY_ENABLE */
};
}; };
&i2c2 { &i2c2 {
...@@ -54,34 +50,8 @@ ilitek_i2c: ilitek@41 { ...@@ -54,34 +50,8 @@ ilitek_i2c: ilitek@41 {
}; };
}; };
&i2c3 { &sn65dsi84 {
sn65dsi84@2c {
compatible = "ti,sn65dsi83";
reg = <0x2c>;
status = "okay"; status = "okay";
/* Enable pin is shared with the panel */
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_display_enable>;
enable-gpios = <display_enable GPIO_ACTIVE_HIGH>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
dsi_bridge_in: endpoint {
remote-endpoint = <&mipi_dsi_out>;
data-lanes = <1 2 3 4>;
};
};
port@2 {
reg = <2>;
dsi_bridge_out: endpoint {
remote-endpoint = <&panel1_in>;
};
};
};
};
}; };
/ { / {
......
...@@ -35,11 +35,5 @@ ...@@ -35,11 +35,5 @@
#define touch_int_pin 4 #define touch_int_pin 4
#define TOUCH_RESET MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 #define TOUCH_RESET MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0
#define touch_reset &gpio1 0 #define touch_reset &gpio1 0
#define DISPLAY_ENABLE 0x03C 0x2A4 0x000 0x0 0x0
#define display_enable &gpio1 5
#define CAMERA_PWDN 0x034 0x29C 0x000 0x0 0x0
#define camera_pwdn &gpio1 3
#define CAMERA_RESET 0x040 0x2A8 0x000 0x0 0x0
#define camera_reset &gpio1 6
#endif #endif
...@@ -219,6 +219,36 @@ &backlight1 { ...@@ -219,6 +219,36 @@ &backlight1 {
enable-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; enable-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
}; };
&i2c3 {
sn65dsi84: sn65dsi84@2c {
compatible = "ti,sn65dsi83";
reg = <0x2c>;
status = "disabled";
/* Enable pin is shared with the panel */
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_lcd_enable>;
enable-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
dsi_bridge_in: endpoint {
remote-endpoint = <&mipi_dsi_out>;
data-lanes = <1 2 3 4>;
};
};
port@2 {
reg = <2>;
dsi_bridge_out: endpoint {
remote-endpoint = <&panel1_in>;
};
};
};
};
};
&A53_0 { &A53_0 {
cpu-supply = <&buck2_reg>; cpu-supply = <&buck2_reg>;
}; };
...@@ -943,6 +973,11 @@ pinctrl_backlight_enable: backlight-enable { ...@@ -943,6 +973,11 @@ pinctrl_backlight_enable: backlight-enable {
fsl,pins = < MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x16 >; /* BL_EN */ fsl,pins = < MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x16 >; /* BL_EN */
}; };
pinctrl_lcd_enable: lcd-enable {
fsl,pins = < MX8MM_IOMUXC_GPIO1_IO05_GPIO1_IO5 (MX8MM_IOMUXC_PULLDOWN_ENABLE|MX8MM_IOMUXC_HYS|MX8MM_IOMUXC_SLOW|MX8MM_IOMUXC_DRIVE(6)) >; /* LCD_EN */
};
pinctrl_wdog: wdoggrp { pinctrl_wdog: wdoggrp {
fsl,pins = < MX8MM_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B 0xc6 >; fsl,pins = < MX8MM_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B 0xc6 >;
}; };
......
...@@ -458,7 +458,7 @@ static int imx_sec_dsim_probe(struct platform_device *pdev) ...@@ -458,7 +458,7 @@ static int imx_sec_dsim_probe(struct platform_device *pdev)
ret = component_add(dev, &imx_sec_dsim_ops); ret = component_add(dev, &imx_sec_dsim_ops);
if (ret) if (ret)
goto error1; goto error2;
return ret; return ret;
error2: error2:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment