Commit 3d2ef3b3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-dt-for-4.4-3' of... 

Merge tag 'sunxi-dt-for-4.4-3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt

Allwinner DT changes for 4.4, round 3

A bunch of new boards, but mostly enable the support for the Audio Codec
on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various
boards.

* tag 'sunxi-dt-for-4.4-3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux

:
  ARM: dts: sun6i: Add dts file for MSI Primo81 tablet
  ARM: dts: sun6i: Add simplefb node labels to reference at board level
  ARM: dts: sun4i: Enable audio codec on Marsboard A10.
  ARM: dts: sun4i: Add dts file for the pov protab2-ips9 tablet
  ARM: sun4i: Enable cubieboard audio codec
  ARM: sun5i: chip: Enable the audio codec
  ARM: sun4i: Enable audio-codec on Mele A1000
  ARM: sun7i: Enable cubieboard2 audio codec
  ARM: sun7i: dt: enable audio codec on Cubietruck
  ARM: sun7i: Add sunxi codec device node
  ARM: sun5i: Add the Audio codec DT node
  ARM: sun4i: Add sunxi codec device node
  ARM: sun7i: Add audio codec clock
  ARM: sun5i: Add audio codec clock
  ARM: sun4i: Add audio codec clock
  ARM: sun7i: Add audio PLL
  ARM: sun5i: Add audio PLL
  ARM: sun4i: Add audio PLL
  ARM: dts: sun7i: Enable USB DRC on pcDuino v3 Nano
  ARM: dts: sun6i: Add support for Sinlinx A31s SDK board

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents edd2a06d a5ea06d0

arch/arm/boot/dts/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -603,7 +603,8 @@ dtb-$(CONFIG_MACH_SUN4I) += \ 
	sun4i-a10-mk802ii.dtb \

	sun4i-a10-olinuxino-lime.dtb \

	sun4i-a10-pcduino.dtb \

	sun4i-a10-pcduino2.dtb

	sun4i-a10-pcduino2.dtb \

	sun4i-a10-pov-protab2-ips9.dtb

dtb-$(CONFIG_MACH_SUN5I) += \

	sun5i-a10s-auxtek-t003.dtb \

	sun5i-a10s-auxtek-t004.dtb \
@@ -626,6 +627,8 @@ dtb-$(CONFIG_MACH_SUN6I) += \ 
	sun6i-a31-m9.dtb \

	sun6i-a31-mele-a1000g-quad.dtb \

	sun6i-a31s-cs908.dtb \

	sun6i-a31s-primo81.dtb \

	sun6i-a31s-sina31s.dtb \

	sun6i-a31s-sinovoip-bpi-m2.dtb \

	sun6i-a31s-yones-toptech-bs1078-v2.dtb

dtb-$(CONFIG_MACH_SUN7I) += \

arch/arm/boot/dts/sun4i-a10-a1000.dts

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ 
	status = "okay";

};



&codec {

	status = "okay";

};



&ehci0 {

	status = "okay";

};

arch/arm/boot/dts/sun4i-a10-cubieboard.dts

+4 −0
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ 
	status = "okay";

};



&codec {

	status = "okay";

};



&cpu0 {

	cpu-supply = <&reg_dcdc2>;

};

arch/arm/boot/dts/sun4i-a10-marsboard.dts

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ 
	status = "okay";

};



&codec {

	status = "okay";

};



&ehci0 {

	status = "okay";

};

arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts

0 → 100644
+199 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Hans de Goede <hdegoede@redhat.com>

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This file is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */



/dts-v1/;

#include "sun4i-a10.dtsi"

#include "sunxi-common-regulators.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/pinctrl/sun4i-a10.h>



/ {

	model = "Point of View Protab2-IPS9";

	compatible = "pov,protab2-ips9", "allwinner,sun4i-a10";



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};



&cpu0 {

	cpu-supply = <&reg_dcdc2>;

};



&ehci0 {

	status = "okay";

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

	status = "okay";



	axp209: pmic@34 {

		reg = <0x34>;

		interrupts = <0>;

	};

};



#include "axp209.dtsi"



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins_a>;

	/* pull-ups and devices require AXP209 LDO3 */

	status = "failed";

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins_a>;

	status = "okay";

};



&lradc {

	vref-supply = <&reg_ldo2>;

	status = "okay";



	button@400 {

		label = "Volume Up";

		linux,code = <KEY_VOLUMEUP>;

		channel = <0>;

		voltage = <400000>;

	};



	button@800 {

		label = "Volume Down";

		linux,code = <KEY_VOLUMEDOWN>;

		channel = <0>;

		voltage = <800000>;

	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

	cd-inverted;

	status = "okay";

};



&otg_sram {

	status = "okay";

};



&pio {

	usb0_id_detect_pin: usb0_id_detect_pin@0 {

		allwinner,pins = "PH4";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

	};



	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {

		allwinner,pins = "PH5";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;

	};

};



&reg_dcdc2 {

	regulator-always-on;

	regulator-min-microvolt = <1000000>;

	regulator-max-microvolt = <1400000>;

	regulator-name = "vdd-cpu";

};



&reg_dcdc3 {

	regulator-always-on;

	regulator-min-microvolt = <1250000>;

	regulator-max-microvolt = <1250000>;

	regulator-name = "vdd-int-dll";

};



&reg_ldo1 {

	regulator-name = "vdd-rtc";

};



&reg_ldo2 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "avcc";

};



&reg_usb0_vbus {

	status = "okay";

};



&reg_usb1_vbus {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



&usb_otg {

	dr_mode = "otg";

	status = "okay";

};



&usbphy {

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;

	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */

	usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb1_vbus-supply = <&reg_usb1_vbus>;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE