Update Sabre Lite
Subsystems (3)
cover Update Sabre Lite
This series updates the Sabre Lite board
and then bases a new board Nitrogen6x on it.
Eric Nelson created a web page to show the
differences between the two boards.
http://boundarydevices.com/differences-sabre-lite-nitrogen6x
Troy Kisky (11):
ARM: dts: imx: sabrelite: add dualLite support
ARM: dts: imx6qdl-sabrelite: Add uart1 support
ARM: dts: imx6qdl-sabrelite: remove usdhc4 wp-gpio
ARM: dts: imx6qdl-sabrelite: add comments for pinctrl_hog
ARM: dts: imx6qdl-sabrelite: specify pad settings
ARM: dts: imx6qdl-sabrelite: add gpio-keys
ARM: dts: imx6qdl-sabrelite: add pwms for backlights
ARM: dts: imx6qdl-sabrelite: add skews for Micrel phy
ARM: dts: imx6qdl-sabrelite: fix ENET group
ARM: dts: imx6qdl-sabrelite: Add over-current pin to usbotg
ARM: dts: imx: add nitrogen6x board
arch/arm/boot/dts/Makefile | 3 + arch/arm/boot/dts/imx6dl-nitrogen6x.dts | 22 ++ arch/arm/boot/dts/imx6dl-sabrelite.dts | 20 ++ arch/arm/boot/dts/imx6q-nitrogen6x.dts | 26 +++ arch/arm/boot/dts/imx6q-sabrelite.dts | 214 +---------------- arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 365 +++++++++++++++++++++++++++++ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 366 ++++++++++++++++++++++++++++++ 7 files changed, 803 insertions(+), 213 deletions(-) create mode 100644 arch/arm/boot/dts/imx6dl-nitrogen6x.dts create mode 100644 arch/arm/boot/dts/imx6dl-sabrelite.dts create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6x.dts create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi create mode 100644 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
Signature · 1 line
1.8.1.2
PATCH 1/11 ARM: dts: imx: sabrelite: add Dual Lite/Solo support
This makes the structure of Sabre Lite board files the same as Sabre SD board files so that they are easier to compare.
By this, I mean that the majority of the file imx6q-sabrelite.dts is moved to imx6qdl-sabrelite.dtsi so that both imx6q-sabrelite.dts and imx6dl-sabrelite.dts can include it.
Now Sabre Lite has support for Dual Lite/Solo
processors.
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/imx6dl-sabrelite.dts | 20 ++
arch/arm/boot/dts/imx6q-sabrelite.dts | 214 +--------------------
...{imx6q-sabrelite.dts => imx6qdl-sabrelite.dtsi} | 10 -
4 files changed, 22 insertions(+), 223 deletions(-)
create mode 100644 arch/arm/boot/dts/imx6dl-sabrelite.dts
copy arch/arm/boot/dts/{imx6q-sabrelite.dts => imx6qdl-sabrelite.dtsi} (96%)arch/arm/boot/dts/Makefile +1 -0
@@ -149,6 +149,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6dl-gw53xx.dtb \ imx6dl-gw54xx.dtb \ imx6dl-sabreauto.dtb \ + imx6dl-sabrelite.dtb \ imx6dl-sabresd.dtb \ imx6dl-wandboard.dtb \ imx6q-arm2.dtb \
arch/arm/boot/dts/imx6dl-sabrelite.dts new file +20 -0
@@ -0,0 +1,20 @@ +/* + * Copyright 2011 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd. + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-sabrelite.dtsi" + +/ { + model = "Freescale i.MX6 DualLite SABRE Lite Board"; + compatible = "fsl,imx6dl-sabrelite", "fsl,imx6dl"; +};
arch/arm/boot/dts/imx6q-sabrelite.dts +1 -213
226 lines not on this page · raw message
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi renamed from arch/arm/boot/dts/imx6q-sabrelite.dts +0 -10
@@ -10,13 +10,7 @@ * http://www.gnu.org/copyleft/gpl.html */ -/dts-v1/; -#include "imx6q.dtsi" - / { - model = "Freescale i.MX6 Quad SABRE Lite Board"; - compatible = "fsl,imx6q-sabrelite", "fsl,imx6q"; - memory { reg = <0x10000000 0x40000000>; };
@@ -190,10 +184,6 @@ }; }; -&sata { - status = "okay"; -}; - &ssi1 { fsl,mode = "i2s-slave"; status = "okay";
Signature · 1 line
1.8.1.2
PATCH 1/11 ARM: dts: imx: sabrelite: add Dual Lite/Solo support
Quoted 40 lines · Troy Kisky
This makes the structure of Sabre Lite board files the same as Sabre SD board files so that they are easier to compare.
By this, I mean that the majority of the file
imx6q-sabrelite.dtsis moved toimx6qdl-sabrelite.dtsiso that bothimx6q-sabrelite.dtsandimx6dl-sabrelite.dtscan include it.Now Sabre Lite has support for Dual Lite/Solo
processors.Signed-off-by Troy Kisky <[email protected]>--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx6dl-sabrelite.dts | 20 ++ arch/arm/boot/dts/imx6q-sabrelite.dts | 214 +-------------------- ...{imx6q-sabrelite.dts => imx6qdl-sabrelite.dtsi} | 10 - 4 files changed, 22 insertions(+), 223 deletions(-) create mode 100644 arch/arm/boot/dts/imx6dl-sabrelite.dts copy arch/arm/boot/dts/{imx6q-sabrelite.dts => imx6qdl-sabrelite.dtsi}(96%)
arch/arm/boot/dts/Makefile +1
-0@@ -149,6 +149,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6dl-gw53xx.dtb \ imx6dl-gw54xx.dtb \ imx6dl-sabreauto.dtb \ + imx6dl-sabrelite.dtb \ imx6dl-sabresd.dtb \ imx6dl-wandboard.dtb \ imx6q-arm2.dtb \(quoted diff) +0
-0
b/arch/arm/boot/dts/imx6dl-sabrelite.dtsnew file mode 100644 index 0000000..2de0447
arch/arm/boot/dts/imx6dl-sabrelite.dts line 3
Quoted 3 lines
arch/arm/boot/dts/imx6dl-sabrelite.dts new file +3
-0@@ -0,0 +1,20 @@ +/* + * Copyright 2011 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd.
Are you sure about this copyright message ? Isn't this copyright BD ?
Otherwise,
Best regards,
Marek Vasut
PATCH 1/11 ARM: dts: imx: sabrelite: add Dual Lite/Solo support
Quoted 46 lines · Marek Vasut
Quoted 40 lines · Troy Kisky
This makes the structure of Sabre Lite board files the same as Sabre SD board files so that they are easier to compare.
By this, I mean that the majority of the file
imx6q-sabrelite.dtsis moved toimx6qdl-sabrelite.dtsiso that bothimx6q-sabrelite.dtsandimx6dl-sabrelite.dtscan include it.Now Sabre Lite has support for Dual Lite/Solo
processors.Signed-off-by Troy Kisky <[email protected]>--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx6dl-sabrelite.dts | 20 ++ arch/arm/boot/dts/imx6q-sabrelite.dts | 214 +-------------------- ...{imx6q-sabrelite.dts => imx6qdl-sabrelite.dtsi} | 10 - 4 files changed, 22 insertions(+), 223 deletions(-)create mode 100644
arch/arm/boot/dts/imx6dl-sabrelite.dtscopyarch/arm/boot/dts/{imx6q-sabrelite.dts=>imx6qdl-sabrelite.dtsi}
(96%)arch/arm/boot/dts/Makefile +1
-0@@ -149,6 +149,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6dl-gw53xx.dtb \ imx6dl-gw54xx.dtb \ imx6dl-sabreauto.dtb \ + imx6dl-sabrelite.dtb \ imx6dl-sabresd.dtb \ imx6dl-wandboard.dtb \ imx6q-arm2.dtb \(quoted diff) +0
-0
b/arch/arm/boot/dts/imx6dl-sabrelite.dtsnew file mode 100644 index 0000000..2de0447arch/arm/boot/dts/imx6dl-sabrelite.dts line 3
Quoted 3 lines
arch/arm/boot/dts/imx6dl-sabrelite.dts new file +3
-0@@ -0,0 +1,20 @@ +/* + * Copyright 2011 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd.Are you sure about this copyright message ? Isn't this copyright BD ?
Quoted 7 lines
Otherwise,
Reviewed-by Marek Vasut <[email protected]>Best regards,
Marek Vasut
Maybe, but the following change doesn't seem worthy of a copyright
linux-imx6/arch/arm/boot/dts$ diff -u imx6q-sabrelite.dts imx6dl-sabrelite.dts
imx6dl-sabrelite.dts 2013-12-12 11:22:10.156010652 -0700 renamed from imx6q-sabrelite.dts 2013-12-12 11:22:10.156010652 -0700 +3 -7
@@ -11,14 +11,10 @@ */ /dts-v1/; -#include "imx6q.dtsi" +#include "imx6dl.dtsi" #include "imx6qdl-sabrelite.dtsi" / { - model = "Freescale i.MX6 Quad SABRE Lite Board"; - compatible = "fsl,imx6q-sabrelite", "fsl,imx6q"; -}; - -&sata { - status = "okay"; + model = "Freescale i.MX6 DualLite SABRE Lite Board"; + compatible = "fsl,imx6dl-sabrelite", "fsl,imx6dl"; };
_______
Perhaps I should add a copyright to both?
Troy
PATCH 1/11 ARM: dts: imx: sabrelite: add Dual Lite/Solo support
Quoted 90 lines · Troy Kisky
Quoted 56 lines · Marek Vasut
Quoted 49 lines · Troy Kisky
This makes the structure of Sabre Lite board files the same as Sabre SD board files so that they are easier to compare.
By this, I mean that the majority of the file
imx6q-sabrelite.dtsis moved toimx6qdl-sabrelite.dtsiso that bothimx6q-sabrelite.dtsandimx6dl-sabrelite.dtscan include it.Now Sabre Lite has support for Dual Lite/Solo
processors.Signed-off-by Troy Kisky <[email protected]>---
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx6dl-sabrelite.dts | 20 ++ arch/arm/boot/dts/imx6q-sabrelite.dts | 214+-------------------- ...{imx6q-sabrelite.dts => imx6qdl-sabrelite.dtsi} |10 -
4 files changed, 22 insertions(+), 223 deletions(-)create mode 100644
arch/arm/boot/dts/imx6dl-sabrelite.dtscopyarch/arm/boot/dts/{imx6q-sabrelite.dts=>imx6qdl-sabrelite.dtsi}(96%)
arch/arm/boot/dts/Makefile +1
-0@@ -149,6 +149,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6dl-gw53xx.dtb \ imx6dl-gw54xx.dtb \ imx6dl-sabreauto.dtb \ + imx6dl-sabrelite.dtb \imx6dl-sabresd.dtb \ imx6dl-wandboard.dtb \ imx6q-arm2.dtb \(quoted diff) +0
-0
b/arch/arm/boot/dts/imx6dl-sabrelite.dtsnew file mode 100644 index 0000000..2de0447arch/arm/boot/dts/imx6dl-sabrelite.dts line 3
Quoted 3 lines
arch/arm/boot/dts/imx6dl-sabrelite.dts new file +3
-0@@ -0,0 +1,20 @@ +/* + * Copyright 2011 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd.Are you sure about this copyright message ? Isn't this copyright BD ?
Quoted 6 lines
Otherwise,
Reviewed-by Marek Vasut <[email protected]>Best regards,
Marek VasutMaybe, but the following change doesn't seem worthy of a copyright
linux-imx6/arch/arm/boot/dts$ diff -u
imx6q-sabrelite.dtsimx6dl-sabrelite.dtsimx6dl-sabrelite.dts 2013-12-12 11:22:10.156010652 -0700 renamed from imx6q-sabrelite.dts 2013-12-12 11:22:10.156010652 -0700 +3
-7@@ -11,14 +11,10 @@ */ /dts-v1/; -#include "imx6q.dtsi" +#include "imx6dl.dtsi" #include "imx6qdl-sabrelite.dtsi" / { - model = "Freescale i.MX6 Quad SABRE Lite Board"; - compatible = "fsl,imx6q-sabrelite", "fsl,imx6q"; -}; - -&sata { - status = "okay"; + model = "Freescale i.MX6 DualLite SABRE Lite Board"; + compatible = "fsl,imx6dl-sabrelite", "fsl,imx6dl"; };_______
Quoted 1 line
Perhaps I should add a copyright to both?
I'm no lawyer, I cannot give you an authoritative advice in this, sorry.
PATCH 2/11 ARM: dts: imx6qdl-sabrelite: Add uart1 support
In reply to Troy KiskyUart1 is available on Sabre Lite.
--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +10 -0
@@ -141,6 +141,10 @@ fsl,pins = <MX6QDL_I2C1_PINGRP1>; }; + pinctrl_uart1: uart1grp { + fsl,pins = <MX6QDL_UART1_PINGRP2>; + }; + pinctrl_uart2: uart2grp { fsl,pins = <MX6QDL_UART2_PINGRP1>; };
@@ -189,6 +193,12 @@ status = "okay"; }; +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; + status = "okay"; +}; + &uart2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>;
Signature · 1 line
1.8.1.2
PATCH 2/11 ARM: dts: imx6qdl-sabrelite: Add uart1 support
Quoted 3 lines · Troy Kisky
Uart1 is available on Sabre Lite.
Signed-off-by Troy Kisky <[email protected]>
Best regards,
Marek Vasut
PATCH 3/11 ARM: dts: imx6qdl-sabrelite: remove usdhc4 wp-gpio
In reply to Troy KiskyOn Sabre Lite usdhc4 is a micro sd slot, which has no write protect.
--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 -- 1 file changed, 2 deletions(-)
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +0 -2
@@ -115,7 +115,6 @@ pinctrl_hog: hoggrp { fsl,pins = < MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000 - MX6QDL_PAD_NANDF_D7__GPIO2_IO07 0x80000000 MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000
@@ -230,7 +229,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc4>; cd-gpios = <&gpio2 6 0>; - wp-gpios = <&gpio2 7 0>; vmmc-supply = <®_3p3v>; status = "okay"; };
Signature · 1 line
1.8.1.2
PATCH 3/11 ARM: dts: imx6qdl-sabrelite: remove usdhc4 wp-gpio
Quoted 4 lines · Troy Kisky
On Sabre Lite usdhc4 is a micro sd slot, which has no write protect.
Signed-off-by Troy Kisky <[email protected]>
Visually confirmed ;-)
Best regards,
Marek Vasut
PATCH 3/11 ARM: dts: imx6qdl-sabrelite: remove usdhc4 wp-gpio
In reply to Troy KiskyQuoted 4 lines · Troy Kisky
On Sabre Lite usdhc4 is a micro sd slot, which has no write protect.
Signed-off-by Troy Kisky <[email protected]>
Applied #1, #2 and #3, thanks.
Shawn
Quoted 27 lines
--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 -- 1 file changed, 2 deletions(-)arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +0
-2@@ -115,7 +115,6 @@ pinctrl_hog: hoggrp { fsl,pins = < MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000 - MX6QDL_PAD_NANDF_D7__GPIO2_IO07 0x80000000 MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000@@ -230,7 +229,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc4>; cd-gpios = <&gpio2 6 0>; - wp-gpios = <&gpio2 7 0>; vmmc-supply = <®_3p3v>; status = "okay"; };Signature · 1 line
1.8.1.2
PATCH 3/11 ARM: dts: imx6qdl-sabrelite: remove usdhc4 wp-gpio
Quoted 10 lines · Shawn Guo
Quoted 4 lines · Troy Kisky
On Sabre Lite usdhc4 is a micro sd slot, which has no write protect.
Signed-off-by Troy Kisky <[email protected]>Applied #1, #2 and #3, thanks.
Shawn
Thanks for the rebase on Marek's PCIe patch. However, PCIe is a common feature
and should be moved to imx6qdl-sabrelite.dtsi.
Should I send a patch to do this, or will you fix it up, or will Marek?
Thanks
Troy
PATCH 3/11 ARM: dts: imx6qdl-sabrelite: remove usdhc4 wp-gpio
Quoted 9 lines · Troy Kisky
Quoted 8 lines · Shawn Guo
Quoted 4 lines · Troy Kisky
On Sabre Lite usdhc4 is a micro sd slot, which has no write protect.
Signed-off-by Troy Kisky <[email protected]>Applied #1, #2 and #3, thanks.
Quoted 7 lines
Quoted 1 line
Shawn
Thanks for the rebase on Marek's PCIe patch. However, PCIe is a common feature
and should be moved toimx6qdl-sabrelite.dtsi.Should I send a patch to do this, or will you fix it up, or will Marek?
I will gladly let such a privilege slip, I am overloaded like hell :(
Best regards,
Marek Vasut
PATCH 3/11 ARM: dts: imx6qdl-sabrelite: remove usdhc4 wp-gpio
Quoted 14 lines · Marek Vasut
Quoted 13 lines · Troy Kisky
Quoted 8 lines · Shawn Guo
Quoted 4 lines · Troy Kisky
On Sabre Lite usdhc4 is a micro sd slot, which has no write protect.
Signed-off-by Troy Kisky <[email protected]>Applied #1, #2 and #3, thanks.
Shawn
Thanks for the rebase on Marek's PCIe patch. However, PCIe is a common feature
and should be moved toimx6qdl-sabrelite.dtsi.
Quoted 6 lines
Quoted 1 line
Should I send a patch to do this, or will you fix it up, or will Marek?
I will gladly let such a privilege slip, I am overloaded like hell :(
Best regards,
Marek Vasut
I have loads of time:-) and will send a new series which includes it.
Thanks
Troy
PATCH 4/11 ARM: dts: imx6qdl-sabrelite: add comments for pinctrl_hog
In reply to Troy KiskyAdd a comment to tell the purpose of each pin. This makes it easy to tell if it should go somewhere else. i.e. the spi-nor cs could be put with pinctrl_ecspi1.
--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +7 -7
@@ -114,13 +114,13 @@ imx6q-sabrelite { pinctrl_hog: hoggrp { fsl,pins = < - MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000 - MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 - MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 - MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000 - MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x80000000 - MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 - MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x80000000 +/* uSDHC4 CD */ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000 +/* spi-nor CS */ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 +/* otg power en */ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 +/* ethernet phy reset */ MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000 +/* USDHC3 CD */ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x80000000 +/* USDHC3 WP */ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 +/* SGTL5000 sys_mclk */ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x80000000 >; };
Signature · 1 line
1.8.1.2
PATCH 4/11 ARM: dts: imx6qdl-sabrelite: add comments for pinctrl_hog
Quoted 21 lines · Troy Kisky
Add a comment to tell the purpose of each pin. This makes it easy to tell if it should go somewhere else. i.e. the spi-nor cs could be put with
pinctrl_ecspi1.Signed-off-by Troy Kisky <[email protected]>--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)(quoted diff) +0
-0
b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsiindex c4aa504..be899d3 100644arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +0
-4@@ -114,13 +114,13 @@ imx6q-sabrelite { pinctrl_hog: hoggrp { fsl,pins = < - MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000 - MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 - MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 - MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi line 123
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +7
-3- MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x80000000 - MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 - MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x80000000 +/* uSDHC4 CD */ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000 +/* spi-nor CS */ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 +/* otg power en */ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 +/* ethernet phy reset */ MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000 +/* USDHC3 CD */ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x80000000 +/* USDHC3 WP */ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 +/* SGTL5000 sys_mclk */ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x80000000
Can you please place the comments past the pin instead of in front of it? If they don't fit, place the comment above the pin then.
Placing the comment before the pin name seems really strange to me.
Best regards,
Marek Vasut
PATCH 4/11 ARM: dts: imx6qdl-sabrelite: add comments for pinctrl_hog
In reply to Troy KiskyQuoted 15 lines · Troy Kisky
Add a comment to tell the purpose of each pin. This makes it easy to tell if it should go somewhere else. i.e. the spi-nor cs could be put with
pinctrl_ecspi1.Signed-off-by Troy Kisky <[email protected]>--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +0
-0@@ -114,13 +114,13 @@ imx6q-sabrelite {
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi line 117
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +1
-7pinctrl_hog: hoggrp { fsl,pins = < - MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000 - MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 - MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 - MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000 - MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x80000000 - MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 - MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x80000000 +/* uSDHC4 CD */ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000
After we move to board specific pingrp, it might be easier to move the device related pin into corresponding pingrp and limit the hoggrp to hold those truly non-owner pins. For this uSDHC4 CD example, it will be something like below.
pinctrl_usdhc4: usdhc4grp {
fsl,pins = <
MX6QDL_USDHC4_PINGRP_D4
MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000 /* CD */
>;
};Shawn
Quoted 12 lines
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +6
-0+/* spi-nor CS */ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 +/* otg power en */ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 +/* ethernet phy reset */ MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000 +/* USDHC3 CD */ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x80000000 +/* USDHC3 WP */ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 +/* SGTL5000 sys_mclk */ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x80000000 >; };Signature · 1 line
1.8.1.2
PATCH 5/11 ARM: dts: imx6qdl-sabrelite: specify pad settings
In reply to Troy KiskyDon't use 0x80000000 to get default pad settings.
--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +7 -7
@@ -114,13 +114,13 @@ imx6q-sabrelite { pinctrl_hog: hoggrp { fsl,pins = < -/* uSDHC4 CD */ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000 -/* spi-nor CS */ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 -/* otg power en */ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 -/* ethernet phy reset */ MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000 -/* USDHC3 CD */ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x80000000 -/* USDHC3 WP */ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 -/* SGTL5000 sys_mclk */ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x80000000 +/* uSDHC4 CD */ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x1b0b0 +/* spi-nor CS */ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x1b0b0 +/* otg power en */ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0 +/* ethernet phy reset */ MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x000b0 +/* USDHC3 CD */ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0 +/* USDHC3 WP */ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 +/* SGTL5000 sys_mclk */ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x000b0 >; };
Signature · 1 line
1.8.1.2
PATCH 5/11 ARM: dts: imx6qdl-sabrelite: specify pad settings
Quoted 1 line · Troy Kisky
Don't use
0x80000000to get default pad settings.
What is the rationale behind this change please? Can you explain more in detail?
Quoted 11 lines
Signed-off-by Troy Kisky <[email protected]>--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)(quoted diff) +0
-0
b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsiindex be899d3..b548647 100644arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +0
-0@@ -114,13 +114,13 @@ imx6q-sabrelite {
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi line 117
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +1
-7pinctrl_hog: hoggrp { fsl,pins = < -/* uSDHC4 CD */ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000 -/* spi-nor CS */ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 -/* otg power en */ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 -/* ethernet phy reset */ MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000 -/* USDHC3 CD */ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x80000000 -/* USDHC3 WP */ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 -/* SGTL5000 sys_mclk */ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x80000000 +/* uSDHC4 CD */ MX6QDL_PAD_NANDF_D6__GPIO2_IO06
0x1b0b0
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi line 118
Quoted 1 line
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +1
-0+/* spi-nor CS */ MX6QDL_PAD_EIM_D19__GPIO3_IO19
0x1b0b0
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi line 119
Quoted 1 line
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +1
-0+/* otg power en */ MX6QDL_PAD_EIM_D22__GPIO3_IO22
0x1b0b0
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi line 120
Quoted 1 line
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +1
-0+/* ethernet phy reset */ MX6QDL_PAD_EIM_D23__GPIO3_IO23
0x000b0
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi line 121
Quoted 1 line
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +1
-0+/* USDHC3 CD */ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00
0x1b0b0
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi line 122
Quoted 1 line
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +1
-0+/* USDHC3 WP */ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01
0x1f0b0
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi line 123
Quoted 1 line
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +1
-0+/* SGTL5000 sys_mclk */ MX6QDL_PAD_GPIO_0__CCM_CLKO1
0x000b0
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi line 126
Quoted 4 lines
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +0
-0>; };
Best regards,
Marek Vasut
PATCH 5/11 ARM: dts: imx6qdl-sabrelite: specify pad settings
Quoted 4 lines · Marek Vasut
Quoted 1 line · Troy Kisky
Don't use
0x80000000to get default pad settings.What is the rationale behind this change please? Can you explain more in detail?
No real need, but I thought relying on what the boot loader did or did not do
was discouraged?
What is the value in not explicitly setting the pad registers?
Btw, I need to rebase series on your patch anyway so omitting this patch would be easy.
Thanks
Troy
PATCH 5/11 ARM: dts: imx6qdl-sabrelite: specify pad settings
Quoted 10 lines · Troy Kisky
Quoted 5 lines · Marek Vasut
Quoted 1 line · Troy Kisky
Don't use
0x80000000to get default pad settings.What is the rationale behind this change please? Can you explain more in detail?
No real need, but I thought relying on what the boot loader did or did not do
was discouraged?
Full ACK on this, we do not rely on bootloader configuration (though these two should be in-line).
Quoted 1 line
What is the value in not explicitly setting the pad registers?
My question was in the direction of "why do you need to change the pin configuration values from the current ones?". This is what I want to understand.
Quoted 2 lines
Btw, I need to rebase series on your patch anyway so omitting this patch would be easy.
I am not saying to omit it, please do not misunderstand me. I am just wondering why the change from 0x80000000 to 0x1b0b0 .
Best regards,
Marek Vasut
PATCH 5/11 ARM: dts: imx6qdl-sabrelite: specify pad settings
Quoted 16 lines · Marek Vasut
Quoted 8 lines · Troy Kisky
Quoted 4 lines · Marek Vasut
Quoted 1 line · Troy Kisky
Don't use
0x80000000to get default pad settings.What is the rationale behind this change please? Can you explain more in detail?
No real need, but I thought relying on what the boot loader did or did not do
was discouraged?Full ACK on this, we do not rely on bootloader configuration (though these two should be in-line).
Quoted 1 line
What is the value in not explicitly setting the pad registers?
My question was in the direction of "why do you need to change the pin configuration values from the current ones?". This is what I want to understand.
Quoted 8 lines
Quoted 2 lines
Btw, I need to rebase series on your patch anyway so omitting this patch would be easy.
I am not saying to omit it, please do not misunderstand me. I am just wondering why the change from
0x80000000to0x1b0b0.Best regards,
Marek Vasut
O.K., I'll change the commit log to say exact what is changing, since it is very hard to tell
from the patch. I should have done that without needing the prompt :-)
Thanks
Troy
PATCH 5/11 ARM: dts: imx6qdl-sabrelite: specify pad settings
Quoted 28 lines · Troy Kisky
Quoted 27 lines · Marek Vasut
Quoted 10 lines · Troy Kisky
Quoted 5 lines · Marek Vasut
Quoted 1 line · Troy Kisky
Don't use
0x80000000to get default pad settings.What is the rationale behind this change please? Can you explain more in detail?
No real need, but I thought relying on what the boot loader did or did not do
was discouraged?Full ACK on this, we do not rely on bootloader configuration (though these two should be in-line).
Quoted 1 line
What is the value in not explicitly setting the pad registers?
My question was in the direction of "why do you need to change the pin configuration values from the current ones?". This is what I want to understand.
Quoted 2 lines
Btw, I need to rebase series on your patch anyway so omitting this patch would be easy.
I am not saying to omit it, please do not misunderstand me. I am just wondering why the change from
0x80000000to0x1b0b0.
Quoted 6 lines
Quoted 2 lines
Best regards,
Marek VasutO.K., I'll change the commit log to say exact what is changing, since it is very hard to tell
from the patch. I should have done that without needing the prompt :-)
I am trying to understand what happens here hardware-wise. Is the signal on the pins better with this change or what ?
Best regards,
Marek Vasut
PATCH 5/11 ARM: dts: imx6qdl-sabrelite: specify pad settings
In reply to Marek VasutQuoted 17 lines · Marek Vasut
Quoted 10 lines · Troy Kisky
Quoted 5 lines · Marek Vasut
Quoted 1 line · Troy Kisky
Don't use
0x80000000to get default pad settings.What is the rationale behind this change please? Can you explain more in detail?
No real need, but I thought relying on what the boot loader did or did not do
was discouraged?Full ACK on this, we do not rely on bootloader configuration (though these two should be in-line).
Quoted 1 line
What is the value in not explicitly setting the pad registers?
Quoted 8 lines
My question was in the direction of "why do you need to change the pin configuration values from the current ones?". This is what I want to understand.
Quoted 2 lines
Btw, I need to rebase series on your patch anyway so omitting this patch would be easy.
I am not saying to omit it, please do not misunderstand me. I am just wondering why the change from
0x80000000to0x1b0b0.
Per Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt,
Bits used for CONFIG:
NO_PAD_CTL(1 << 31): indicate this pin does not need config.
0x80000000 tells pinctrl driver to not touch pad config register@all. In that case, the configuration of the pad will be what boot loader configures or just the reset value.
Explicitly putting a proper pad config value instead of 0x80000000 should be something we encourage.
Shawn
PATCH 5/11 ARM: dts: imx6qdl-sabrelite: specify pad settings
Quoted 33 lines · Shawn Guo
Quoted 21 lines · Marek Vasut
Quoted 10 lines · Troy Kisky
Quoted 5 lines · Marek Vasut
Quoted 1 line · Troy Kisky
Don't use
0x80000000to get default pad settings.What is the rationale behind this change please? Can you explain more in detail?
No real need, but I thought relying on what the boot loader did or did not do
was discouraged?Full ACK on this, we do not rely on bootloader configuration (though these two should be in-line).
Quoted 1 line
What is the value in not explicitly setting the pad registers?
My question was in the direction of "why do you need to change the pin configuration values from the current ones?". This is what I want to understand.
Quoted 5 lines
Quoted 2 lines
Btw, I need to rebase series on your patch anyway so omitting this patch would be easy.
I am not saying to omit it, please do not misunderstand me. I am just wondering why the change from
0x80000000to0x1b0b0.Per
Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt,Bits used for CONFIG:
NO_PAD_CTL(1 << 31): indicate this pin does not need config.
Quoted 6 lines
0x80000000tells pinctrl driver to not touch pad config register at all. In that case, the configuration of the pad will be what boot loader configures or just the reset value.Explicitly putting a proper pad config value instead of
0x80000000should be something we encourage.
Gotcha, thanks!
Best regards,
Marek Vasut
PATCH 6/11 ARM: dts: imx6qdl-sabrelite: add gpio-keys
In reply to Troy KiskyAdd power, menu, home, back, volume up, and volume down buttons.
--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 47 ++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +47 -0
@@ -9,6 +9,7 @@ * http://www.opensource.org/licenses/gpl-license.html * http://www.gnu.org/copyleft/gpl.html */ +#include <dt-bindings/gpio/gpio.h> / { memory {
@@ -49,6 +50,46 @@ }; }; + gpio-keys { + compatible = "gpio-keys"; + power { + label = "Power Button"; + gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; + linux,code = <116>; /* KEY_POWER, or search */ + gpio-key,wakeup; + }; + + menu { + label = "Menu"; + gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; + linux,code = <139>; /* KEY_MENU */ + }; + + home { + label = "Home"; + gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; + linux,code = <102>; /* KEY_HOME */ + }; + + back { + label = "Back"; + gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; + linux,code = <158>; /* KEY_BACK */ + }; + + volume-up { + label = "Volume Up"; + gpios = <&gpio7 13 GPIO_ACTIVE_LOW>; + linux,code = <115>; /* KEY_VOLUMEUP */ + }; + + volume-down { + label = "Volume Down"; + gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; + linux,code = <114>; /* KEY_VOLUMEDOWN */ + }; + }; + sound { compatible = "fsl,imx6q-sabrelite-sgtl5000", "fsl,imx-audio-sgtl5000";
@@ -121,6 +162,12 @@ /* USDHC3 CD */ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0 /* USDHC3 WP */ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 /* SGTL5000 sys_mclk */ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x000b0 +/* Power Button */ MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0 +/* Menu Button */ MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x1b0b0 +/* Home Button */ MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x1b0b0 +/* Back Button */ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0 +/* Volume Up Button */ MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x1b0b0 +/* Volume Down Button */ MX6QDL_PAD_GPIO_19__GPIO4_IO05 0x1b0b0 >; };
Signature · 1 line
1.8.1.2
PATCH 6/11 ARM: dts: imx6qdl-sabrelite: add gpio-keys
Quoted 4 lines · Troy Kisky
Add power, menu, home, back, volume up, and volume down buttons.
Signed-off-by Troy Kisky <[email protected]>
Are these really present on the board or are they on some expansion board? I am not sure how to handle this case when the GPIO buttons are on optional expansion board, maybe someone else (Shawn?) will help here.
Best regards,
Marek Vasut
PATCH 6/11 ARM: dts: imx6qdl-sabrelite: add gpio-keys
Quoted 4 lines · Marek Vasut
Quoted 3 lines · Troy Kisky
Add power, menu, home, back, volume up, and volume down buttons.
Quoted 8 lines
Quoted 1 line
Signed-off-by Troy Kisky <[email protected]>Are these really present on the board or are they on some expansion board? I am not sure how to handle this case when the GPIO buttons are on optional expansion board, maybe someone else (Shawn?) will help here.
Best regards,
Marek Vasut
You are right, it is an expansion board. But the signals do not conflict with any other
expansion board that I know of.
Troy
PATCH 6/11 ARM: dts: imx6qdl-sabrelite: add gpio-keys
Quoted 11 lines · Troy Kisky
Quoted 10 lines · Marek Vasut
Quoted 4 lines · Troy Kisky
Add power, menu, home, back, volume up, and volume down buttons.
Signed-off-by Troy Kisky <[email protected]>Are these really present on the board or are they on some expansion board? I am not sure how to handle this case when the GPIO buttons are on optional expansion board, maybe someone else (Shawn?) will help here.
Quoted 6 lines
Quoted 2 lines
Best regards,
Marek VasutYou are right, it is an expansion board. But the signals do not conflict with any other
expansion board that I know of.
... yet ;-)
Best regards,
Marek Vasut
PATCH 6/11 ARM: dts: imx6qdl-sabrelite: add gpio-keys
Hi Marek,
Quoted 12 lines · Marek Vasut
Quoted 11 lines · Troy Kisky
Quoted 10 lines · Marek Vasut
Quoted 4 lines · Troy Kisky
Add power, menu, home, back, volume up, and volume down buttons.
Signed-off-by Troy Kisky <[email protected]>Are these really present on the board or are they on some expansion board? I am not sure how to handle this case when the GPIO buttons are on optional expansion board, maybe someone else (Shawn?) will help here.
Quoted 9 lines
Quoted 6 lines
Quoted 2 lines
Best regards,
Marek VasutYou are right, it is an expansion board. But the signals do not conflict with any other
expansion board that I know of.... yet ;-)
I know of a dozen or so folks who are re-purposing these pins (that's the thing about GPIOs!), but in many cases, they're doing so by catching the input events matched as this patch defines them .
And since this is how the schematics and hardware manuals label the pins, this is the proper way to handle them in the default kernel.
Regards,
Eric
PATCH 6/11 ARM: dts: imx6qdl-sabrelite: add gpio-keys
Quoted 25 lines · Eric Nelson
Hi Marek,
Quoted 13 lines · Marek Vasut
Quoted 12 lines · Troy Kisky
Quoted 11 lines · Marek Vasut
Quoted 4 lines · Troy Kisky
Add power, menu, home, back, volume up, and volume down buttons.
Signed-off-by Troy Kisky <[email protected]>Are these really present on the board or are they on some expansion board? I am not sure how to handle this case when the GPIO buttons are on optional expansion board, maybe someone else (Shawn?) will help here.
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
Best regards,
Marek VasutYou are right, it is an expansion board. But the signals do not conflict with any other
expansion board that I know of.... yet ;-)
Quoted 8 lines
I know of a dozen or so folks who are re-purposing these pins (that's the thing about GPIOs!), but in many cases, they're doing so by catching the input events matched as this patch defines them .
And since this is how the schematics and hardware manuals label the pins, this is the proper way to handle them in the default kernel.
OK, I won't pester you about this.
Best regards,
Marek Vasut
PATCH 6/11 ARM: dts: imx6qdl-sabrelite: add gpio-keys
In reply to Troy KiskyQuoted 21 lines · Troy Kisky
Add power, menu, home, back, volume up, and volume down buttons.
Signed-off-by Troy Kisky <[email protected]>--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 47 ++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +1
-0@@ -9,6 +9,7 @@ * http://www.opensource.org/licenses/gpl-license.html * http://www.gnu.org/copyleft/gpl.html */ +#include <dt-bindings/gpio/gpio.h> / { memory {
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi line 54
Quoted 5 lines
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +2
-0@@ -49,6 +50,46 @@ }; }; + gpio-keys { + compatible = "gpio-keys";
Nit: add a blank line here.
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi line 58
Quoted 4 lines
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +4
-0+ power { + label = "Power Button"; + gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; + linux,code = <116>; /* KEY_POWER, or search */
Please use the macros defined in include/dt-bindings/input/input.h, so that you can save the comment for that number.
Shawn
Quoted 53 lines
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +40
-0+ gpio-key,wakeup; + }; + + menu { + label = "Menu"; + gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; + linux,code = <139>; /* KEY_MENU */ + }; + + home { + label = "Home"; + gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; + linux,code = <102>; /* KEY_HOME */ + }; + + back { + label = "Back"; + gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; + linux,code = <158>; /* KEY_BACK */ + }; + + volume-up { + label = "Volume Up"; + gpios = <&gpio7 13 GPIO_ACTIVE_LOW>; + linux,code = <115>; /* KEY_VOLUMEUP */ + }; + + volume-down { + label = "Volume Down"; + gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; + linux,code = <114>; /* KEY_VOLUMEDOWN */ + }; + }; + sound { compatible = "fsl,imx6q-sabrelite-sgtl5000", "fsl,imx-audio-sgtl5000";@@ -121,6 +162,12 @@ /* USDHC3 CD */ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0 /* USDHC3 WP */ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 /* SGTL5000 sys_mclk */ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x000b0 +/* Power Button */ MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0 +/* Menu Button */ MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x1b0b0 +/* Home Button */ MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x1b0b0 +/* Back Button */ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0 +/* Volume Up Button */ MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x1b0b0 +/* Volume Down Button */ MX6QDL_PAD_GPIO_19__GPIO4_IO05 0x1b0b0 >; };Signature · 1 line
1.8.1.2
PATCH 7/11 ARM: dts: imx6qdl-sabrelite: add pwms for backlights
In reply to Troy Kiskyadd pwm1 for lcd backlight
add pwm4 for lvds backlight
add pwm3 for ov5640 mipi clock
--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 54 ++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+)
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +54 -0
@@ -103,6 +103,24 @@ mux-int-port = <1>; mux-ext-port = <4>; }; + + backlight_lcd { + compatible = "pwm-backlight"; + pwms = <&pwm1 0 5000000>; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <7>; + power-supply = <®_3p3v>; + status = "okay"; + }; + + backlight_lvds { + compatible = "pwm-backlight"; + pwms = <&pwm4 0 5000000>; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <7>; + power-supply = <®_3p3v>; + status = "okay"; + }; }; &audmux {
@@ -187,6 +205,24 @@ fsl,pins = <MX6QDL_I2C1_PINGRP1>; }; + pinctrl_pwm1: pwm1grp { + fsl,pins = < + MX6QDL_PAD_SD1_DAT3__PWM1_OUT 0x1b0b1 + >; + }; + + pinctrl_pwm3: pwm3grp { + fsl,pins = < + MX6QDL_PAD_SD1_DAT1__PWM3_OUT 0x1b0b1 + >; + }; + + pinctrl_pwm4: pwm4grp { + fsl,pins = < + MX6QDL_PAD_SD1_CMD__PWM4_OUT 0x1b0b1 + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = <MX6QDL_UART1_PINGRP2>; };
@@ -234,6 +270,24 @@ }; }; +&pwm1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm1>; + status = "okay"; +}; + +&pwm3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm3>; + status = "okay"; +}; + +&pwm4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm4>; + status = "okay"; +}; + &ssi1 { fsl,mode = "i2s-slave"; status = "okay";
Signature · 1 line
1.8.1.2
PATCH 7/11 ARM: dts: imx6qdl-sabrelite: add pwms for backlights
Quoted 3 lines · Troy Kisky
add pwm1 for lcd backlight
add pwm4 for lvds backlight
add pwm3 for ov5640 mipi clock
The camera needs a PWM ? I am a little surprised by such a design, but I might just be lacking knowledge.
Best regards,
Marek Vasut
PATCH 7/11 ARM: dts: imx6qdl-sabrelite: add pwms for backlights
Hi Marek,
Quoted 8 lines · Marek Vasut
Quoted 3 lines · Troy Kisky
add pwm1 for lcd backlight
add pwm4 for lvds backlight
add pwm3 for ov5640 mipi clockThe camera needs a PWM ? I am a little surprised by such a design, but I might just be lacking knowledge.
The PWM is used to provide a clock to the camera (with a constant 50% duty cycle).
We do the same with our parallel camera interface, avoiding external oscillators.
Regards,
Eric
PATCH 8/11 ARM: dts: imx6qdl-sabrelite: add skews for Micrel phy
In reply to Troy KiskySet the data delays to min, and clock delays to max because the traces are equal length on pcb.
--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +12 -0
@@ -148,6 +148,18 @@ pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii"; phy-reset-gpios = <&gpio3 23 0>; + txen-skew-ps = <0>; + txc-skew-ps = <3000>; + rxdv-skew-ps = <0>; + rxc-skew-ps = <3000>; + rxd0-skew-ps = <0>; + rxd1-skew-ps = <0>; + rxd2-skew-ps = <0>; + rxd3-skew-ps = <0>; + txd0-skew-ps = <0>; + txd1-skew-ps = <0>; + txd2-skew-ps = <0>; + txd3-skew-ps = <0>; status = "okay"; };
Signature · 1 line
1.8.1.2
PATCH 8/11 ARM: dts: imx6qdl-sabrelite: add skews for Micrel phy
Quoted 4 lines · Troy Kisky
Set the data delays to min, and clock delays to max because the traces are equal length on pcb.
Signed-off-by Troy Kisky <[email protected]>
Best regards,
Marek Vasut
PATCH 9/11 ARM: dts: imx6qdl-sabrelite: fix ENET group
In reply to Troy KiskyGPIO16 is used for I2C3, not ENET_REF_CLK.
Replace MX6QDL_ENET_PINGRP1 with explicit list.
Also, remove pull-ups from tx pins.
--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +17 -1
@@ -210,7 +210,23 @@ }; pinctrl_enet: enetgrp { - fsl,pins = <MX6QDL_ENET_PINGRP1>; + fsl,pins = < + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x100b0 + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x100b0 + MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x100b0 + MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x100b0 + MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x100b0 + MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x100b0 + MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x100b0 + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x100b0 + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x100b0 + MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0 + MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0 + MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0 + MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0 + MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0 + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0 + >; }; pinctrl_i2c1: i2c1grp {
Signature · 1 line
1.8.1.2
PATCH 9/11 ARM: dts: imx6qdl-sabrelite: fix ENET group
Quoted 3 lines · Troy Kisky
GPIO16 is used for I2C3, not
ENET_REF_CLK.
ReplaceMX6QDL_ENET_PINGRP1with explicit list.
Also, remove pull-ups from tx pins.
Best regards,
Marek Vasut
PATCH 10/11 ARM: dts: imx6qdl-sabrelite: Add over-current pin to usbotg
In reply to Troy KiskyKEY_COL4 is over-current for usbotg on Sabre Lite.
--- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +4 -1
@@ -260,7 +260,10 @@ }; pinctrl_usbotg: usbotggrp { - fsl,pins = <MX6QDL_USBOTG_PINGRP1>; + fsl,pins = < + MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059 + MX6QDL_PAD_KEY_COL4__USB_OTG_OC 0x1b0b0 + >; }; pinctrl_usdhc3: usdhc3grp {
Signature · 1 line
1.8.1.2
PATCH 10/11 ARM: dts: imx6qdl-sabrelite: Add over-current pin to usbotg
Quoted 3 lines · Troy Kisky
KEY_COL4is over-current for usbotg on Sabre Lite.Signed-off-by Troy Kisky <[email protected]>
Best regards,
Marek Vasut
PATCH 11/11 ARM: dts: imx: add nitrogen6x board
In reply to Troy KiskyAdd file imx6q-nitrogen6x.dts,
imx6dl-nitrogen6x.dts,
imx6qdl-nitrogen6x.dtsi
And add board to makefile.
Eric Nelson created a web page to show the differences between Nitrogen6x and Sabre Lite boards.
http://boundarydevices.com/differences-sabre-lite-nitrogen6x
---
arch/arm/boot/dts/Makefile | 2 ++
arch/arm/boot/dts/imx6dl-nitrogen6x.dts | 22 ++++++++++++++++++
arch/arm/boot/dts/imx6q-nitrogen6x.dts | 26 ++++++++++++++++++++++
...6qdl-sabrelite.dtsi => imx6qdl-nitrogen6x.dtsi} | 17 +++++++-------
4 files changed, 58 insertions(+), 9 deletions(-)
create mode 100644 arch/arm/boot/dts/imx6dl-nitrogen6x.dts
create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6x.dts
copy arch/arm/boot/dts/{imx6qdl-sabrelite.dtsi => imx6qdl-nitrogen6x.dtsi} (95%)arch/arm/boot/dts/Makefile +2 -0
@@ -148,6 +148,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6dl-gw52xx.dtb \ imx6dl-gw53xx.dtb \ imx6dl-gw54xx.dtb \ + imx6dl-nitrogen6x.dtb \ imx6dl-sabreauto.dtb \ imx6dl-sabrelite.dtb \ imx6dl-sabresd.dtb \
@@ -160,6 +161,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6q-gw53xx.dtb \ imx6q-gw5400-a.dtb \ imx6q-gw54xx.dtb \ + imx6q-nitrogen6x.dtb \ imx6q-phytec-pbab01.dtb \ imx6q-sabreauto.dtb \ imx6q-sabrelite.dtb \
arch/arm/boot/dts/imx6dl-nitrogen6x.dts new file +22 -0
@@ -0,0 +1,22 @@ +/* + * Copyright 2013 Boundary Devices, Inc. + * Copyright 2012 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd. + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-nitrogen6x.dtsi" + +/ { + model = "Freescale i.MX6 DualLite Nitrogen6x Board"; + compatible = "fsl,imx6dl-nitrogen6x", "fsl,imx6dl"; + +};
arch/arm/boot/dts/imx6q-nitrogen6x.dts new file +26 -0
@@ -0,0 +1,26 @@ +/* + * Copyright 2013 Boundary Devices, Inc. + * Copyright 2012 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd. + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6q.dtsi" +#include "imx6qdl-nitrogen6x.dtsi" + +/ { + model = "Freescale i.MX6 Quad Nitrogen6x Board"; + compatible = "fsl,imx6q-nitrogen6x", "fsl,imx6q"; + +}; + +&sata { + status = "okay"; +};
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi renamed from arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +8 -9
@@ -1,4 +1,5 @@ /* + * Copyright 2013 Boundary Devices, Inc. * Copyright 2011 Freescale Semiconductor, Inc. * Copyright 2011 Linaro Ltd. *
@@ -91,9 +92,9 @@ }; sound { - compatible = "fsl,imx6q-sabrelite-sgtl5000", + compatible = "fsl,imx6q-nitrogen6x-sgtl5000", "fsl,imx-audio-sgtl5000"; - model = "imx6q-sabrelite-sgtl5000"; + model = "imx6q-nitrogen6x-sgtl5000"; ssi-controller = <&ssi1>; audio-codec = <&codec>; audio-routing =
@@ -101,7 +102,7 @@ "Mic Jack", "Mic Bias", "Headphone Jack", "HP_OUT"; mux-int-port = <1>; - mux-ext-port = <4>; + mux-ext-port = <3>; }; backlight_lcd {
@@ -147,7 +148,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii"; - phy-reset-gpios = <&gpio3 23 0>; + phy-reset-gpios = <&gpio1 27 0>; txen-skew-ps = <0>; txc-skew-ps = <3000>; rxdv-skew-ps = <0>;
@@ -182,15 +183,14 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hog>; - imx6q-sabrelite { + imx6q-nitrogen6x { pinctrl_hog: hoggrp { fsl,pins = < /* uSDHC4 CD */ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x1b0b0 /* spi-nor CS */ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x1b0b0 /* otg power en */ MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0 -/* ethernet phy reset */ MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x000b0 +/* ethernet phy reset */ MX6QDL_PAD_ENET_RXD0__GPIO1_IO27 0x000b0 /* USDHC3 CD */ MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0 -/* USDHC3 WP */ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 /* SGTL5000 sys_mclk */ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x000b0 /* Power Button */ MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0 /* Menu Button */ MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x1b0b0
@@ -202,7 +202,7 @@ }; pinctrl_audmux: audmuxgrp { - fsl,pins = <MX6QDL_AUDMUX_PINGRP1>; + fsl,pins = <MX6QDL_AUDMUX_PINGRP2>; }; pinctrl_ecspi1: ecspi1grp {
@@ -352,7 +352,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; cd-gpios = <&gpio7 0 0>; - wp-gpios = <&gpio7 1 0>; vmmc-supply = <®_3p3v>; status = "okay"; };
Signature · 1 line
1.8.1.2