Message ID | 1409567792-8281-1-git-send-email-ajaykumar.rs@samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 09/01/14 19:36, Ajay Kumar wrote: > Add DT nodes for ptn3460 bridge chip and panel. > Add backlight enable pin and backlight power supply for pwm-backlight. > Also add bridge phandle needed by dp to enable display on snow. > > Signed-off-by: Ajay Kumar<ajaykumar.rs@samsung.com> > --- > Changes since V1: > -- Remove "simple-panel" compatible string. > -- Use GPIO_ACTIVE_HIGH instead of 0. > -- Change panel node naming from "panel-simple" to "panel". > > Changes since V2: > -- Use proper compatible string: "auo,b116xw03" > > arch/arm/boot/dts/exynos5250-snow.dts | 41 ++++++++++++++++++--------------- > 1 file changed, 22 insertions(+), 19 deletions(-) > Applied this and 2nd one. BTW, I resolved conflict when I applied. Please check my tree and then if any problems, please let me know. Thanks, Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Kukjin, On Sat, Sep 13, 2014 at 10:52 PM, Kukjin Kim <kgene.kim@samsung.com> wrote: > On 09/01/14 19:36, Ajay Kumar wrote: >> >> Add DT nodes for ptn3460 bridge chip and panel. >> Add backlight enable pin and backlight power supply for pwm-backlight. >> Also add bridge phandle needed by dp to enable display on snow. >> >> Signed-off-by: Ajay Kumar<ajaykumar.rs@samsung.com> >> --- >> Changes since V1: >> -- Remove "simple-panel" compatible string. >> -- Use GPIO_ACTIVE_HIGH instead of 0. >> -- Change panel node naming from "panel-simple" to "panel". >> >> Changes since V2: >> -- Use proper compatible string: "auo,b116xw03" >> >> arch/arm/boot/dts/exynos5250-snow.dts | 41 >> ++++++++++++++++++--------------- >> 1 file changed, 22 insertions(+), 19 deletions(-) >> > Applied this and 2nd one. > > BTW, I resolved conflict when I applied. Please check my tree and then if > any problems, please let me know. This patchset has dependency on driver patches. But, no harm merging it since DT bindings are almost agreed. The below patch should be merged ASAP. Because, driver changes are already in for this patch: https://www.mail-archive.com/linux-samsung-soc@vger.kernel.org/msg35182.html Ajay -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index f2b8c41..1ac9709 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts @@ -9,6 +9,7 @@ */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include "exynos5250.dtsi" #include "exynos5250-cros-common.dtsi" @@ -181,7 +182,7 @@ dcdc3 { ti,enable-ext-control; }; - fet1 { + fet1: fet1 { regulator-name = "vcd_led"; ti,overcurrent-wait = <3>; }; @@ -204,7 +205,7 @@ regulator-always-on; ti,overcurrent-wait = <3>; }; - fet6 { + fet6: fet6 { regulator-name = "lcd_vdd"; ti,overcurrent-wait = <3>; }; @@ -253,6 +254,15 @@ pinctrl-0 = <&max98095_en>; pinctrl-names = "default"; }; + + ptn3460: lvds-bridge@20 { + compatible = "nxp,ptn3460"; + reg = <0x20>; + powerdown-gpios = <&gpy2 5 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpx1 5 GPIO_ACTIVE_HIGH>; + edid-emulation = <5>; + panel = <&panel>; + }; }; i2s0: i2s@03830000 { @@ -300,11 +310,13 @@ vdd_pll-supply = <&ldo8_reg>; }; - backlight { + backlight: backlight { compatible = "pwm-backlight"; pwms = <&pwm 0 1000000 0>; brightness-levels = <0 100 500 1000 1500 2000 2500 2800>; default-brightness-level = <7>; + enable-gpios = <&gpx3 0 GPIO_ACTIVE_HIGH>; + power-supply = <&fet1>; pinctrl-0 = <&pwm0_out>; pinctrl-names = "default"; }; @@ -314,6 +326,12 @@ samsung,invert-vclk; }; + panel: panel { + compatible = "auo,b116xw03"; + power-supply = <&fet6>; + backlight = <&backlight>; + }; + dp-controller@145B0000 { status = "okay"; pinctrl-names = "default"; @@ -325,22 +343,7 @@ samsung,link-rate = <0x0a>; samsung,lane-count = <2>; samsung,hpd-gpio = <&gpx0 7 0>; - - display-timings { - native-mode = <&timing1>; - - timing1: timing@1 { - clock-frequency = <70589280>; - hactive = <1366>; - vactive = <768>; - hfront-porch = <40>; - hback-porch = <40>; - hsync-len = <32>; - vback-porch = <10>; - vfront-porch = <12>; - vsync-len = <6>; - }; - }; + bridge = <&ptn3460>; }; };
Add DT nodes for ptn3460 bridge chip and panel. Add backlight enable pin and backlight power supply for pwm-backlight. Also add bridge phandle needed by dp to enable display on snow. Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com> --- Changes since V1: -- Remove "simple-panel" compatible string. -- Use GPIO_ACTIVE_HIGH instead of 0. -- Change panel node naming from "panel-simple" to "panel". Changes since V2: -- Use proper compatible string: "auo,b116xw03" arch/arm/boot/dts/exynos5250-snow.dts | 41 ++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 19 deletions(-)