diff options
| author | Tom Rini <trini@konsulko.com> | 2015-06-06 07:03:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-06 07:03:07 -0400 |
| commit | 290ac3bb1a1fbd85abcecfd8ff8cb837029d067a (patch) | |
| tree | 4c39ddea7744e46fb15c778f394a77f55bd28a84 /arch/arm/dts/sun4i-a10-a1000.dts | |
| parent | f1737152c01734749c3694d30e1aa86ab28f374e (diff) | |
| parent | 277af820b5207d43473869da2c86412d2b51d461 (diff) | |
| download | u-boot-imx-290ac3bb1a1fbd85abcecfd8ff8cb837029d067a.zip u-boot-imx-290ac3bb1a1fbd85abcecfd8ff8cb837029d067a.tar.gz u-boot-imx-290ac3bb1a1fbd85abcecfd8ff8cb837029d067a.tar.bz2 | |
Merge git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/dts/sun4i-a10-a1000.dts')
| -rw-r--r-- | arch/arm/dts/sun4i-a10-a1000.dts | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/dts/sun4i-a10-a1000.dts b/arch/arm/dts/sun4i-a10-a1000.dts index f032814..2630d78 100644 --- a/arch/arm/dts/sun4i-a10-a1000.dts +++ b/arch/arm/dts/sun4i-a10-a1000.dts @@ -18,11 +18,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this file; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - * * Or, alternatively, * * b) Permission is hereby granted, free of charge, to any person @@ -113,6 +108,10 @@ status = "okay"; }; +&emac_sram { + status = "okay"; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins_a>; @@ -130,7 +129,7 @@ &ir0 { pinctrl-names = "default"; - pinctrl-0 = <&ir0_pins_a>; + pinctrl-0 = <&ir0_rx_pins_a>; status = "okay"; }; |