projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-i2c
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
sun5i-a10s-wobo-i5.dts
diff --git
a/arch/arm/dts/sun5i-a10s-wobo-i5.dts
b/arch/arm/dts/sun5i-a10s-wobo-i5.dts
index b5de75f4c710e0c45c4a57ec2b254f5b805c8725..3f68ef5d92a0240d1790e7753bc5f8f5aec5bf96 100644
(file)
--- a/
arch/arm/dts/sun5i-a10s-wobo-i5.dts
+++ b/
arch/arm/dts/sun5i-a10s-wobo-i5.dts
@@
-46,7
+46,6
@@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
/ {
model = "A10s-Wobo i5";
/ {
model = "A10s-Wobo i5";
@@
-95,7
+94,7
@@
&emac {
pinctrl-names = "default";
&emac {
pinctrl-names = "default";
- pinctrl-0 = <&emac_pins_
b
>;
+ pinctrl-0 = <&emac_pins_
a
>;
phy = <&phy1>;
status = "okay";
};
phy = <&phy1>;
status = "okay";
};
@@
-131,8
+130,7
@@
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_wobo_i5>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_wobo_i5>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
- cd-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
- cd-inverted;
+ cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */
status = "okay";
};
status = "okay";
};
@@
-146,24
+144,19
@@
&pio {
led_pins_wobo_i5: led_pins@0 {
&pio {
led_pins_wobo_i5: led_pins@0 {
- allwinner,pins = "PB2";
- allwinner,function = "gpio_out";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PB2";
+ function = "gpio_out";
};
mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 {
};
mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 {
- allwinner,pins = "PB3";
- allwinner,function = "gpio_in";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+ pins = "PB3";
+ function = "gpio_in";
+ bias-pull-up;
};
emac_power_pin_wobo: emac_power_pin@0 {
};
emac_power_pin_wobo: emac_power_pin@0 {
- allwinner,pins = "PA02";
- allwinner,function = "gpio_out";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PA02";
+ function = "gpio_out";
};
};
};
};
@@
-222,10
+215,6
@@
status = "okay";
};
status = "okay";
};
-&usb1_vbus_pin_a {
- allwinner,pins = "PG12";
-};
-
&usbphy {
usb1_vbus-supply = <®_usb1_vbus>;
status = "okay";
&usbphy {
usb1_vbus-supply = <®_usb1_vbus>;
status = "okay";