Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b1e8e02 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: dts: ux500: use the GPIO DT header 



Use the <dt-bindings/gpio/gpio.h> header instead of using
hardcoded values for the GPIO flags. Eradicate the totally
bogus "0x4" flag used and set that to GPIO_ACTIVE_HIGH as is
proper, switch the inverted card detect on the Snowball to
flag using GPIO_ACTIVE_LOW instead of using the MMC-specific
inversion flag.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f55532a0

arch/arm/boot/dts/ste-ccu9540.dts

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
			cap-mmc-highspeed;

			vmmc-supply = <&ab8500_ldo_aux3_reg>;



			cd-gpios  = <&gpio7 6 0x4>; // 230

			cd-gpios  = <&gpio7 6 GPIO_ACTIVE_HIGH>; // 230

			cd-inverted;



			status = "okay";

arch/arm/boot/dts/ste-dbx5x0.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/mfd/dbx500-prcmu.h>

#include <dt-bindings/arm/ux500_pm_domains.h>

#include <dt-bindings/gpio/gpio.h>

#include "skeleton.dtsi"



/ {

arch/arm/boot/dts/ste-href-stuib.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 


		button@139 {

			/* Proximity sensor */

			gpios = <&gpio6 25 0x4>;

			gpios = <&gpio6 25 GPIO_ACTIVE_HIGH>;

			linux,code = <11>; /* SW_FRONT_PROXIMITY */

			label = "SFH7741 Proximity Sensor";

		};

		button@145 {

			/* Hall sensor */

			gpios = <&gpio4 17 0x4>;

			gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>;

			linux,code = <0>; /* SW_LID */

			label = "HED54XXU11 Hall Effect Sensor";

		};

arch/arm/boot/dts/ste-href-tvk1281618.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ 


		button@139 {

			/* Proximity sensor */

			gpios = <&gpio6 25 0x4>;

			gpios = <&gpio6 25 GPIO_ACTIVE_HIGH>;

			linux,code = <11>; /* SW_FRONT_PROXIMITY */

			label = "SFH7741 Proximity Sensor";

		};

		button@145 {

			/* Hall sensor */

			gpios = <&gpio4 17 0x4>;

			gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>;

			linux,code = <0>; /* SW_LID */

			label = "HED54XXU11 Hall Effect Sensor";

		};

arch/arm/boot/dts/ste-hrefprev60.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
/ {

	gpio_keys {

		button@1 {

			gpios = <&tc3589x_gpio 7 0x4>;

			gpios = <&tc3589x_gpio 7 GPIO_ACTIVE_HIGH>;

		};

	};
@@ -68,12 +68,12 @@ 


		// External Micro SD slot

		sdi0_per1@80126000 {

			cd-gpios  = <&tc3589x_gpio 3 0x4>;

			cd-gpios  = <&tc3589x_gpio 3 GPIO_ACTIVE_HIGH>;

		};



		vmmci: regulator-gpio {

			gpios = <&tc3589x_gpio 18 0x4>;

			enable-gpio = <&tc3589x_gpio 17 0x4>;

			gpios = <&tc3589x_gpio 18 GPIO_ACTIVE_HIGH>;

			enable-gpio = <&tc3589x_gpio 17 GPIO_ACTIVE_HIGH>;

		};



		pinctrl {