* [PATCH 1/4] ARM: dts: imx6q-phytec-pbab01: Remove duplicate "chosen" node
@ 2018-12-23 16:31 Alexander Shiyan
2018-12-23 16:31 ` [PATCH 2/4] ARM: dts: imx6q/dl-phytec-pfla02: Remove duplicate nodes Alexander Shiyan
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Alexander Shiyan @ 2018-12-23 16:31 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Alexander Shiyan, Shawn Guo, NXP Linux Team, Pengutronix Kernel Team
"chosen" is already present in imx6qdl-phytec-pbab01.dtsi.
Patch removes this duplicate.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx6q-phytec-pbab01.dts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm/boot/dts/imx6q-phytec-pbab01.dts b/arch/arm/boot/dts/imx6q-phytec-pbab01.dts
index 1f47713..6c811e8 100644
--- a/arch/arm/boot/dts/imx6q-phytec-pbab01.dts
+++ b/arch/arm/boot/dts/imx6q-phytec-pbab01.dts
@@ -16,10 +16,6 @@
/ {
model = "Phytec phyFLEX-i.MX6 Quad Carrier-Board";
compatible = "phytec,imx6q-pbab01", "phytec,imx6q-pfla02", "fsl,imx6q";
-
- chosen {
- stdout-path = &uart4;
- };
};
&sata {
--
2.10.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] ARM: dts: imx6q/dl-phytec-pfla02: Remove duplicate nodes
2018-12-23 16:31 [PATCH 1/4] ARM: dts: imx6q-phytec-pbab01: Remove duplicate "chosen" node Alexander Shiyan
@ 2018-12-23 16:31 ` Alexander Shiyan
2018-12-23 16:31 ` [PATCH 3/4] ARM: dts: imx6qdl-phytec-pfla02: Replace magic numbers Alexander Shiyan
2018-12-23 16:31 ` [PATCH 4/4] ARM: dts: imx6qdl-phytec-pfla02: Add some labels Alexander Shiyan
2 siblings, 0 replies; 6+ messages in thread
From: Alexander Shiyan @ 2018-12-23 16:31 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Alexander Shiyan, Shawn Guo, NXP Linux Team, Pengutronix Kernel Team
"model", "compatible" and "memory" nodes is already present in
corresponed imx6q-phytec-pfla02.dtsi and imx6dl-phytec-pfla02.dtsi
files. Patch removes this duplicates.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 7 -------
1 file changed, 7 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index ed1aafd..211640e 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -12,13 +12,6 @@
#include <dt-bindings/gpio/gpio.h>
/ {
- model = "Phytec phyFLEX-i.MX6 Quad";
- compatible = "phytec,imx6q-pfla02", "fsl,imx6q";
-
- memory@10000000 {
- reg = <0x10000000 0x80000000>;
- };
-
regulators {
compatible = "simple-bus";
#address-cells = <1>;
--
2.10.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] ARM: dts: imx6qdl-phytec-pfla02: Replace magic numbers
2018-12-23 16:31 [PATCH 1/4] ARM: dts: imx6q-phytec-pbab01: Remove duplicate "chosen" node Alexander Shiyan
2018-12-23 16:31 ` [PATCH 2/4] ARM: dts: imx6q/dl-phytec-pfla02: Remove duplicate nodes Alexander Shiyan
@ 2018-12-23 16:31 ` Alexander Shiyan
2019-01-12 3:13 ` Shawn Guo
2018-12-23 16:31 ` [PATCH 4/4] ARM: dts: imx6qdl-phytec-pfla02: Add some labels Alexander Shiyan
2 siblings, 1 reply; 6+ messages in thread
From: Alexander Shiyan @ 2018-12-23 16:31 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Alexander Shiyan, Shawn Guo, NXP Linux Team, Pengutronix Kernel Team
Use GPIO_ACTIVE_LOW/HIGH for GPIO description.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index 211640e..81007d6 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -23,7 +23,7 @@
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
- gpio = <&gpio4 15 0>;
+ gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
@@ -33,7 +33,7 @@
regulator-name = "usb_h1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
- gpio = <&gpio1 0 0>;
+ gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
@@ -43,12 +43,12 @@
green {
label = "phyflex:green";
- gpios = <&gpio1 30 0>;
+ gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
};
red {
label = "phyflex:red";
- gpios = <&gpio2 31 0>;
+ gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>;
};
};
};
@@ -69,7 +69,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3>;
status = "okay";
- cs-gpios = <&gpio4 24 0>;
+ cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
flash@0 {
compatible = "m25p80", "jedec,spi-nor";
--
2.10.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 3/4] ARM: dts: imx6qdl-phytec-pfla02: Replace magic numbers
2018-12-23 16:31 ` [PATCH 3/4] ARM: dts: imx6qdl-phytec-pfla02: Replace magic numbers Alexander Shiyan
@ 2019-01-12 3:13 ` Shawn Guo
0 siblings, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2019-01-12 3:13 UTC (permalink / raw)
To: Alexander Shiyan
Cc: Pengutronix Kernel Team, NXP Linux Team, linux-arm-kernel
On Sun, Dec 23, 2018 at 07:31:40PM +0300, Alexander Shiyan wrote:
> Use GPIO_ACTIVE_LOW/HIGH for GPIO description.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
> arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
> index 211640e..81007d6 100644
> --- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
> @@ -23,7 +23,7 @@
> regulator-name = "usb_otg_vbus";
> regulator-min-microvolt = <5000000>;
> regulator-max-microvolt = <5000000>;
> - gpio = <&gpio4 15 0>;
> + gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
> enable-active-high;
> };
>
> @@ -33,7 +33,7 @@
> regulator-name = "usb_h1_vbus";
> regulator-min-microvolt = <5000000>;
> regulator-max-microvolt = <5000000>;
> - gpio = <&gpio1 0 0>;
> + gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
> enable-active-high;
> };
> };
> @@ -43,12 +43,12 @@
>
> green {
> label = "phyflex:green";
> - gpios = <&gpio1 30 0>;
> + gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
> };
>
> red {
> label = "phyflex:red";
> - gpios = <&gpio2 31 0>;
> + gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>;
> };
> };
> };
> @@ -69,7 +69,7 @@
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_ecspi3>;
> status = "okay";
> - cs-gpios = <&gpio4 24 0>;
> + cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
GPIO_ACTIVE_LOW is defined as 1 rather than 0.
Shawn
>
> flash@0 {
> compatible = "m25p80", "jedec,spi-nor";
> --
> 2.10.2
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 4/4] ARM: dts: imx6qdl-phytec-pfla02: Add some labels
2018-12-23 16:31 [PATCH 1/4] ARM: dts: imx6q-phytec-pbab01: Remove duplicate "chosen" node Alexander Shiyan
2018-12-23 16:31 ` [PATCH 2/4] ARM: dts: imx6q/dl-phytec-pfla02: Remove duplicate nodes Alexander Shiyan
2018-12-23 16:31 ` [PATCH 3/4] ARM: dts: imx6qdl-phytec-pfla02: Replace magic numbers Alexander Shiyan
@ 2018-12-23 16:31 ` Alexander Shiyan
2019-01-12 3:21 ` Shawn Guo
2 siblings, 1 reply; 6+ messages in thread
From: Alexander Shiyan @ 2018-12-23 16:31 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Alexander Shiyan, Shawn Guo, NXP Linux Team, Pengutronix Kernel Team
This patch adds labels to devices that can be reused in top-level dts.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index 81007d6..a685ff7 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -41,12 +41,12 @@
gpio_leds: leds {
compatible = "gpio-leds";
- green {
+ led_green: led_green {
label = "phyflex:green";
gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
};
- red {
+ led_red: led_red {
label = "phyflex:red";
gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>;
};
@@ -71,7 +71,7 @@
status = "okay";
cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
- flash@0 {
+ flash: flash@0 {
compatible = "m25p80", "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
@@ -99,12 +99,12 @@
pinctrl-0 = <&pinctrl_i2c1>;
status = "okay";
- eeprom@50 {
+ eeprom: eeprom@50 {
compatible = "atmel,24c32";
reg = <0x50>;
};
- pmic@58 {
+ pmic: pmic@58 {
compatible = "dlg,da9063";
reg = <0x58>;
interrupt-parent = <&gpio2>;
--
2.10.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 4/4] ARM: dts: imx6qdl-phytec-pfla02: Add some labels
2018-12-23 16:31 ` [PATCH 4/4] ARM: dts: imx6qdl-phytec-pfla02: Add some labels Alexander Shiyan
@ 2019-01-12 3:21 ` Shawn Guo
0 siblings, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2019-01-12 3:21 UTC (permalink / raw)
To: Alexander Shiyan
Cc: Pengutronix Kernel Team, NXP Linux Team, linux-arm-kernel
On Sun, Dec 23, 2018 at 07:31:41PM +0300, Alexander Shiyan wrote:
> This patch adds labels to devices that can be reused in top-level dts.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
> arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
> index 81007d6..a685ff7 100644
> --- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
> @@ -41,12 +41,12 @@
> gpio_leds: leds {
> compatible = "gpio-leds";
>
> - green {
> + led_green: led_green {
We usually use hyphen than underscore in node name, so led-green for
node please.
> label = "phyflex:green";
> gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
> };
>
> - red {
> + led_red: led_red {
Ditto
> label = "phyflex:red";
> gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>;
> };
> @@ -71,7 +71,7 @@
> status = "okay";
> cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
>
> - flash@0 {
> + flash: flash@0 {
Please use a specific name for labelling, for example:
m25p80: flash@0 {
> compatible = "m25p80", "jedec,spi-nor";
> spi-max-frequency = <20000000>;
> reg = <0>;
> @@ -99,12 +99,12 @@
> pinctrl-0 = <&pinctrl_i2c1>;
> status = "okay";
>
> - eeprom@50 {
> + eeprom: eeprom@50 {
Ditto
> compatible = "atmel,24c32";
> reg = <0x50>;
> };
>
> - pmic@58 {
> + pmic: pmic@58 {
Ditto
Shawn
> compatible = "dlg,da9063";
> reg = <0x58>;
> interrupt-parent = <&gpio2>;
> --
> 2.10.2
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-01-12 3:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-23 16:31 [PATCH 1/4] ARM: dts: imx6q-phytec-pbab01: Remove duplicate "chosen" node Alexander Shiyan
2018-12-23 16:31 ` [PATCH 2/4] ARM: dts: imx6q/dl-phytec-pfla02: Remove duplicate nodes Alexander Shiyan
2018-12-23 16:31 ` [PATCH 3/4] ARM: dts: imx6qdl-phytec-pfla02: Replace magic numbers Alexander Shiyan
2019-01-12 3:13 ` Shawn Guo
2018-12-23 16:31 ` [PATCH 4/4] ARM: dts: imx6qdl-phytec-pfla02: Add some labels Alexander Shiyan
2019-01-12 3:21 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).