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

Commit 58d2bc7b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Allwinner DT additions for 4.1, take 1" from Maxime Ripard:

All the device tree related changes for the 4.1 merge window.

It has a rather big diffstat, because of a lot of mechanical and harmless
changes, as described below.

There is mostly:
  - The end of the DT relicensing. All our DT should now be under the dual
    X11/GPL license.
  - Convertion of all the DT to a label based syntax, instead of
    duplicating the tree like was done before.
  - Rework of the A10s and A13 DTSI to share the common devices
  - A few drivers enablings: A80 USB, the A31 PMIC, A31 and A23 arch
    timers, etc
  - Fix the checkpatch warnings
  - A few new boards : cubieboard4, mele i7, utoo p66, auxtex t004,
    pcduino3 nano, gemei G9, mk808c, jesurun q5, orange pi, orange pi mini

* tag 'sunxi-dt-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (84 commits)
  ARM: sunxi: dt: Split the SPI pinctrl groups
  ARM: sunxi: dt: Fix whitespace errors
  ARM: sunxi: DT: Fix lines over 80 characters
  ARM: sunxi: dt: Remove the FSF address
  ARM: sunxi: dts: split IR pins for A10 and A20
  ARM: sun7i: dt: Add new MK808C device
  ARM: dts: sun6i: Set PLL6 as parent to AHB1 clock in AHB1 clock node
  ARM: dts: sunxi: Update ahb clocks for sun5i and sun7i
  ARM: dts: sun7i: Add dts file for the Jesurun Q5 top set box
  ARM: dts: sun5i: Enable touchscreen on Utoo P66
  ARM: dts: sun7i: Add dts file for the Orangepi mini SBC
  ARM: dts: sun7i: Add dts file for the Orangepi SBC
  ARM: dts: sun7i: Add A20 SRAM and SRAM controller
  ARM: dts: sun5i: Add A13 and A10s SRAM and SRAM controller
  ARM: dts: sun4i: Add A10 SRAM and SRAM controller
  ARM: dts: sun5i: Add broken-hpi property for Utoo-P66 eMMC
  ARM: sun8i: dt: Enable A23 SMP support
  ARM: dts: sun6i: Add cpu thermal zones to dtsi
  ARM: dts: sun6i: Add cpu clock reference and operating points to dtsi
  ARM: sunxi: DT: Add stdout-path property
  ...
parents 03d6d706 f3022c6c

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ cnxt Conexant Systems, Inc. 
cortina	Cortina Systems, Inc.

cosmic	Cosmic Circuits

crystalfontz	Crystalfontz America, Inc.

cubietech	Cubietech, Ltd.

dallas	Maxim Integrated Products (formerly Dallas Semiconductor)

davicom	DAVICOM Semiconductor, Inc.

denx	Denx Software Engineering
@@ -202,6 +203,7 @@ variscite Variscite Ltd. 
via	VIA Technologies, Inc.

virtio	Virtual I/O Device Specification, developed by the OASIS consortium

voipac	Voipac Technologies s.r.o.

wexler	Wexler

winbond Winbond Electronics corp.

wlf	Wolfson Microelectronics

wm	Wondermedia Technologies, Inc.

arch/arm/boot/dts/Makefile

+17 −6
Original line number Diff line number Diff line
@@ -527,26 +527,31 @@ dtb-$(CONFIG_MACH_SUN4I) += \ 
	sun4i-a10-ba10-tvbox.dtb \

	sun4i-a10-chuwi-v7-cw0825.dtb \

	sun4i-a10-cubieboard.dtb \

	sun4i-a10-gemei-g9.dtb \

	sun4i-a10-hackberry.dtb \

	sun4i-a10-hyundai-a7hd.dtb \

	sun4i-a10-inet97fv2.dtb \

	sun4i-a10-jesurun-q5.dtb \

	sun4i-a10-marsboard.dtb \

	sun4i-a10-mini-xplus.dtb \

	sun4i-a10-mk802.dtb \

	sun4i-a10-mk802ii.dtb \

	sun4i-a10-hackberry.dtb \

	sun4i-a10-hyundai-a7hd.dtb \

	sun4i-a10-inet97fv2.dtb \

	sun4i-a10-olinuxino-lime.dtb \

	sun4i-a10-pcduino.dtb

dtb-$(CONFIG_MACH_SUN5I) += \

	sun5i-a10s-auxtek-t004.dtb \

	sun5i-a10s-mk802.dtb \

	sun5i-a10s-olinuxino-micro.dtb \

	sun5i-a10s-r7-tv-dongle.dtb \

	sun5i-a13-hsg-h702.dtb \

	sun5i-a13-olinuxino.dtb \

	sun5i-a13-olinuxino-micro.dtb

	sun5i-a13-olinuxino-micro.dtb \

	sun5i-a13-utoo-p66.dtb

dtb-$(CONFIG_MACH_SUN6I) += \

	sun6i-a31-app4-evb1.dtb \

	sun6i-a31-colombus.dtb \

	sun6i-a31-hummingbird.dtb \

	sun6i-a31-i7.dtb \

	sun6i-a31-m9.dtb \

	sun6i-a31s-cs908.dtb

dtb-$(CONFIG_MACH_SUN7I) += \
@@ -557,15 +562,21 @@ dtb-$(CONFIG_MACH_SUN7I) += \ 
	sun7i-a20-hummingbird.dtb \

	sun7i-a20-i12-tvbox.dtb \

	sun7i-a20-m3.dtb \

	sun7i-a20-mk808c.dtb \

	sun7i-a20-olinuxino-lime.dtb \

	sun7i-a20-olinuxino-lime2.dtb \

	sun7i-a20-olinuxino-micro.dtb \

	sun7i-a20-pcduino3.dtb

	sun7i-a20-orangepi.dtb \

	sun7i-a20-orangepi-mini.dtb \

	sun7i-a20-pcduino3.dtb \

	sun7i-a20-pcduino3-nano.dtb \

	sun7i-a20-wexler-tab7200.dtb

dtb-$(CONFIG_MACH_SUN8I) += \

	sun8i-a23-ippo-q8h-v5.dtb \

	sun8i-a23-ippo-q8h-v1.2.dtb

dtb-$(CONFIG_MACH_SUN9I) += \

	sun9i-a80-optimus.dtb

	sun9i-a80-optimus.dtb \

	sun9i-a80-cubieboard4.dtb

dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \

	tegra20-harmony.dtb \

	tegra20-iris-512.dtb \

arch/arm/boot/dts/axp209.dtsi

+0 −5
Original line number Diff line number Diff line
@@ -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

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

+104 −103
Original line number Diff line number Diff line
@@ -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
@@ -58,60 +53,110 @@ 
	model = "Mele A1000";

	compatible = "mele,a1000", "allwinner,sun4i-a10";



	soc@01c00000 {

		emac: ethernet@01c0b000 {

	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

			pinctrl-0 = <&emac_pins_a>;

			phy = <&phy1>;

			status = "okay";

		pinctrl-0 = <&led_pins_a1000>;



		red {

			label = "a1000:red:usr";

			gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>;

		};



		mdio@01c0b080 {

			phy-supply = <&reg_emac_3v3>;

		blue {

			label = "a1000:blue:usr";

			gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;

		};

	};



	reg_emac_3v3: emac-3v3 {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&emac_power_pin_a1000>;

		regulator-name = "emac-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		enable-active-high;

		gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>;

	};

};



&ahci {

	status = "okay";

};



			phy1: ethernet-phy@1 {

				reg = <1>;

&ehci0 {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



		mmc0: mmc@01c0f000 {

&emac {

	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;

	pinctrl-0 = <&emac_pins_a>;

	phy = <&phy1>;

	status = "okay";

};



		usbphy: phy@01c13400 {

			usb1_vbus-supply = <&reg_usb1_vbus>;

			usb2_vbus-supply = <&reg_usb2_vbus>;

&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

	status = "okay";



	axp209: pmic@34 {

		compatible = "x-powers,axp209";

		reg = <0x34>;

		interrupts = <0>;



		interrupt-controller;

		#interrupt-cells = <1>;

	};

};



		ehci0: usb@01c14000 {

&ir0 {

	pinctrl-names = "default";

	pinctrl-0 = <&ir0_rx_pins_a>;

	status = "okay";

};



		ohci0: usb@01c14400 {

&mdio {

	phy-supply = <&reg_emac_3v3>;

	status = "okay";



	phy1: ethernet-phy@1 {

		reg = <1>;

	};

};



		ahci: sata@01c18000 {

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

};



		ehci1: usb@01c1c000 {

&ohci0 {

	status = "okay";

};



		ohci1: usb@01c1c400 {

&ohci1 {

	status = "okay";

};



		pinctrl@01c20800 {

&pio {

	emac_power_pin_a1000: emac_power_pin@0 {

		allwinner,pins = "PH15";

		allwinner,function = "gpio_out";
@@ -127,66 +172,22 @@ 
	};

};



		ir0: ir@01c21800 {

			pinctrl-names = "default";

			pinctrl-0 = <&ir0_pins_a>;

			status = "okay";

		};



		uart0: serial@01c28000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins_a>;

&reg_usb1_vbus {

	status = "okay";

};



		i2c0: i2c@01c2ac00 {

			pinctrl-names = "default";

			pinctrl-0 = <&i2c0_pins_a>;

&reg_usb2_vbus {

	status = "okay";



			axp209: pmic@34 {

				compatible = "x-powers,axp209";

				reg = <0x34>;

				interrupts = <0>;



				interrupt-controller;

				#interrupt-cells = <1>;

			};

		};

};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&led_pins_a1000>;



		red {

			label = "a1000:red:usr";

			gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>;

		};



		blue {

			label = "a1000:blue:usr";

			gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;

		};

	};



	reg_emac_3v3: emac-3v3 {

		compatible = "regulator-fixed";

&uart0 {

	pinctrl-names = "default";

		pinctrl-0 = <&emac_power_pin_a1000>;

		regulator-name = "emac-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		enable-active-high;

		gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>;

	};



	reg_usb1_vbus: usb1-vbus {

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



	reg_usb2_vbus: usb2-vbus {

&usbphy {

	usb1_vbus-supply = <&reg_usb1_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

};
 
};

arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts

+91 −90
Original line number Diff line number Diff line
@@ -16,11 +16,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
@@ -55,94 +50,100 @@ 
	model = "BA10 tvbox";

	compatible = "allwinner,ba10-tvbox", "allwinner,sun4i-a10";



	soc@01c00000 {

		emac: ethernet@01c0b000 {

	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};



&ehci0 {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&emac_pins_a>;

	phy = <&phy1>;

	status = "okay";

};



		mdio@01c0b080 {

&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

	status = "okay";



			phy1: ethernet-phy@1 {

				reg = <1>;

	axp209: pmic@34 {

		compatible = "x-powers,axp209";

		reg = <0x34>;

		interrupts = <0>;



		interrupt-controller;

		#interrupt-cells = <1>;

	};

};



		mmc0: mmc@01c0f000 {

&ir0 {

	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;

	pinctrl-0 = <&ir0_rx_pins_a>;

	status = "okay";

};



		usbphy: phy@01c13400 {

			usb1_vbus-supply = <&reg_usb1_vbus>;

			usb2_vbus-supply = <&reg_usb2_vbus>;

&mdio {

	status = "okay";

		};



		ehci0: usb@01c14000 {

			status = "okay";

	phy1: ethernet-phy@1 {

		reg = <1>;

	};

};



		ohci0: usb@01c14400 {

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

};



		ehci1: usb@01c1c000 {

&ohci0 {

	status = "okay";

};



		ohci1: usb@01c1c400 {

&ohci1 {

	status = "okay";

};



		pinctrl@01c20800 {

&pio {

	usb2_vbus_pin_a: usb2_vbus_pin@0 {

		allwinner,pins = "PH12";

	};

};



		ir0: ir@01c21800 {

			pinctrl-names = "default";

			pinctrl-0 = <&ir0_pins_a>;

&reg_usb1_vbus {

	status = "okay";

};



		uart0: serial@01c28000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins_a>;

&reg_usb2_vbus {

	gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>;

	status = "okay";

};



		i2c0: i2c@01c2ac00 {

&uart0 {

	pinctrl-names = "default";

			pinctrl-0 = <&i2c0_pins_a>;

			status = "okay";



			axp209: pmic@34 {

				compatible = "x-powers,axp209";

				reg = <0x34>;

				interrupts = <0>;



				interrupt-controller;

				#interrupt-cells = <1>;

			};

		};

	};



	reg_usb1_vbus: usb1-vbus {

	pinctrl-0 = <&uart0_pins_a>;

	status = "okay";

};



	reg_usb2_vbus: usb2-vbus {

		gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>;

&usbphy {

	usb1_vbus-supply = <&reg_usb1_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

};
 
};