diff options
Diffstat (limited to 'arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts')
-rw-r--r-- | arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts index 5faeae429e..bb14b171b1 100644 --- a/arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts +++ b/arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts | |||
@@ -45,7 +45,6 @@ | |||
45 | #include "sunxi-common-regulators.dtsi" | 45 | #include "sunxi-common-regulators.dtsi" |
46 | 46 | ||
47 | #include <dt-bindings/gpio/gpio.h> | 47 | #include <dt-bindings/gpio/gpio.h> |
48 | #include <dt-bindings/pinctrl/sun4i-a10.h> | ||
49 | 48 | ||
50 | / { | 49 | / { |
51 | model = "Mele A1000G Quad top set box"; | 50 | model = "Mele A1000G Quad top set box"; |
@@ -108,8 +107,7 @@ | |||
108 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>; | 107 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>; |
109 | vmmc-supply = <®_dcdc1>; | 108 | vmmc-supply = <®_dcdc1>; |
110 | bus-width = <4>; | 109 | bus-width = <4>; |
111 | cd-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */ | 110 | cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */ |
112 | cd-inverted; | ||
113 | status = "okay"; | 111 | status = "okay"; |
114 | }; | 112 | }; |
115 | 113 | ||
@@ -128,24 +126,19 @@ | |||
128 | 126 | ||
129 | &pio { | 127 | &pio { |
130 | led_pins_m9: led_pins@0 { | 128 | led_pins_m9: led_pins@0 { |
131 | allwinner,pins = "PH13"; | 129 | pins = "PH13"; |
132 | allwinner,function = "gpio_out"; | 130 | function = "gpio_out"; |
133 | allwinner,drive = <SUN4I_PINCTRL_10_MA>; | ||
134 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; | ||
135 | }; | 131 | }; |
136 | 132 | ||
137 | mmc0_cd_pin_m9: mmc0_cd_pin@0 { | 133 | mmc0_cd_pin_m9: mmc0_cd_pin@0 { |
138 | allwinner,pins = "PH22"; | 134 | pins = "PH22"; |
139 | allwinner,function = "gpio_in"; | 135 | function = "gpio_in"; |
140 | allwinner,drive = <SUN4I_PINCTRL_10_MA>; | 136 | bias-pull-up; |
141 | allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; | ||
142 | }; | 137 | }; |
143 | 138 | ||
144 | usb1_vbus_pin_m9: usb1_vbus_pin@0 { | 139 | usb1_vbus_pin_m9: usb1_vbus_pin@0 { |
145 | allwinner,pins = "PC27"; | 140 | pins = "PC27"; |
146 | allwinner,function = "gpio_out"; | 141 | function = "gpio_out"; |
147 | allwinner,drive = <SUN4I_PINCTRL_10_MA>; | ||
148 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; | ||
149 | }; | 142 | }; |
150 | }; | 143 | }; |
151 | 144 | ||