ARM: dts: imx: update Boundary Devices boards support

PATCH Superseded Gary Bisson 3 participants 19 messages Oct 25, 2016 – Nov 2, 2016

Subsystems (3)

Device tree bindings Arm i.MX and Layerscape Arm and arm64 SoC sub-architectures (common parts)

lore

Share & tools

lore

Gary Bisson

author

2016-10-25 21:19 UTC #0 lore raw

cover ARM: dts: imx: update Boundary Devices boards support

Hi all,

This series includes several patches to update the support for our platforms.

Here are the main goals of this series:
1- Adding support for our latest SOM (SOM2)
2- Fix panel naming consistency across the boards
-> This way our U-Boot bootscript[1] can easily set the panel compatible.
3- Fix USB PHY reset for some boards
-> U-Boot used to always set the reset pin whether usb was used or not.
Anyway, the kernel should not be dependent on the bootloader.

Let me know if you have any question.

Regards,
Gary

[1] https://github.com/boundarydevices/u-boot-imx6/blob/boundary-v2016.03/board/boundary/nitrogen6x/6x_bootscript-mainline.txt

Gary Bisson (5):
ARM: dts: imx: add Boundary Devices Nitrogen6_SOM2 support
ARM: dts: imx6qdl-sabrelite: rename panel nodes
ARM: dts: imx6qdl-sabrelite: add missing USB PHY reset control
ARM: dts: imx6qdl-nitrogen6x: rename panel nodes
ARM: dts: imx6qdl-nitrogen6x: add missing USB PHY reset control

 arch/arm/boot/dts/Makefile                    |   1 +
 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts    |  53 ++
 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 770 ++++++++++++++++++++++++++
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi     |  24 +-
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi      |  24 +-
 5 files changed, 868 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi

Signature · 1 line

2.9.3

Gary Bisson

author

2016-10-25 21:19 UTC #1 lore raw

PATCH 1/5 ARM: dts: imx: add Boundary Devices Nitrogen6_SOM2 support

SoM based on i.MX6 Quad with 1GB of DDR3.

https://boundarydevices.com/product/nit6x-som-v2/

Signed-off-by Gary Bisson <[email protected]>

---
 arch/arm/boot/dts/Makefile                    |   1 +
 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts    |  53 ++
 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 770 ++++++++++++++++++++++++++
 3 files changed, 824 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi

arch/arm/boot/dts/Makefile +1 -0

index 191807c..5647cc1 100644
@@ -386,6 +386,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
 	imx6q-marsboard.dtb \
 	imx6q-nitrogen6x.dtb \
 	imx6q-nitrogen6_max.dtb \
+	imx6q-nitrogen6_som2.dtb \
 	imx6q-novena.dtb \
 	imx6q-phytec-pbab01.dtb \
 	imx6q-rex-pro.dtb \

arch/arm/boot/dts/imx6q-nitrogen6_som2.dts new file +53 -0

53 lines not on this page · raw message

arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi new file +770 -0

770 lines not on this page · raw message

Signature · 1 line

2.9.3

Shawn Guo

2016-11-01 14:13 UTC #2 lore raw

PATCH v2 1/5 ARM: dts: imx: add Boundary Devices Nitrogen6_SOM2 support

Quoted 12 lines · Gary Bisson

SoM based on i.MX6 Quad with 1GB of DDR3.

https://boundarydevices.com/product/nit6x-som-v2/

Signed-off-by Gary Bisson <[email protected]>

---
 arch/arm/boot/dts/Makefile                    |   1 +
 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts    |  53 ++
 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 770 ++++++++++++++++++++++++++
 3 files changed, 824 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi

<snip>

arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi line 53

Quoted 10 lines

arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi new file +10 -0

+/ {
+	chosen {
+		stdout-path = &uart2;
+	};
+
+	memory {
+		reg = <0x10000000 0x40000000>;
+	};
+
+	backlight_lcd: backlight_lcd {

Please use hyphen instead of underscore in node name. Please check through the patch series.

Shawn

Quoted 7 lines

arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi new file +7 -0

+		compatible = "pwm-backlight";
+		pwms = <&pwm1 0 5000000>;
+		brightness-levels = <0 4 8 16 32 64 128 255>;
+		default-brightness-level = <7>;
+		power-supply = <&reg_3p3v>;
+		status = "okay";
+	};

Gary Bisson

author

2016-11-01 14:54 UTC #3 lore raw

PATCH 1/5 ARM: dts: imx: add Boundary Devices Nitrogen6_SOM2 support

Hi Shawn,

Quoted 16 lines · Shawn Guo

Quoted 12 lines · Gary Bisson
SoM based on i.MX6 Quad with 1GB of DDR3.
https://boundarydevices.com/product/nit6x-som-v2/
Signed-off-by Gary Bisson <[email protected]>
---
 arch/arm/boot/dts/Makefile                    |   1 +
 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts    |  53 ++
 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 770 ++++++++++++++++++++++++++
 3 files changed, 824 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
<snip>

Quoted 13 lines

arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi line 53
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi new file +10 -0
+/ {
+     chosen {
+             stdout-path = &uart2;
+     };
+
+     memory {
+             reg = <0x10000000 0x40000000>;
+     };
+
+     backlight_lcd: backlight_lcd {
Please use hyphen instead of underscore in node name. Please check through the patch series.

Sorry about that, forgot (again). Just to make sure, the label can have underscore but not the name right? Or is it better to have hypens everywhere?

So I guess I need to make a pass on current boards as well. Some patches in my series rename the panel to panel_lvdsX to match the current Nitrogen6_MAX naming[1] but this would need to be changed to panel-lvdsX as well.

Regards,
Gary

[1] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi#n296

Shawn Guo

2016-11-02 07:35 UTC #4 lore raw

PATCH v2 1/5 ARM: dts: imx: add Boundary Devices Nitrogen6_SOM2 support

Quoted 33 lines · Gary Bisson

Hi Shawn,
Quoted 16 lines · Shawn Guo
Quoted 12 lines · Gary Bisson
SoM based on i.MX6 Quad with 1GB of DDR3.
https://boundarydevices.com/product/nit6x-som-v2/
Signed-off-by Gary Bisson <[email protected]>
---
 arch/arm/boot/dts/Makefile                    |   1 +
 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts    |  53 ++
 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 770 ++++++++++++++++++++++++++
 3 files changed, 824 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
<snip>
Quoted 13 lines
arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi line 53
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi new file +10 -0
+/ {
+     chosen {
+             stdout-path = &uart2;
+     };
+
+     memory {
+             reg = <0x10000000 0x40000000>;
+     };
+
+     backlight_lcd: backlight_lcd {
Please use hyphen instead of underscore in node name. Please check through the patch series.

Quoted 3 lines

Sorry about that, forgot (again). Just to make sure, the label can have underscore but not the name right? Or is it better to have hypens everywhere?

Hyphen cannot be used in labels. Otherwise, DTC will complain.

Quoted 1 line

So I guess I need to make a pass on current boards as well.

I'm fine with the current boards and only expect it to be right with the boards to be added.

Shawn

Gary Bisson

author

2016-10-25 21:19 UTC #5 lore raw

PATCH 2/5 ARM: dts: imx6qdl-sabrelite: rename panel nodes

In reply to Gary Bisson

So it is in line with other Boundary Device device tree (nit6xlite and nitrogen6_max).

Signed-off-by Gary Bisson <[email protected]>

---
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +2 -2

index 81dd6cd..cebea8a 100644
@@ -197,7 +197,7 @@
 		};
 	};
 
-	lcd_panel {
+	panel_lcd {
 		compatible = "okaya,rs800480t-7x0gp";
 		backlight = <&backlight_lcd>;

@@ -208,7 +208,7 @@
 		};
 	};
 
-	panel {
+	panel_lvds0 {
 		compatible = "hannstar,hsd100pxn1";
 		backlight = <&backlight_lvds>;

Signature · 1 line

2.9.3

Gary Bisson

author

2016-10-25 21:19 UTC #6 lore raw

PATCH 3/5 ARM: dts: imx6qdl-sabrelite: add missing USB PHY reset control

In reply to Gary Bisson

Declared as a regulator since the driver doesn't have a reset-gpios property for this.

This ensures that the PHY is woken up, not depending on the state the second stage bootloader leaves the pin.

Signed-off-by Gary Bisson <[email protected]>

---
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +20 -0

index cebea8a..bf00267 100644
@@ -94,6 +94,19 @@
 			pinctrl-0 = <&pinctrl_can_xcvr>;
 			gpio = <&gpio1 2 GPIO_ACTIVE_LOW>;
 		};
+
+		reg_usb_h1_vbus: regulator at 4 {
+			compatible = "regulator-fixed";
+			reg = <4>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usbh1>;
+			regulator-name = "usb_h1_vbus";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
+			enable-active-high;
+			regulator-always-on;
+		};
 	};
 
 	gpio-keys {

@@ -481,6 +494,12 @@
 			>;
 		};
 
+		pinctrl_usbh1: usbh1grp {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_17__GPIO7_IO12		0x030b0
+			>;
+		};
+
 		pinctrl_usbotg: usbotggrp {
 			fsl,pins = <
 				MX6QDL_PAD_GPIO_1__USB_OTG_ID		0x17059

@@ -578,6 +597,7 @@
 };
 
 &usbh1 {
+	vbus-supply = <&reg_usb_h1_vbus>;
 	status = "okay";
 };

Signature · 1 line

2.9.3

Fabio Estevam

reviewer

2016-10-25 21:28 UTC #7 lore raw

PATCH 3/5 ARM: dts: imx6qdl-sabrelite: add missing USB PHY reset control

Hi Gary,

Quoted 2 lines · Gary Bisson

Declared as a regulator since the driver doesn't have a reset-gpios property for this.

Peter Chen is working on adding USB reset-gpio property this. Please check his series:
https://www.spinics.net/lists/arm-kernel/msg536105.html

Gary Bisson

author

2016-10-25 21:53 UTC #8 lore raw

PATCH 3/5 ARM: dts: imx6qdl-sabrelite: add missing USB PHY reset control

Hi Fabio,

Quoted 10 lines · Fabio Estevam

Hi Gary,
Quoted 2 lines · Gary Bisson
Declared as a regulator since the driver doesn't have a reset-gpios property for this.
Peter Chen is working on adding USB reset-gpio property this. Please check his series:
https://www.spinics.net/lists/arm-kernel/msg536105.html

Thanks, I wasn't aware of this series. Indeed if this power sequence code gets upstream soon I guess we can drop both patches about the USB PHY reset.

Note that our Nitrogen6_MAX is using the regulator approach, it will need to be updated once Peter's series gets merged.

Regards,
Gary

Shawn Guo

2016-11-01 14:17 UTC #9 lore raw

PATCH v2 3/5 ARM: dts: imx6qdl-sabrelite: add missing USB PHY reset control

Quoted 10 lines · Gary Bisson

Hi Fabio,
Quoted 7 lines · Fabio Estevam
Hi Gary,
Quoted 2 lines · Gary Bisson
Declared as a regulator since the driver doesn't have a reset-gpios property for this.

Quoted 7 lines

Quoted 3 lines
Peter Chen is working on adding USB reset-gpio property this. Please check his series:
https://www.spinics.net/lists/arm-kernel/msg536105.html
Thanks, I wasn't aware of this series. Indeed if this power sequence code gets upstream soon I guess we can drop both patches about the USB PHY reset.

Let's wait then instead of adding something that will be removed later.

Shawn

Gary Bisson

author

2016-10-25 21:19 UTC #10 lore raw

PATCH 4/5 ARM: dts: imx6qdl-nitrogen6x: rename panel nodes

In reply to Gary Bisson

So it is in line with other Boundary Device device tree (nit6xlite and nitrogen6_max).

Signed-off-by Gary Bisson <[email protected]>

---
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +2 -2

index db868bc..c7016b2 100644
@@ -211,7 +211,7 @@
 		};
 	};
 
-	lcd_panel {
+	panel_lcd {
 		compatible = "okaya,rs800480t-7x0gp";
 		backlight = <&backlight_lcd>;

@@ -222,7 +222,7 @@
 		};
 	};
 
-	panel {
+	panel_lvds0 {
 		compatible = "hannstar,hsd100pxn1";
 		backlight = <&backlight_lvds>;

Signature · 1 line

2.9.3

Gary Bisson

author

2016-10-25 21:19 UTC #11 lore raw

PATCH 5/5 ARM: dts: imx6qdl-nitrogen6x: add missing USB PHY reset control

In reply to Gary Bisson

Declared as a regulator since the driver doesn't have a reset-gpios property for this.

This ensures that the PHY is woken up, not depending on the state the second stage bootloader leaves the pin.

Signed-off-by Gary Bisson <[email protected]>

---
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +20 -0

index c7016b2..d471ced 100644
@@ -108,6 +108,19 @@
 			startup-delay-us = <70000>;
 			enable-active-high;
 		};
+
+		reg_usb_h1_vbus: regulator at 5 {
+			compatible = "regulator-fixed";
+			reg = <5>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usbh1>;
+			regulator-name = "usb_h1_vbus";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
+			enable-active-high;
+			regulator-always-on;
+		};
 	};
 
 	gpio-keys {

@@ -516,6 +529,12 @@
 			>;
 		};
 
+		pinctrl_usbh1: usbh1grp {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_17__GPIO7_IO12		0x030b0
+			>;
+		};
+
 		pinctrl_usbotg: usbotggrp {
 			fsl,pins = <
 				MX6QDL_PAD_GPIO_1__USB_OTG_ID	0x17059

@@ -633,6 +652,7 @@
 };
 
 &usbh1 {
+	vbus-supply = <&reg_usb_h1_vbus>;
 	status = "okay";
 };

Signature · 1 line

2.9.3

Gary Bisson

author

2016-11-01 17:10 UTC #12 lore raw

v2 cover ARM: dts: imx: update Boundary Devices boards support

In reply to Gary Bisson

Hi all,

This series includes several patches to update the support for our platforms.

Here are the main goals of this series:
1- Adding support for our latest SOM (SOM2)
2- Replace underscores in nodes name
3- Fix panel naming consistency across the boards

Changelog v1->v2:
- Drop the USB PHY reset changes, waiting for Peter's series [1] to get in.
- Replace underscores in nodes name

Let me know if you have any question.

Regards,
Gary

[1] https://www.spinics.net/lists/arm-kernel/msg536105.html

Gary Bisson (5):
ARM: dts: imx: add Boundary Devices Nitrogen6_SOM2 support
ARM: dts: imx6qdl-sabrelite: use hyphens for nodes name
ARM: dts: imx6qdl-nitrogen6x: use hyphens for nodes name
ARM: dts: imx6qdl-nit6xlite: use hyphens for nodes name
ARM: dts: imx6qdl-nitrogen6_max: use hyphens for nodes name

 arch/arm/boot/dts/Makefile                    |   1 +
 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts    |  53 ++
 arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi      |  32 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi  |  18 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 770 ++++++++++++++++++++++++++
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi     |  12 +-
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi      |  10 +-
 7 files changed, 849 insertions(+), 47 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi

Signature · 1 line

2.9.3

Gary Bisson

author

2016-11-01 17:10 UTC #13 lore raw

PATCH v2 1/5 ARM: dts: imx: add Boundary Devices Nitrogen6_SOM2 support

SoM based on i.MX6 Quad with 1GB of DDR3.

https://boundarydevices.com/product/nit6x-som-v2/

Signed-off-by Gary Bisson <[email protected]>

---
 arch/arm/boot/dts/Makefile                    |   1 +
 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts    |  53 ++
 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 770 ++++++++++++++++++++++++++
 3 files changed, 824 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi

arch/arm/boot/dts/Makefile +1 -0

index 224e2a5..0572d68 100644
@@ -387,6 +387,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
 	imx6q-marsboard.dtb \
 	imx6q-nitrogen6x.dtb \
 	imx6q-nitrogen6_max.dtb \
+	imx6q-nitrogen6_som2.dtb \
 	imx6q-novena.dtb \
 	imx6q-phytec-pbab01.dtb \
 	imx6q-rex-pro.dtb \

arch/arm/boot/dts/imx6q-nitrogen6_som2.dts new file +53 -0

53 lines not on this page · raw message

arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi new file +770 -0

770 lines not on this page · raw message

Signature · 1 line

2.9.3

Gary Bisson

author

2016-11-01 17:10 UTC #14 lore raw

PATCH v2 2/5 ARM: dts: imx6qdl-sabrelite: use hyphens for nodes name

In reply to Gary Bisson

Also aligning the panel nodes name across all platforms.

Signed-off-by Gary Bisson <[email protected]>

---
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +5 -5

index 81dd6cd..1f9076e 100644
@@ -153,7 +153,7 @@
 		mux-ext-port = <4>;
 	};
 
-	backlight_lcd: backlight_lcd {
+	backlight_lcd: backlight-lcd {
 		compatible = "pwm-backlight";
 		pwms = <&pwm1 0 5000000>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;

@@ -162,7 +162,7 @@
 		status = "okay";
 	};
 
-	backlight_lvds: backlight_lvds {
+	backlight_lvds: backlight-lvds {
 		compatible = "pwm-backlight";
 		pwms = <&pwm4 0 5000000>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;

@@ -197,7 +197,7 @@
 		};
 	};
 
-	lcd_panel {
+	panel-lcd {
 		compatible = "okaya,rs800480t-7x0gp";
 		backlight = <&backlight_lcd>;

@@ -208,7 +208,7 @@
 		};
 	};
 
-	panel {
+	panel-lvds0 {
 		compatible = "hannstar,hsd100pxn1";
 		backlight = <&backlight_lvds>;

@@ -378,7 +378,7 @@
 			>;
 		};
 
-		pinctrl_gpio_keys: gpio_keysgrp {
+		pinctrl_gpio_keys: gpio-keysgrp {
 			fsl,pins = <
 				/* Power Button */
 				MX6QDL_PAD_NANDF_D3__GPIO2_IO03		0x1b0b0

Signature · 1 line

2.9.3

Gary Bisson

author

2016-11-01 17:10 UTC #15 lore raw

PATCH v2 3/5 ARM: dts: imx6qdl-nitrogen6x: use hyphens for nodes name

In reply to Gary Bisson

Also aligning the panel nodes name across all platforms.

Signed-off-by Gary Bisson <[email protected]>

---
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +6 -6

index db868bc..e476d01 100644
@@ -167,7 +167,7 @@
 		mux-ext-port = <3>;
 	};
 
-	backlight_lcd: backlight_lcd {
+	backlight_lcd: backlight-lcd {
 		compatible = "pwm-backlight";
 		pwms = <&pwm1 0 5000000>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;

@@ -176,7 +176,7 @@
 		status = "okay";
 	};
 
-	backlight_lvds: backlight_lvds {
+	backlight_lvds: backlight-lvds {
 		compatible = "pwm-backlight";
 		pwms = <&pwm4 0 5000000>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;

@@ -211,7 +211,7 @@
 		};
 	};
 
-	lcd_panel {
+	panel-lcd {
 		compatible = "okaya,rs800480t-7x0gp";
 		backlight = <&backlight_lcd>;

@@ -222,7 +222,7 @@
 		};
 	};
 
-	panel {
+	panel-lvds0 {
 		compatible = "hannstar,hsd100pxn1";
 		backlight = <&backlight_lvds>;

@@ -413,7 +413,7 @@
 			>;
 		};
 
-		pinctrl_gpio_keys: gpio_keysgrp {
+		pinctrl_gpio_keys: gpio-keysgrp {
 			fsl,pins = <
 				/* Power Button */
 				MX6QDL_PAD_NANDF_D3__GPIO2_IO03		0x1b0b0

@@ -561,7 +561,7 @@
 			>;
 		};
 
-		pinctrl_wlan_vmmc: wlan_vmmcgrp {
+		pinctrl_wlan_vmmc: wlan-vmmcgrp {
 			fsl,pins = <
 				MX6QDL_PAD_NANDF_CS0__GPIO6_IO11	0x100b0
 				MX6QDL_PAD_NANDF_CS2__GPIO6_IO15	0x000b0

Signature · 1 line

2.9.3

Gary Bisson

author

2016-11-01 17:10 UTC #16 lore raw

PATCH v2 4/5 ARM: dts: imx6qdl-nit6xlite: use hyphens for nodes name

In reply to Gary Bisson

Therefore aligning the panel nodes name across all platforms.

Also removing the bt_rfkill node since the mainline rfkill-gpio driver doesn't support device trees.

Signed-off-by Gary Bisson <[email protected]>

---
 arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi +5 ~~-27~~

index 880bd78..63acd54 100644
@@ -97,15 +97,6 @@
 		};
 	};
 
-	bt_rfkill {
-		compatible = "rfkill-gpio";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_bt_rfkill>;
-		gpios = <&gpio6 8 GPIO_ACTIVE_HIGH>;
-		name = "bt_rfkill";
-		type = <2>;
-	};
-
 	gpio-keys {
 		compatible = "gpio-keys";
 		pinctrl-names = "default";

@@ -160,7 +151,7 @@
 		};
 	};
 
-	backlight_lcd {
+	backlight-lcd {
 		compatible = "pwm-backlight";
 		pwms = <&pwm1 0 5000000>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;

@@ -169,7 +160,7 @@
 		status = "okay";
 	};
 
-	backlight_lvds0: backlight_lvds0 {
+	backlight_lvds0: backlight-lvds0 {
 		compatible = "pwm-backlight";
 		pwms = <&pwm4 0 5000000>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;

@@ -178,7 +169,7 @@
 		status = "okay";
 	};
 
-	panel_lvds0 {
+	panel-lvds0 {
 		compatible = "hannstar,hsd100pxn1";
 		backlight = <&backlight_lvds0>;

@@ -328,19 +319,6 @@
 			>;
 		};
 
-		pinctrl_bt_rfkill: bt_rfkillgrp {
-			fsl,pins = <
-				/* BT wake */
-				MX6QDL_PAD_NANDF_D2__GPIO2_IO02		0x1b0b0
-				/* BT reset */
-				MX6QDL_PAD_NANDF_ALE__GPIO6_IO08	0x0b0b0
-				/* BT reg en */
-				MX6QDL_PAD_NANDF_CS2__GPIO6_IO15	0x1b0b0
-				/* BT host wake irq */
-				MX6QDL_PAD_NANDF_CS3__GPIO6_IO16	0x100b0
-			>;
-		};
-
 		pinctrl_ecspi1: ecspi1grp {
 			fsl,pins = <
 				MX6QDL_PAD_EIM_D17__ECSPI1_MISO		0x100b1

@@ -374,7 +352,7 @@
 			>;
 		};
 
-		pinctrl_gpio_keys: gpio_keysgrp {
+		pinctrl_gpio_keys: gpio-keysgrp {
 			fsl,pins = <
 				/* Home Button: J14 pin 5 */
 				MX6QDL_PAD_GPIO_18__GPIO7_IO13		0x1b0b0

@@ -457,7 +435,7 @@
 			>;
 		};
 
-		pinctrl_wlan_vmmc: wlan_vmmcgrp {
+		pinctrl_wlan_vmmc: wlan-vmmcgrp {
 			fsl,pins = <
 				MX6QDL_PAD_NANDF_CLE__GPIO6_IO07	0x030b0
 			>;

Signature · 1 line

2.9.3

Gary Bisson

author

2016-11-01 17:10 UTC #17 lore raw

PATCH v2 5/5 ARM: dts: imx6qdl-nitrogen6_max: use hyphens for nodes name

In reply to Gary Bisson

Therefore aligning the panel nodes name across all platforms.

Signed-off-by Gary Bisson <[email protected]>

---
 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi +9 -9

index b0b3220..34887a1 100644
@@ -229,7 +229,7 @@
 		};
 	};
 
-	backlight_lcd: backlight_lcd {
+	backlight_lcd: backlight-lcd {
 		compatible = "pwm-backlight";
 		pwms = <&pwm1 0 5000000>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;

@@ -238,7 +238,7 @@
 		status = "okay";
 	};
 
-	backlight_lvds0: backlight_lvds0 {
+	backlight_lvds0: backlight-lvds0 {
 		compatible = "pwm-backlight";
 		pwms = <&pwm4 0 5000000>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;

@@ -247,7 +247,7 @@
 		status = "okay";
 	};
 
-	backlight_lvds1: backlight_lvds1 {
+	backlight_lvds1: backlight-lvds1 {
 		compatible = "pwm-backlight";
 		pwms = <&pwm2 0 5000000>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;

@@ -282,7 +282,7 @@
 		};
 	};
 
-	panel_lcd {
+	panel-lcd {
 		compatible = "okaya,rs800480t-7x0gp";
 		backlight = <&backlight_lcd>;

@@ -293,7 +293,7 @@
 		};
 	};
 
-	panel_lvds0 {
+	panel-lvds0 {
 		compatible = "hannstar,hsd100pxn1";
 		backlight = <&backlight_lvds0>;

@@ -304,7 +304,7 @@
 		};
 	};
 
-	panel_lvds1 {
+	panel-lvds1 {
 		compatible = "hannstar,hsd100pxn1";
 		backlight = <&backlight_lvds1>;

@@ -447,7 +447,7 @@
 };
 
 &iomuxc {
-	imx6q-nitrogen6_max {
+	imx6q-nitrogen6-max {
 		pinctrl_audmux: audmuxgrp {
 			fsl,pins = <
 				MX6QDL_PAD_CSI0_DAT7__AUD3_RXD		0x130b0

@@ -504,7 +504,7 @@
 			>;
 		};
 
-		pinctrl_gpio_keys: gpio_keysgrp {
+		pinctrl_gpio_keys: gpio-keysgrp {
 			fsl,pins = <
 				/* Power Button */
 				MX6QDL_PAD_NANDF_D3__GPIO2_IO03		0x1b0b0

@@ -720,7 +720,7 @@
 			>;
 		};
 
-		pinctrl_wlan_vmmc: wlan_vmmcgrp {
+		pinctrl_wlan_vmmc: wlan-vmmcgrp {
 			fsl,pins = <
 				MX6QDL_PAD_NANDF_CS0__GPIO6_IO11	0x100b0
 				MX6QDL_PAD_NANDF_CS2__GPIO6_IO15	0x000b0

Signature · 1 line

2.9.3

Shawn Guo

Applied

2016-11-02 07:40 UTC #18 lore raw

v2 cover ARM: dts: imx: update Boundary Devices boards support

In reply to Gary Bisson

Quoted 6 lines · Gary Bisson

Gary Bisson (5):
ARM: dts: imx: add Boundary Devices Nitrogen6_SOM2 support
ARM: dts: imx6qdl-sabrelite: use hyphens for nodes name
ARM: dts: imx6qdl-nitrogen6x: use hyphens for nodes name
ARM: dts: imx6qdl-nit6xlite: use hyphens for nodes name
ARM: dts: imx6qdl-nitrogen6_max: use hyphens for nodes name

Applied all, thanks.