diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-17 09:19:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-17 09:19:45 -0400 |
| commit | 4b37f36d68ebb79cdc7d68a539de71e28e954d11 (patch) | |
| tree | c982cc1d42e8eeb28dc1dc31d027e1fe145f113d /arch/arm/dts/sun7i-a20-itead-ibox.dts | |
| parent | 14b8c420b88a90e7ca0c979a2ee413bf459941e8 (diff) | |
| parent | f8c8669760610b2949d8d9ccaeef8231a44d4205 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
- Convert DM_MMC and DM_SCSI
- A20, R40, H6 Linux dts(i) sync
- CLK, RESET support for sunxi, sun8_emac net drivers
Diffstat (limited to 'arch/arm/dts/sun7i-a20-itead-ibox.dts')
| -rw-r--r-- | arch/arm/dts/sun7i-a20-itead-ibox.dts | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/dts/sun7i-a20-itead-ibox.dts b/arch/arm/dts/sun7i-a20-itead-ibox.dts index 1b05ba466e..b90a7607d0 100644 --- a/arch/arm/dts/sun7i-a20-itead-ibox.dts +++ b/arch/arm/dts/sun7i-a20-itead-ibox.dts @@ -96,7 +96,7 @@ &gmac { pinctrl-names = "default"; - pinctrl-0 = <&gmac_pins_mii_a>; + pinctrl-0 = <&gmac_mii_pins>; phy = <&phy1>; phy-mode = "mii"; status = "okay"; @@ -115,13 +115,11 @@ &ir0 { pinctrl-names = "default"; - pinctrl-0 = <&ir0_rx_pins_a>; + pinctrl-0 = <&ir0_rx_pin>; status = "okay"; }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ @@ -129,7 +127,7 @@ }; &pio { - led_pins_itead_core: led_pins@0 { + led_pins_itead_core: led-pins { pins = "PH20","PH21"; function = "gpio_out"; drive-strength = <20>; @@ -142,6 +140,6 @@ &spdif { pinctrl-names = "default"; - pinctrl-0 = <&spdif_tx_pins_a>; + pinctrl-0 = <&spdif_tx_pin>; status = "okay"; }; |