summaryrefslogtreecommitdiff
path: root/arch/arm/dts/sun7i-a20-pcduino3.dts
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-06-02 13:53:40 (GMT)
committerHans de Goede <hdegoede@redhat.com>2015-06-04 12:12:03 (GMT)
commit8b1ba9415149d238f09614066de4c230cf0f5501 (patch)
treeb492e49fba811b39fab704651174564a36058ec8 /arch/arm/dts/sun7i-a20-pcduino3.dts
parenta52783e11d3b4ce9bb0b8a4bfc7cfab11d3638a1 (diff)
downloadu-boot-8b1ba9415149d238f09614066de4c230cf0f5501.tar.xz
sunxi: Sync dts files with the linux kernel
Copy over all the latest dts changes from mripard/sunxi/dt-for-4.2 , this gives us a proper dtsi file for the A33 rather then abusing sun8i-a23.dtsi for this. And this replaces our minimal (dummy) sun7i-a20-mk808c and sun8i-a33-astar-mid756 dts files with proper ones. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'arch/arm/dts/sun7i-a20-pcduino3.dts')
-rw-r--r--arch/arm/dts/sun7i-a20-pcduino3.dts7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/dts/sun7i-a20-pcduino3.dts b/arch/arm/dts/sun7i-a20-pcduino3.dts
index cd05267..afc9ece 100644
--- a/arch/arm/dts/sun7i-a20-pcduino3.dts
+++ b/arch/arm/dts/sun7i-a20-pcduino3.dts
@@ -17,11 +17,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
@@ -154,7 +149,7 @@
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_pins_a>;
+ pinctrl-0 = <&ir0_rx_pins_a>;
status = "okay";
};