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 git://git.denx.de/u-boot-rockchip
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
sun7i-a20-m3.dts
diff --git
a/arch/arm/dts/sun7i-a20-m3.dts
b/arch/arm/dts/sun7i-a20-m3.dts
index f2fb26e7d6e5e0b48e6bac5c3de3a74661930224..8d9ea48dd98c43edaa8e8666f8ecaf277b1bfcb2 100644
(file)
--- a/
arch/arm/dts/sun7i-a20-m3.dts
+++ b/
arch/arm/dts/sun7i-a20-m3.dts
@@
-18,11
+18,6
@@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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
* Or, alternatively,
*
* b) Permission is hereby granted, free of charge, to any person
@@
-117,7
+112,7
@@
&ir0 {
pinctrl-names = "default";
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_pins_a>;
+ pinctrl-0 = <&ir0_
rx_
pins_a>;
status = "okay";
};
status = "okay";
};