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

Commit bca12924 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: sunxi: DT: convert DTs to use common GPIOs includes 



Replace the various raw GPIO flags by their definition in the common
dt-bindings header.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 71455701

arch/arm/boot/dts/sun4i-a10-a1000.dts

+6 −4
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
#include "sun4i-a10.dtsi"

#include "sunxi-common-regulators.dtsi"



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



/ {

	model = "Mele A1000";

	compatible = "mele,a1000", "allwinner,sun4i-a10";
@@ -77,7 +79,7 @@ 
			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;

			vmmc-supply = <&reg_vcc3v3>;

			bus-width = <4>;

			cd-gpios = <&pio 7 1 0>; /* PH1 */

			cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

			cd-inverted;

			status = "okay";

		};
@@ -159,12 +161,12 @@ 


		red {

			label = "a1000:red:usr";

			gpios = <&pio 7 10 0>;

			gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>;

		};



		blue {

			label = "a1000:blue:usr";

			gpios = <&pio 7 20 0>;

			gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;

		};

	};
@@ -176,7 +178,7 @@ 
		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		enable-active-high;

		gpio = <&pio 7 15 0>;

		gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>;

	};



	reg_usb1_vbus: usb1-vbus {

arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts

+4 −2
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 
#include "sun4i-a10.dtsi"

#include "sunxi-common-regulators.dtsi"



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



/ {

	model = "BA10 tvbox";

	compatible = "allwinner,ba10-tvbox", "allwinner,sun4i-a10";
@@ -74,7 +76,7 @@ 
			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;

			vmmc-supply = <&reg_vcc3v3>;

			bus-width = <4>;

			cd-gpios = <&pio 7 1 0>; /* PH1 */

			cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

			cd-inverted;

			status = "okay";

		};
@@ -140,7 +142,7 @@ 
	};



	reg_usb2_vbus: usb2-vbus {

		gpio = <&pio 7 12 0>;

		gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>;

		status = "okay";

	};

};

arch/arm/boot/dts/sun4i-a10-cubieboard.dts

+5 −3
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ 
#include "sun4i-a10.dtsi"

#include "sunxi-common-regulators.dtsi"



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



/ {

	model = "Cubietech Cubieboard";

	compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10";
@@ -75,7 +77,7 @@ 
			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;

			vmmc-supply = <&reg_vcc3v3>;

			bus-width = <4>;

			cd-gpios = <&pio 7 1 0>; /* PH1 */

			cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

			cd-inverted;

			status = "okay";

		};
@@ -163,12 +165,12 @@ 


		blue {

			label = "cubieboard:blue:usr";

			gpios = <&pio 7 21 0>; /* LED1 */

			gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; /* LED1 */

		};



		green {

			label = "cubieboard:green:usr";

			gpios = <&pio 7 20 0>; /* LED2 */

			gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; /* LED2 */

			linux,default-trigger = "heartbeat";

		};

	};

arch/arm/boot/dts/sun4i-a10-hackberry.dts

+5 −3
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
#include "sun4i-a10.dtsi"

#include "sunxi-common-regulators.dtsi"



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



/ {

	model = "Miniand Hackberry";

	compatible = "miniand,hackberry", "allwinner,sun4i-a10";
@@ -77,7 +79,7 @@ 
			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;

			vmmc-supply = <&reg_vcc3v3>;

			bus-width = <4>;

			cd-gpios = <&pio 7 1 0>; /* PH1 */

			cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

			cd-inverted;

			status = "okay";

		};
@@ -157,7 +159,7 @@ 
		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		enable-active-high;

		gpio = <&pio 7 19 0>;

		gpio = <&pio 7 19 GPIO_ACTIVE_HIGH>;

	};



	reg_usb1_vbus: usb1-vbus {
@@ -166,7 +168,7 @@ 


	reg_usb2_vbus: usb2-vbus {

		pinctrl-0 = <&usb2_vbus_pin_hackberry>;

		gpio = <&pio 7 12 0>;

		gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>;

		status = "okay";

	};

};

arch/arm/boot/dts/sun4i-a10-inet97fv2.dts

+3 −1
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
#include "sun4i-a10.dtsi"

#include "sunxi-common-regulators.dtsi"



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



/ {

	model = "INet-97F Rev 02";

	compatible = "primux,inet97fv2", "allwinner,sun4i-a10";
@@ -65,7 +67,7 @@ 
			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;

			vmmc-supply = <&reg_vcc3v3>;

			bus-width = <4>;

			cd-gpios = <&pio 7 1 0>; /* PH1 */

			cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

			cd-inverted;

			status = "okay";

		};