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

Commit 092a0c3b authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: sunxi: DT: Convert the DTs to use a header for the pinctrl nodes 



The pinctrl nodes require some extra opaque arguments for the pull up and drive
strength values.

Introduce a new header file and convert the device trees to replace these
opaque numbers by defines.

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

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

+5 −4
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include "sunxi-common-regulators.dtsi"



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

#include <dt-bindings/pinctrl/sun4i-a10.h>



/ {

	model = "Mele A1000";
@@ -114,15 +115,15 @@ 
			emac_power_pin_a1000: emac_power_pin@0 {

				allwinner,pins = "PH15";

				allwinner,function = "gpio_out";

				allwinner,drive = <0>;

				allwinner,pull = <0>;

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};



			led_pins_a1000: led_pins@0 {

				allwinner,pins = "PH10", "PH20";

				allwinner,function = "gpio_out";

				allwinner,drive = <0>;

				allwinner,pull = <0>;

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};

		};

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

+3 −2
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include "sunxi-common-regulators.dtsi"



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

#include <dt-bindings/pinctrl/sun4i-a10.h>



/ {

	model = "Cubietech Cubieboard";
@@ -113,8 +114,8 @@ 
			led_pins_cubieboard: led_pins@0 {

				allwinner,pins = "PH20", "PH21";

				allwinner,function = "gpio_out";

				allwinner,drive = <1>;

				allwinner,pull = <0>;

				allwinner,drive = <SUN4I_PINCTRL_20_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};

		};

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

+5 −4
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include "sunxi-common-regulators.dtsi"



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

#include <dt-bindings/pinctrl/sun4i-a10.h>



/ {

	model = "Miniand Hackberry";
@@ -113,15 +114,15 @@ 
			hackberry_hogs: hogs@0 {

				allwinner,pins = "PH19";

				allwinner,function = "gpio_out";

				allwinner,drive = <0>;

				allwinner,pull = <0>;

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};



			usb2_vbus_pin_hackberry: usb2_vbus_pin@0 {

					allwinner,pins = "PH12";

					allwinner,function = "gpio_out";

					allwinner,drive = <0>;

					allwinner,pull = <0>;

					allwinner,drive = <SUN4I_PINCTRL_10_MA>;

					allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};

		};

arch/arm/boot/dts/sun4i-a10-mini-xplus.dts

+2 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include "sunxi-common-regulators.dtsi"



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

#include <dt-bindings/pinctrl/sun4i-a10.h>



/ {

	model = "PineRiver Mini X-Plus";
@@ -93,7 +94,7 @@ 
		pinctrl@01c20800 {

			ir0_pins_a: ir0@0 {

				/* The ir receiver is not always populated */

				allwinner,pull = <1>;

				allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

			};

		};

arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts

+5 −4
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "sunxi-common-regulators.dtsi"



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

#include <dt-bindings/pinctrl/sun4i-a10.h>



/ {

	model = "Olimex A10-OLinuXino-LIME";
@@ -112,15 +113,15 @@ 
			ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {

				allwinner,pins = "PC3";

				allwinner,function = "gpio_out";

				allwinner,drive = <0>;

				allwinner,pull = <0>;

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};



			led_pins_olinuxinolime: led_pins@0 {

				allwinner,pins = "PH2";

				allwinner,function = "gpio_out";

				allwinner,drive = <1>;

				allwinner,pull = <0>;

				allwinner,drive = <SUN4I_PINCTRL_20_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};

		};