From: David Jander <[email protected]>
Recover default behavior of the device and set maximal brightness
Signed-off-by: David Jander <[email protected]>
Signed-off-by: Oleksij Rempel <[email protected]>
---
arch/arm/boot/dts/imx6dl-victgo.dts | 2 +-
arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6dl-victgo.dts b/arch/arm/boot/dts/imx6dl-victgo.dts
index 227c952543d4..e6134efbfabd 100644
--- a/arch/arm/boot/dts/imx6dl-victgo.dts
+++ b/arch/arm/boot/dts/imx6dl-victgo.dts
@@ -28,7 +28,7 @@ backlight: backlight {
pwms = <&pwm1 0 5000000 0>;
brightness-levels = <0 16 64 255>;
num-interpolated-steps = <16>;
- default-brightness-level = <1>;
+ default-brightness-level = <48>;
power-supply = <®_3v3>;
enable-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>;
};
diff --git a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
index 1ac7e13249d2..c1d06bc28c67 100644
--- a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
@@ -23,7 +23,7 @@ backlight: backlight {
pwms = <&pwm1 0 5000000 0>;
brightness-levels = <0 16 64 255>;
num-interpolated-steps = <16>;
- default-brightness-level = <1>;
+ default-brightness-level = <48>;
power-supply = <®_3v3>;
enable-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>;
};
--
2.30.2
From: Robin van der Gracht <[email protected]>
This series of devices is using lg,lb070wv8 instead of kyo,tcg121xglp.
Signed-off-by: Robin van der Gracht <[email protected]>
Signed-off-by: Oleksij Rempel <[email protected]>
---
arch/arm/boot/dts/imx6dl-victgo.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx6dl-victgo.dts b/arch/arm/boot/dts/imx6dl-victgo.dts
index 907682248aa7..7839021bc3eb 100644
--- a/arch/arm/boot/dts/imx6dl-victgo.dts
+++ b/arch/arm/boot/dts/imx6dl-victgo.dts
@@ -129,7 +129,7 @@ led-2 {
};
panel {
- compatible = "kyo,tcg121xglp";
+ compatible = "lg,lb070wv8";
backlight = <&backlight_lcd>;
power-supply = <®_3v3>;
--
2.30.2
From: Robin van der Gracht <[email protected]>
According to Documentation/devicetree/bindings/sound/fsl,ssi.txt
'fsl,mode' should be specified for AC97 mode only.
The 'fsl,ssi' documentation doesn't say anything about specifying
'sound-dai-cells' so we'll remove that as well.
Signed-off-by: Robin van der Gracht <[email protected]>
Signed-off-by: Oleksij Rempel <[email protected]>
---
arch/arm/boot/dts/imx6dl-victgo.dts | 2 --
arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 2 --
2 files changed, 4 deletions(-)
diff --git a/arch/arm/boot/dts/imx6dl-victgo.dts b/arch/arm/boot/dts/imx6dl-victgo.dts
index d542ddad4e32..20c7f80e5ec9 100644
--- a/arch/arm/boot/dts/imx6dl-victgo.dts
+++ b/arch/arm/boot/dts/imx6dl-victgo.dts
@@ -591,8 +591,6 @@ &pwm3 {
};
&ssi1 {
- #sound-dai-cells = <0>;
- fsl,mode = "ac97-slave";
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
index ec39008c0950..97ef8264947a 100644
--- a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
@@ -466,8 +466,6 @@ &pwm3 {
};
&ssi1 {
- #sound-dai-cells = <0>;
- fsl,mode = "ac97-slave";
status = "okay";
};
--
2.30.2
From: David Jander <[email protected]>
countedX lines have different board names (YACO_x). And REV_ and BOARD_ pins
have multiple functions. So, use names exposed to the OS.
Signed-off-by: David Jander <[email protected]>
Signed-off-by: Oleksij Rempel <[email protected]>
---
arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
index 2f6b263eea66..ec39008c0950 100644
--- a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
@@ -277,9 +277,9 @@ &gpio1 {
&gpio2 {
gpio-line-names =
- "count0", "count1", "count2", "", "", "", "", "",
- "REV_ID0", "REV_ID1", "REV_ID2", "REV_ID3", "REV_ID4",
- "BOARD_ID0", "BOARD_ID1", "BOARD_ID2",
+ "YACO_WHEEL", "YACO_RADAR", "YACO_PTO", "", "", "", "", "",
+ "", "LED_PWM", "", "", "",
+ "", "", "",
"", "", "", "", "", "", "", "ON_SWITCH",
"POWER_LED", "", "ECSPI2_SS0", "", "", "", "", "";
};
@@ -298,8 +298,10 @@ &gpio4 {
"", "", "", "", "", "", "UART4_TXD", "UART4_RXD",
"UART5_TXD", "UART5_RXD", "CAN1_TX", "CAN1_RX", "CAN1_SR",
"CAN2_SR", "CAN2_TX", "CAN2_RX",
- "LED_DI0_DEBUG_0", "LED_DI0_DEBUG_1", "", "", "", "", "", "",
- "", "", "", "", "BL_EN", "BL_PWM", "", "";
+ "LED_DI0_DEBUG_0", "LED_DI0_DEBUG_1", "", "", "", "ON1_CTRL",
+ "ON2_CTRL", "HITCH_IN_OUT",
+ "LIGHT_ON", "", "", "CONTACT_IN", "BL_EN", "BL_PWM", "",
+ "ISB_LED";
};
&gpio5 {
--
2.30.2
From: David Jander <[email protected]>
The gpio1 0 pin is controlling CAN termination, not USB H1 VBUS. So,
remove wrong regulator and assign this gpio to new DT CAN termination
property.
Signed-off-by: David Jander <[email protected]>
Signed-off-by: Oleksij Rempel <[email protected]>
---
arch/arm/boot/dts/imx6dl-victgo.dts | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/imx6dl-victgo.dts b/arch/arm/boot/dts/imx6dl-victgo.dts
index 7839021bc3eb..d66da630e0af 100644
--- a/arch/arm/boot/dts/imx6dl-victgo.dts
+++ b/arch/arm/boot/dts/imx6dl-victgo.dts
@@ -160,15 +160,6 @@ reg_3v3: regulator-3v3 {
regulator-max-microvolt = <3300000>;
};
- reg_h1_vbus: regulator-h1-vbus {
- compatible = "regulator-fixed";
- regulator-name = "h1-vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- };
-
reg_otg_vbus: regulator-otg-vbus {
compatible = "regulator-fixed";
regulator-name = "otg-vbus";
@@ -312,6 +303,8 @@ IMX_AUDMUX_V2_PTCR_SYN IMX_AUDMUX_V2_PDCR_RXDSEL(0)
&can1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_can1>;
+ termination-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+ termination-ohms = <150>;
status = "okay";
};
@@ -646,7 +639,6 @@ &uart5 {
};
&usbh1 {
- vbus-supply = <®_h1_vbus>;
pinctrl-names = "default";
phy_type = "utmi";
dr_mode = "host";
--
2.30.2
From: Robin van der Gracht <[email protected]>
Interrupt counter is mainlined, now we can add missing counter nodes.
Signed-off-by: Robin van der Gracht <[email protected]>
Signed-off-by: Oleksij Rempel <[email protected]>
---
arch/arm/boot/dts/imx6dl-victgo.dts | 41 ++++++++++++++++++++++++++++-
1 file changed, 40 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx6dl-victgo.dts b/arch/arm/boot/dts/imx6dl-victgo.dts
index 20c7f80e5ec9..907682248aa7 100644
--- a/arch/arm/boot/dts/imx6dl-victgo.dts
+++ b/arch/arm/boot/dts/imx6dl-victgo.dts
@@ -54,6 +54,27 @@ comp0_out: endpoint {
};
};
+ counter-0 {
+ compatible = "interrupt-counter";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_counter0>;
+ gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
+ };
+
+ counter-1 {
+ compatible = "interrupt-counter";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_counter1>;
+ gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
+ };
+
+ counter-2 {
+ compatible = "interrupt-counter";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_counter2>;
+ gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
+ };
+
gpio-keys {
compatible = "gpio-keys";
pinctrl-names = "default";
@@ -400,7 +421,7 @@ &gpio1 {
&gpio2 {
gpio-line-names =
- "", "", "", "", "", "", "", "",
+ "YACO_WHEEL", "YACO_RADAR", "YACO_PTO", "", "", "", "", "",
"", "LED_PWM", "", "", "",
"", "", "",
"", "", "", "", "", "", "ISB_IN1", "ON_SWITCH",
@@ -706,6 +727,24 @@ MX6QDL_PAD_KEY_ROW3__GPIO4_IO13 0x13008
>;
};
+ pinctrl_counter0: counter0grp {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x1b000
+ >;
+ };
+
+ pinctrl_counter1: counter1grp {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x1b000
+ >;
+ };
+
+ pinctrl_counter2: counter2grp {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b000
+ >;
+ };
+
pinctrl_ecspi1: ecspi1grp {
fsl,pins = <
MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1
--
2.30.2
From: David Jander <[email protected]>
We have two backlight sources on this boards. Use more specific name for
the LCD backlight to see the difference.
Signed-off-by: David Jander <[email protected]>
Signed-off-by: Robin van der Gracht <[email protected]>
Signed-off-by: Oleksij Rempel <[email protected]>
---
arch/arm/boot/dts/imx6dl-victgo.dts | 4 ++--
arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/imx6dl-victgo.dts b/arch/arm/boot/dts/imx6dl-victgo.dts
index e6134efbfabd..833340c30537 100644
--- a/arch/arm/boot/dts/imx6dl-victgo.dts
+++ b/arch/arm/boot/dts/imx6dl-victgo.dts
@@ -21,7 +21,7 @@ chosen {
stdout-path = &uart4;
};
- backlight: backlight {
+ backlight_lcd: backlight {
compatible = "pwm-backlight";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_backlight>;
@@ -100,7 +100,7 @@ led-2 {
panel {
compatible = "kyo,tcg121xglp";
- backlight = <&backlight>;
+ backlight = <&backlight_lcd>;
power-supply = <®_3v3>;
port {
diff --git a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
index c1d06bc28c67..a1fbbc9c26b6 100644
--- a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
@@ -16,7 +16,7 @@ chosen {
stdout-path = &uart4;
};
- backlight: backlight {
+ backlight_lcd: backlight {
compatible = "pwm-backlight";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_backlight>;
@@ -102,7 +102,7 @@ led-2 {
panel {
compatible = "kyo,tcg121xglp";
- backlight = <&backlight>;
+ backlight = <&backlight_lcd>;
power-supply = <®_3v3>;
port {
--
2.30.2
On Mon, Feb 21, 2022 at 10:53:10AM +0100, Oleksij Rempel wrote:
> From: Robin van der Gracht <[email protected]>
>
> Interrupt counter is mainlined, now we can add missing counter nodes.
>
> Signed-off-by: Robin van der Gracht <[email protected]>
> Signed-off-by: Oleksij Rempel <[email protected]>
Applied, thanks!
On Mon, Feb 21, 2022 at 10:53:06AM +0100, Oleksij Rempel wrote:
> From: David Jander <[email protected]>
>
> We have two backlight sources on this boards. Use more specific name for
> the LCD backlight to see the difference.
>
> Signed-off-by: David Jander <[email protected]>
> Signed-off-by: Robin van der Gracht <[email protected]>
> Signed-off-by: Oleksij Rempel <[email protected]>
Applied, thanks!
On Mon, Feb 21, 2022 at 10:53:05AM +0100, Oleksij Rempel wrote:
> From: David Jander <[email protected]>
>
> Recover default behavior of the device and set maximal brightness
>
> Signed-off-by: David Jander <[email protected]>
> Signed-off-by: Oleksij Rempel <[email protected]>
Applied, thanks!
On Mon, Feb 21, 2022 at 10:53:12AM +0100, Oleksij Rempel wrote:
> From: David Jander <[email protected]>
>
> The gpio1 0 pin is controlling CAN termination, not USB H1 VBUS. So,
> remove wrong regulator and assign this gpio to new DT CAN termination
> property.
>
> Signed-off-by: David Jander <[email protected]>
> Signed-off-by: Oleksij Rempel <[email protected]>
Applied, thanks!
On Wed, Apr 6, 2022 at 9:23 AM Shawn Guo <[email protected]> wrote:
>
> On Mon, Feb 21, 2022 at 10:53:05AM +0100, Oleksij Rempel wrote:
> > From: David Jander <[email protected]>
> >
> > Recover default behavior of the device and set maximal brightness
> >
> > Signed-off-by: David Jander <[email protected]>
> > Signed-off-by: Oleksij Rempel <[email protected]>
> > ---
> > arch/arm/boot/dts/imx6dl-victgo.dts | 2 +-
> > arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/imx6dl-victgo.dts b/arch/arm/boot/dts/imx6dl-victgo.dts
> > index 227c952543d4..e6134efbfabd 100644
> > --- a/arch/arm/boot/dts/imx6dl-victgo.dts
> > +++ b/arch/arm/boot/dts/imx6dl-victgo.dts
> > @@ -28,7 +28,7 @@ backlight: backlight {
> > pwms = <&pwm1 0 5000000 0>;
> > brightness-levels = <0 16 64 255>;
> > num-interpolated-steps = <16>;
> > - default-brightness-level = <1>;
> > + default-brightness-level = <48>;
>
> Please take a look at the documentation of the property.
>
> default-brightness-level:
> description:
> The default brightness level (index into the array defined by the
> "brightness-levels" property).
Ah, never mind, I missed 'num-interpolated-steps' there.
Shawn
On Mon, Feb 21, 2022 at 10:53:08AM +0100, Oleksij Rempel wrote:
> From: David Jander <[email protected]>
>
> countedX lines have different board names (YACO_x). And REV_ and BOARD_ pins
> have multiple functions. So, use names exposed to the OS.
>
> Signed-off-by: David Jander <[email protected]>
> Signed-off-by: Oleksij Rempel <[email protected]>
Applied, thanks!
On Mon, Feb 21, 2022 at 10:53:09AM +0100, Oleksij Rempel wrote:
> From: Robin van der Gracht <[email protected]>
>
> According to Documentation/devicetree/bindings/sound/fsl,ssi.txt
> 'fsl,mode' should be specified for AC97 mode only.
>
> The 'fsl,ssi' documentation doesn't say anything about specifying
> 'sound-dai-cells' so we'll remove that as well.
Hmm, what needs to be fixed is fsl,ssi binding doc, I think.
Shawn
>
> Signed-off-by: Robin van der Gracht <[email protected]>
> Signed-off-by: Oleksij Rempel <[email protected]>
> ---
> arch/arm/boot/dts/imx6dl-victgo.dts | 2 --
> arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 2 --
> 2 files changed, 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6dl-victgo.dts b/arch/arm/boot/dts/imx6dl-victgo.dts
> index d542ddad4e32..20c7f80e5ec9 100644
> --- a/arch/arm/boot/dts/imx6dl-victgo.dts
> +++ b/arch/arm/boot/dts/imx6dl-victgo.dts
> @@ -591,8 +591,6 @@ &pwm3 {
> };
>
> &ssi1 {
> - #sound-dai-cells = <0>;
> - fsl,mode = "ac97-slave";
> status = "okay";
> };
>
> diff --git a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
> index ec39008c0950..97ef8264947a 100644
> --- a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
> @@ -466,8 +466,6 @@ &pwm3 {
> };
>
> &ssi1 {
> - #sound-dai-cells = <0>;
> - fsl,mode = "ac97-slave";
> status = "okay";
> };
>
> --
> 2.30.2
>
On Mon, Feb 21, 2022 at 10:53:05AM +0100, Oleksij Rempel wrote:
> From: David Jander <[email protected]>
>
> Recover default behavior of the device and set maximal brightness
>
> Signed-off-by: David Jander <[email protected]>
> Signed-off-by: Oleksij Rempel <[email protected]>
> ---
> arch/arm/boot/dts/imx6dl-victgo.dts | 2 +-
> arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6dl-victgo.dts b/arch/arm/boot/dts/imx6dl-victgo.dts
> index 227c952543d4..e6134efbfabd 100644
> --- a/arch/arm/boot/dts/imx6dl-victgo.dts
> +++ b/arch/arm/boot/dts/imx6dl-victgo.dts
> @@ -28,7 +28,7 @@ backlight: backlight {
> pwms = <&pwm1 0 5000000 0>;
> brightness-levels = <0 16 64 255>;
> num-interpolated-steps = <16>;
> - default-brightness-level = <1>;
> + default-brightness-level = <48>;
Please take a look at the documentation of the property.
default-brightness-level:
description:
The default brightness level (index into the array defined by the
"brightness-levels" property).
Shawn
> power-supply = <®_3v3>;
> enable-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>;
> };
> diff --git a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
> index 1ac7e13249d2..c1d06bc28c67 100644
> --- a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
> @@ -23,7 +23,7 @@ backlight: backlight {
> pwms = <&pwm1 0 5000000 0>;
> brightness-levels = <0 16 64 255>;
> num-interpolated-steps = <16>;
> - default-brightness-level = <1>;
> + default-brightness-level = <48>;
> power-supply = <®_3v3>;
> enable-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>;
> };
> --
> 2.30.2
>
On Mon, Feb 21, 2022 at 10:53:11AM +0100, Oleksij Rempel wrote:
> From: Robin van der Gracht <[email protected]>
>
> This series of devices is using lg,lb070wv8 instead of kyo,tcg121xglp.
>
> Signed-off-by: Robin van der Gracht <[email protected]>
> Signed-off-by: Oleksij Rempel <[email protected]>
Applied, thanks!