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

Commit baed3c59 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-generic-pinconf-for-4.10' of... 

Merge tag 'sunxi-generic-pinconf-for-4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt

Allwinner conversion to generic pin muxing properties

Here is a list of patches that converts the current DT to the generic pin
control and muxing properties, now that the pinctrl driver supports it.

* tag 'sunxi-generic-pinconf-for-4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux

:
  ARM: sunxi: Convert pinctrl nodes to generic bindings
  ARM: sunxi: Remove useless allwinner,pull property
  ARM: sunxi: Remove useless allwinner,drive property

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d01300a6 1edcd36f

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

+4 −8
Original line number Diff line number Diff line
@@ -186,17 +186,13 @@ 


&pio {

	emac_power_pin_a1000: emac_power_pin@0 {

		allwinner,pins = "PH15";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

		pins = "PH15";

		function = "gpio_out";

	};



	led_pins_a1000: led_pins@0 {

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

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

		pins = "PH10", "PH20";

		function = "gpio_out";

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 


&pio {

	usb2_vbus_pin_a: usb2_vbus_pin@0 {

		allwinner,pins = "PH12";

		pins = "PH12";

	};

};

arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts

+6 −8
Original line number Diff line number Diff line
@@ -142,17 +142,15 @@ 


&pio {

	usb0_id_detect_pin: usb0_id_detect_pin@0 {

		allwinner,pins = "PH4";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

		pins = "PH4";

		function = "gpio_in";

		bias-pull-up;

	};



	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {

		allwinner,pins = "PH5";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;

		pins = "PH5";

		function = "gpio_in";

		bias-pull-down;

	};

};

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

+6 −8
Original line number Diff line number Diff line
@@ -165,17 +165,15 @@ 


&pio {

	led_pins_cubieboard: led_pins@0 {

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

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_20_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

		pins = "PH20", "PH21";

		function = "gpio_out";

		drive-strength = <20>;

	};



	usb0_id_detect_pin: usb0_id_detect_pin@0 {

		allwinner,pins = "PH4";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

		pins = "PH4";

		function = "gpio_in";

		bias-pull-up;

	};

};

arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts

+14 −24
Original line number Diff line number Diff line
@@ -178,45 +178,35 @@ 


&pio {

	bl_en_pin_dsrv9703c: bl_en_pin@0 {

		allwinner,pins = "PH7";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

		pins = "PH7";

		function = "gpio_out";

	};



	codec_pa_pin: codec_pa_pin@0 {

		allwinner,pins = "PH15";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

		pins = "PH15";

		function = "gpio_out";

	};



	motor_pins: motor_pins@0 {

		allwinner,pins = "PB3";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

		pins = "PB3";

		function = "gpio_out";

	};



	touchscreen_pins: touchscreen_pins@0 {

		allwinner,pins = "PB13";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

		pins = "PB13";

		function = "gpio_out";

	};



	usb0_id_detect_pin: usb0_id_detect_pin@0 {

		allwinner,pins = "PH4";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

		pins = "PH4";

		function = "gpio_in";

		bias-pull-up;

	};



	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {

		allwinner,pins = "PH5";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;

		pins = "PH5";

		function = "gpio_in";

		bias-pull-down;

	};

};