Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8898cb41 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt-for-4.6' of... 

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

Merge "Allwinner DT Additions for 4.6" from Maxime Ripard:

Quite a few changes, among which:
  - Support for the A83t
  - Support for the eMMC DDR on a few boards
  - Support for the OTG controller on a few boards
  - New boards: Itead Ibox, Cubietruck plus, Homlet v2, Lamobo R1

* tag 'sunxi-dt-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (34 commits)
  ARM: dts: sun8i: Add leds and switch on Orangepi Plus boards
  ARM: dts: sun8i: Add ir receiver nodes to H3 dtsi
  ARM: dts: sun8i-h3: Add R_PIO controller node to the dtsi
  dts: sun8i-h3: Add APB0 related clocks and resets
  ARM: dts: sun7i: Add dts file for the lamobo-r1 board
  ARM: dts: sun4i: Enable USB DRC on Hyundai-a7hd
  ARM: dts: sun4i: Enable USB DRC on the MK802
  ARM: dts: sun8i: q8-common: Add AXP223 PMIC device and regulator nodes
  ARM: dts: sun8i: sinlinx-sina33: Add AXP223 PMIC device and regulator nodes
  ARM: dts: sun7i: Enable USB DRC on Olimex A20 EVB
  ARM: dts: sun7i: Enable USB DRC on MK808C
  ARM: dts: sunxi: Fix #interrupt-cells for PIO in H3
  ARM: dts: sun8i-a83t: Correct low speed oscillator clocks
  ARM: dts: sun9i: a80-optimus: Remove i2c3 and uart4
  ARM: dts: sun4i: Itead Iteaduino to use common code
  ARM: dts: sun7i: Add Itead Ibox support
  ARM: dts: sunxi: Add sunxi-itead-core-common.dtsi
  ARM: dts: sun9i: cubieboard4: Enable hardware reset and HS-DDR for eMMC
  ARM: dts: sun9i: a80-optimus: Enable hardware reset and HS-DDR for eMMC
  ARM: dts: sun9i: Include SDC2_RST pin in mmc2_8bit_pins
  ...
parents eff01adb d250d17d

arch/arm/boot/dts/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -675,8 +675,10 @@ dtb-$(CONFIG_MACH_SUN7I) += \ 
	sun7i-a20-cubieboard2.dtb \

	sun7i-a20-cubietruck.dtb \

	sun7i-a20-hummingbird.dtb \

	sun7i-a20-itead-ibox.dtb \

	sun7i-a20-i12-tvbox.dtb \

	sun7i-a20-icnova-swac.dtb \

	sun7i-a20-lamobo-r1.dtb \

	sun7i-a20-m3.dtb \

	sun7i-a20-mk808c.dtb \

	sun7i-a20-olimex-som-evb.dtb \
@@ -700,6 +702,8 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-a33-ippo-q8h-v1.2.dtb \

	sun8i-a33-q8-tablet.dtb \

	sun8i-a33-sinlinx-sina33.dtb \

	sun8i-a83t-allwinner-h8homlet-v2.dtb \

	sun8i-a83t-cubietruck-plus.dtb \

	sun8i-h3-orangepi-plus.dtb

dtb-$(CONFIG_MACH_SUN9I) += \

	sun9i-a80-optimus.dtb \

arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts

+10 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "sunxi-common-regulators.dtsi"

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

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

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



/ {

	model = "Chuwi V7 CW0825";
@@ -88,6 +89,15 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins_a>;

	status = "okay";



	ft5306de4: touchscreen@38 {

		compatible = "edt,edt-ft5406";

		reg = <0x38>;

		interrupt-parent = <&pio>;

		interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>;

		touchscreen-size-x = <1024>;

		touchscreen-size-y = <768>;

	};

};



&lradc {

arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts

+34 −0
Original line number Diff line number Diff line
@@ -87,6 +87,30 @@ 
	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_usb0_vbus {

	status = "okay";

};



&reg_usb2_vbus {

	gpio = <&pio 7 6 GPIO_ACTIVE_HIGH>; /* PH6 */

	status = "okay";
@@ -102,7 +126,17 @@ 
	allwinner,pins = "PH6";

};



&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>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

};

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

+10 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 


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

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

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



/ {

	model = "INet-97F Rev 02";
@@ -93,6 +94,15 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins_a>;

	status = "okay";



	ft5406ee8: touchscreen@38 {

		compatible = "edt,edt-ft5406";

		reg = <0x38>;

		interrupt-parent = <&pio>;

		interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>;

		touchscreen-size-x = <800>;

		touchscreen-size-y = <480>;

	};

};



&lradc {

arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts

+9 −0
Original line number Diff line number Diff line
@@ -253,6 +253,15 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins_a>;

	status = "okay";



	ft5406ee8: touchscreen@38 {

		compatible = "edt,edt-ft5406";

		reg = <0x38>;

		interrupt-parent = <&pio>;

		interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>;

		touchscreen-size-x = <800>;

		touchscreen-size-y = <480>;

	};

};



&lradc {