diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-06-02 15:53:40 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2015-06-04 14:12:03 +0200 |
| commit | 8b1ba9415149d238f09614066de4c230cf0f5501 (patch) | |
| tree | b492e49fba811b39fab704651174564a36058ec8 /arch/arm/dts/sun7i-a20-cubietruck.dts | |
| parent | a52783e11d3b4ce9bb0b8a4bfc7cfab11d3638a1 (diff) | |
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-cubietruck.dts')
| -rw-r--r-- | arch/arm/dts/sun7i-a20-cubietruck.dts | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/dts/sun7i-a20-cubietruck.dts b/arch/arm/dts/sun7i-a20-cubietruck.dts index 613a19e63e..4611e2f5a9 100644 --- a/arch/arm/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/dts/sun7i-a20-cubietruck.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 @@ -160,7 +155,7 @@ &ir0 { pinctrl-names = "default"; - pinctrl-0 = <&ir0_pins_a>; + pinctrl-0 = <&ir0_rx_pins_a>; status = "okay"; }; |