openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: sunxi: common-regulators: Drop pinmux settings for GPIO pins 

As part of our effort to move pinctrl/GPIO interlocking into the
driver where it belongs, this patch drops the definition and usage
of the pinmux settings for the common regulators defined in
sunxi-common-regulators.dtsi.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
Chen-Yu Tsai 2017-04-19 13:09:16 +08:00 committed by Maxime Ripard
parent e53bfb022f
commit 8a92770b64
13 changed files with 0 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts
View File

@ -120,10 +120,6 @@ &uart0 {
status = "okay";
};
&usb2_vbus_pin_a {
pins = "PH6";
};
&usb_otg {
dr_mode = "otg";
status = "okay";

8
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
View File

@ -136,14 +136,6 @@ &uart0 {
status = "okay";
};
&usb0_vbus_pin_a {
pins = "PG13";
};
&usb1_vbus_pin_a {
pins = "PB10";
};
&usb_otg {
dr_mode = "host";
status = "okay";

4
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
View File

@ -168,10 +168,6 @@ &usb_otg {
status = "okay";
};
&usb1_vbus_pin_a {
pins = "PG13";
};
&usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>;

4
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
View File

@ -271,10 +271,6 @@ &usb_otg {
status = "okay";
};
&usb0_vbus_pin_a {
pins = "PG11";
};
&usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>;

4
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
View File

@ -216,10 +216,6 @@ &usb_otg {
status = "okay";
};
&usb1_vbus_pin_a {
pins = "PG12";
};
&usbphy {
usb1_vbus-supply = <&reg_usb1_vbus>;
status = "okay";

4
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
View File

@ -207,10 +207,6 @@ &usb_otg {
status = "okay";
};
&usb0_vbus_pin_a {
pins = "PG12";
};
&usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;

5
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
View File

@ -186,7 +186,6 @@ &reg_ldo3 {
};
&reg_usb0_vbus {
pinctrl-0 = <&usb0_vbus_pin_a>;
gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
status = "okay";
};
@ -202,10 +201,6 @@ &usb_otg {
status = "okay";
};
&usb0_vbus_pin_a {
pins = "PG12";
};
&usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;

4
arch/arm/boot/dts/sun5i-a13-olinuxino.dts
View File

@ -269,10 +269,6 @@ &usb_otg {
status = "okay";
};
&usb0_vbus_pin_a {
pins = "PG12";
};
&usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;

5
arch/arm/boot/dts/sun6i-a31-hummingbird.dts
View File

@ -344,11 +344,6 @@ &usb_power_supply {
status = "okay";
};
&usb1_vbus_pin_a {
/* different pin from sunxi-common-regulators */
pins = "PH24";
};
&usbphy {
usb0_id_det-gpio = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */
usb0_vbus_det-gpio = <&pio 0 16 GPIO_ACTIVE_HIGH>; /* PA16 */

8
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
View File

@ -85,10 +85,6 @@ reg_gmac_3v3: gmac-3v3 {
};
};
&ahci_pwr_pin_a {
pins = "PB3";
};
&ahci {
target-supply = <&reg_ahci_5v>;
status = "okay";
@ -319,10 +315,6 @@ &usb_power_supply {
status = "okay";
};
&usb2_vbus_pin_a {
pins = "PH12";
};
&usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>;

4
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
View File

@ -106,10 +106,6 @@ &ahci {
status = "okay";
};
&ahci_pwr_pin_a {
pins = "PH2";
};
&codec {
status = "okay";
};

4
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
View File

@ -195,10 +195,6 @@ &uart3 {
status = "disabled";
};
&usb1_vbus_pin_a {
pins = "PG13";
};
&usbphy {
usb1_vbus-supply = <&reg_usb1_vbus>;
status = "okay";

30
arch/arm/boot/dts/sunxi-common-regulators.dtsi
View File

@ -44,33 +44,9 @@
#include <dt-bindings/gpio/gpio.h>
&pio {
ahci_pwr_pin_a: ahci_pwr_pin@0 {
pins = "PB8";
function = "gpio_out";
};
usb0_vbus_pin_a: usb0_vbus_pin@0 {
pins = "PB9";
function = "gpio_out";
};
usb1_vbus_pin_a: usb1_vbus_pin@0 {
pins = "PH6";
function = "gpio_out";
};
usb2_vbus_pin_a: usb2_vbus_pin@0 {
pins = "PH3";
function = "gpio_out";
};
};
/ {
reg_ahci_5v: ahci-5v {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&ahci_pwr_pin_a>;
regulator-name = "ahci-5v";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
@ -82,8 +58,6 @@ reg_ahci_5v: ahci-5v {
reg_usb0_vbus: usb0-vbus {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&usb0_vbus_pin_a>;
regulator-name = "usb0-vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
@ -94,8 +68,6 @@ reg_usb0_vbus: usb0-vbus {
reg_usb1_vbus: usb1-vbus {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&usb1_vbus_pin_a>;
regulator-name = "usb1-vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
@ -107,8 +79,6 @@ reg_usb1_vbus: usb1-vbus {
reg_usb2_vbus: usb2-vbus {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&usb2_vbus_pin_a>;
regulator-name = "usb2-vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;