mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-03 19:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'ux500-dts-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into arm/dt

Browse Source 
Ux500 DTS updates for the v5.10 kernel cycle:

- Add the s6e63m0 display to the Golden device
- Add the KTD253 backlight to the Skomer device
- Update the LP5521 LED DTS entries for binding changes

* tag 'ux500-dts-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: dts: ste-href: Add reg property to the LP5521 channel nodes
  ARM: dts: ux500-skomer: Add KTD253 backlight
  ARM: dts: ux500-golden: Add S6E63M0 DSI display

Link: https://lore.kernel.org/r/CACRpkda=-cgFjN7K2vBU5x4uSYrohrZSbjqMnSFb3Qe2Az1W5g@mail.gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2020-09-26 09:47:47 -07:00
parent 38c419037a 78efa6a766
commit dc47f7e772
3 changed files with 113 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/boot/dts/ste-href.dtsi
View File

@@ -58,16 +58,21 @@ lp5521@33 {
reg = <0x33>;
label = "lp5521_pri";
clock-mode = /bits/ 8 <2>;
chan0 {
#address-cells = <1>;
#size-cells = <0>;
chan@0 {
reg = <0>;
led-cur = /bits/ 8 <0x2f>;
max-cur = /bits/ 8 <0x5f>;
linux,default-trigger = "heartbeat";
};
chan1 {
chan@1 {
reg = <1>;
led-cur = /bits/ 8 <0x2f>;
max-cur = /bits/ 8 <0x5f>;
};
chan2 {
chan@2 {
reg = <2>;
led-cur = /bits/ 8 <0x2f>;
max-cur = /bits/ 8 <0x5f>;
};
@@ -77,15 +82,20 @@ lp5521@34 {
reg = <0x34>;
label = "lp5521_sec";
clock-mode = /bits/ 8 <2>;
chan0 {
#address-cells = <1>;
#size-cells = <0>;
chan@0 {
reg = <0>;
led-cur = /bits/ 8 <0x2f>;
max-cur = /bits/ 8 <0x5f>;
};
chan1 {
chan@1 {
reg = <1>;
led-cur = /bits/ 8 <0x2f>;
max-cur = /bits/ 8 <0x5f>;
};
chan2 {
chan@2 {
reg = <2>;
led-cur = /bits/ 8 <0x2f>;
max-cur = /bits/ 8 <0x5f>;
};

91
arch/arm/boot/dts/ste-ux500-samsung-golden.dts
View File

@@ -316,6 +316,28 @@ ab8500_ldo_aux8 {
};
};
};
mcde@a0350000 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dsi_default_mode>;
dsi-controller@a0351000 {
panel@0 {
compatible = "samsung,s6e63m0";
reg = <0>;
vdd3-supply = <&panel_reg_3v0>;
vci-supply = <&panel_reg_1v8>;
reset-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>;
/* ESD (electrostatic discharge) detection interrupt */
interrupt-parent = <&gpio2>;
interrupts = <18 IRQ_TYPE_EDGE_RISING>;
interrupt-names = "esd";
pinctrl-names = "default";
pinctrl-0 = <&display_default_mode>;
};
};
};
};
gpio-keys {
@@ -415,6 +437,40 @@ wl_reg_on: regulator-wl-reg-on {
pinctrl-names = "default";
pinctrl-0 = <&wlan_en_default>;
};
/* MIC5366 GPIO-controlled regulator */
panel_reg_1v8: regulator-panel-1v8 {
compatible = "regulator-fixed";
regulator-name = "panel-fixed-supply";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
/* GPIO219 */
gpio = <&gpio6 27 GPIO_ACTIVE_HIGH>;
startup-delay-us = <200>;
enable-active-high;
pinctrl-names = "default";
pinctrl-0 = <&panel_reg_default_mode>;
};
/* MIC5366 GPIO-controlled regulator */
panel_reg_3v0: regulator-panel-3v0 {
compatible = "regulator-fixed";
regulator-name = "panel-fixed-supply";
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
/* GPIO219 */
gpio = <&gpio6 27 GPIO_ACTIVE_HIGH>;
startup-delay-us = <200>;
enable-active-high;
pinctrl-names = "default";
pinctrl-0 = <&panel_reg_default_mode>;
};
};
&pinctrl {
@@ -476,6 +532,41 @@ golden_cfg1 {
};
};
mcde {
dsi_default_mode: dsi_default {
default_mux1 {
/* Mux in VSI0 used for DSI TE */
function = "lcd";
groups =
"lcdvsi0_a_1"; /* VSI0 for LCD */
};
default_cfg1 {
pins =
"GPIO68_E1"; /* VSI0 */
ste,config = <&in_nopull>;
};
};
};
display {
display_default_mode: display_default {
golden_cfg1 {
pins = "GPIO139_C9"; /* MIPI_DSI0_RESET_N */
ste,config = <&gpio_out_lo>;
};
golden_cfg2 {
pins = "GPIO82_C1"; /* LDI_ESD_DET */
ste,config = <&gpio_in_pu>;
};
};
panel_reg_default_mode: panel_reg_default {
golden_cfg1 {
pins = "GPIO219_AG10"; /* LCD_PWR_EN */
ste,config = <&gpio_out_lo>;
};
};
};
proximity {
proximity_default: proximity_default {
golden_cfg1 {

15
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
View File

@@ -108,15 +108,12 @@ button-back {
};
};
/*
* FIXME: this is not quite GPIO backlight. This is a
* KTD253 one-wire GPIO-controlled backlight. It can
* work as a GPIO backlight.
*/
gpio_bl: backlight {
compatible = "gpio-backlight";
ktd253: backlight {
compatible = "kinetic,ktd253";
/* GPIO 69 */
gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
enable-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
/* Default to 13/32 brightness */
default-brightness = <13>;
pinctrl-names = "default";
pinctrl-0 = <&gpio_backlight_default_mode>;
};
@@ -409,7 +406,7 @@ panel {
reset-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&display_default_mode>;
backlight = <&gpio_bl>;
backlight = <&ktd253>;
};
};
};