Merge tag 'bcm2835-dt-next-2017-12-19' into devicetree/next

This pull request cleans up the bcm2835 DT to use #defines for GPIO polarity. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
author: Florian Fainelli <f.fainelli@gmail.com> 2017-12-20 20:32:58 -0500
committer: Florian Fainelli <f.fainelli@gmail.com> 2017-12-20 20:32:58 -0500
commit: ececb5639c33a6a0444bd8e1cda8bf2ef20c6a6b (patch)
tree: fe033d1d754d95383a87aa5c01a2fcd631fe1741
parent: 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff)
parent: 3edb73d87e9e824326f588b5d5c5661bf53449be (diff)
7 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
index f81ae0a10310..aa1fc7babfea 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -10,12 +10,12 @@
        leds {
                act {
-                        gpios = <&gpio 47 0>;
+                        gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
                };
                pwr {
                        label = "PWR";
-                        gpios = <&gpio 35 0>;
+                        gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                        linux,default-trigger = "default-on";
                };
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts
index 7a960a048204..425f6b0a5ef8 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
@@ -10,7 +10,7 @@
        leds {
                act {
-                        gpios = <&gpio 16 1>;
+                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
        };
 };
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
index 0161a8483e39..effa195e7895 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -11,12 +11,12 @@
        leds {
                act {
-                        gpios = <&gpio 47 0>;
+                        gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
                };
                pwr {
                        label = "PWR";
-                        gpios = <&gpio 35 0>;
+                        gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                        linux,default-trigger = "default-on";
                };
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
index 4bc70efe43d6..772ec3b48231 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
@@ -11,7 +11,7 @@
        leds {
                act {
-                        gpios = <&gpio 16 1>;
+                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
        };
 };
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index cca4a75a5651..434483d6fc14 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -11,7 +11,7 @@
        leds {
                act {
-                        gpios = <&gpio 16 1>;
+                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
        };
 };
diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
index 6669355fd655..5c339adabdf0 100644
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -15,12 +15,12 @@
        leds {
                act {
-                        gpios = <&gpio 47 0>;
+                        gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
                };
                pwr {
                        label = "PWR";
-                        gpios = <&gpio 35 0>;
+                        gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                        linux,default-trigger = "default-on";
                };
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index a8844d033b3f..3e4ed7c5b0b3 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -20,7 +20,7 @@
        leds {
                act {
-                        gpios = <&gpio 47 0>;
+                        gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
                };
        };
 };
author	Florian Fainelli <f.fainelli@gmail.com>	2017-12-20 20:32:58 -0500
committer	Florian Fainelli <f.fainelli@gmail.com>	2017-12-20 20:32:58 -0500
commit	ececb5639c33a6a0444bd8e1cda8bf2ef20c6a6b (patch)
tree	fe033d1d754d95383a87aa5c01a2fcd631fe1741
parent	4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff)
parent	3edb73d87e9e824326f588b5d5c5661bf53449be (diff)

diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts index f81ae0a10310..aa1fc7babfea 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -10,12 +10,12 @@
10		10
11	leds {	11	leds {
12	act {	12	act {
13	gpios = <&gpio 47 0>;	13	gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
14	};	14	};
15		15
16	pwr {	16	pwr {
17	label = "PWR";	17	label = "PWR";
18	gpios = <&gpio 35 0>;	18	gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
19	default-state = "keep";	19	default-state = "keep";
20	linux,default-trigger = "default-on";	20	linux,default-trigger = "default-on";
21	};	21	};


diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts index 7a960a048204..425f6b0a5ef8 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
@@ -10,7 +10,7 @@
10		10
11	leds {	11	leds {
12	act {	12	act {
13	gpios = <&gpio 16 1>;	13	gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
14	};	14	};
15	};	15	};
16	};	16	};


diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts index 0161a8483e39..effa195e7895 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -11,12 +11,12 @@
11		11
12	leds {	12	leds {
13	act {	13	act {
14	gpios = <&gpio 47 0>;	14	gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
15	};	15	};
16		16
17	pwr {	17	pwr {
18	label = "PWR";	18	label = "PWR";
19	gpios = <&gpio 35 0>;	19	gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
20	default-state = "keep";	20	default-state = "keep";
21	linux,default-trigger = "default-on";	21	linux,default-trigger = "default-on";
22	};	22	};


diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts index 4bc70efe43d6..772ec3b48231 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
@@ -11,7 +11,7 @@
11		11
12	leds {	12	leds {
13	act {	13	act {
14	gpios = <&gpio 16 1>;	14	gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
15	};	15	};
16	};	16	};
17	};	17	};


diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts index cca4a75a5651..434483d6fc14 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -11,7 +11,7 @@
11		11
12	leds {	12	leds {
13	act {	13	act {
14	gpios = <&gpio 16 1>;	14	gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
15	};	15	};
16	};	16	};
17	};	17	};


diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts index 6669355fd655..5c339adabdf0 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -15,12 +15,12 @@
15		15
16	leds {	16	leds {
17	act {	17	act {
18	gpios = <&gpio 47 0>;	18	gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
19	};	19	};
20		20
21	pwr {	21	pwr {
22	label = "PWR";	22	label = "PWR";
23	gpios = <&gpio 35 0>;	23	gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
24	default-state = "keep";	24	default-state = "keep";
25	linux,default-trigger = "default-on";	25	linux,default-trigger = "default-on";
26	};	26	};


diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts index a8844d033b3f..3e4ed7c5b0b3 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -20,7 +20,7 @@
20		20
21	leds {	21	leds {
22	act {	22	act {
23	gpios = <&gpio 47 0>;	23	gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
24	};	24	};
25	};	25	};
26	};	26	};