Skip to contentSkip to conversation

sunxi: Sync dts files with upstream kernel

PATCH New Hans de Goede 2 participants 3 messages Aug 19, 2016

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sunxi: Sync dts files with upstream kernel

Sync dts files with the current (Aug 18th 2016) state of Maxime's linux/sunxi/for-next repo.

Note this commit also updates configs/MSI_Primo81_defconfig,
adding: "# CONFIG_REQUIRE_SERIAL_CONSOLE is not set", this is necessary because the tablet does not have a reachable uart so the dts sync drops its serial0 alias.

---
 arch/arm/dts/Makefile                              |   3 +
 arch/arm/dts/axp209.dtsi                           |   1 +
 .../dts/{sun5i-a13-q8-tablet.dts => axp809.dtsi}   |  27 +-
 arch/arm/dts/sun4i-a10-a1000.dts                   |  28 +-
 arch/arm/dts/sun4i-a10-hackberry.dts               |   1 +
 arch/arm/dts/sun4i-a10-hyundai-a7hd.dts            |  34 ++
 arch/arm/dts/sun4i-a10-jesurun-q5.dts              |   1 +
 arch/arm/dts/sun4i-a10.dtsi                        | 286 ++++++++---
 arch/arm/dts/sun5i-a10s-mk802.dts                  |  32 ++
 arch/arm/dts/sun5i-a10s-olinuxino-micro.dts        |   7 +
 arch/arm/dts/sun5i-a10s-wobo-i5.dts                |  10 +-
 arch/arm/dts/sun5i-a10s.dtsi                       |  31 +-
 arch/arm/dts/sun5i-a13-difrnce-dit4350.dts         | 178 +------
 arch/arm/dts/sun5i-a13-olinuxino-micro.dts         |  41 ++
 arch/arm/dts/sun5i-a13-olinuxino.dts               |  15 -
 arch/arm/dts/sun5i-a13-q8-tablet.dts               |  40 +-
 arch/arm/dts/sun5i-a13-utoo-p66.dts                | 180 +------
 arch/arm/dts/sun5i-a13.dtsi                        | 188 ++++++-
 arch/arm/dts/sun5i-r8-chip.dts                     |  29 +-
 arch/arm/dts/sun5i-r8.dtsi                         |  32 +-
 ...4350.dts => sun5i-reference-design-tablet.dtsi} |  82 ++--
 arch/arm/dts/sun5i.dtsi                            |  92 ++--
 arch/arm/dts/sun6i-a31-m9.dts                      |  96 +++-
 arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts        |  96 +++-
 arch/arm/dts/sun6i-a31.dtsi                        |  12 +-
 arch/arm/dts/sun6i-a31s-colorfly-e708-q1.dts       | 138 +-----
 arch/arm/dts/sun6i-a31s-primo81.dts                |  10 -
 .../arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts |   2 -
 ...amobo-r1.dts => sun7i-a20-bananapi-m1-plus.dts} | 196 +++-----
 arch/arm/dts/sun7i-a20-cubietruck.dts              |  24 +
 arch/arm/dts/sun7i-a20-itead-ibox.dts              |  24 +
 arch/arm/dts/sun7i-a20-lamobo-r1.dts               |  80 ++-
 ...plus.dts => sun7i-a20-olinuxino-lime2-emmc.dts} |  57 +--
 arch/arm/dts/sun7i-a20.dtsi                        | 546 +++++++++++++++------
 arch/arm/dts/sun8i-a23-a33.dtsi                    |   9 +-
 arch/arm/dts/sun8i-a23-gt90h-v4.dts                | 194 +-------
 arch/arm/dts/sun8i-a23-inet86dz.dts                | 238 +--------
 arch/arm/dts/sun8i-a23-polaroid-mid2407pxe03.dts   | 243 ++-------
 arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts   | 201 ++------
 arch/arm/dts/sun8i-a23-q8-tablet.dts               |  15 -
 arch/arm/dts/sun8i-a33-ga10h-v1.1.dts              |  80 +--
 arch/arm/dts/sun8i-a33-q8-tablet.dts               |  15 -
 ...rangepi-2.dts => sun8i-h3-bananapi-m2-plus.dts} | 104 ++--
 arch/arm/dts/sun8i-h3-orangepi-2.dts               |  23 +-
 arch/arm/dts/sun8i-h3-orangepi-lite.dts            |   2 +-
 arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts         |   3 +-
 arch/arm/dts/sun8i-h3-orangepi-pc.dts              |  30 +-
 arch/arm/dts/sun8i-h3-orangepi-plus.dts            |  34 ++
 arch/arm/dts/sun8i-h3.dtsi                         | 366 ++++----------
 arch/arm/dts/sun8i-q8-common.dtsi                  | 157 ++----
 arch/arm/dts/sun8i-r16-parrot.dts                  |   5 +-
 ...86dz.dts => sun8i-reference-design-tablet.dtsi} |  85 +---
 arch/arm/dts/sun9i-a80-cubieboard4.dts             | 164 ++++++-
 arch/arm/dts/sun9i-a80-optimus.dts                 | 195 ++++++--
 ...blet.dts => sunxi-reference-design-tablet.dtsi} |  48 +-
 configs/MSI_Primo81_defconfig                      |   1 +
 include/dt-bindings/clock/sun8i-h3-ccu.h           | 145 ++++++
 .../dt-bindings/reset/sun8i-h3-ccu.h               | 121 +++--
 58 files changed, 2482 insertions(+), 2615 deletions(-)
 copy arch/arm/dts/{sun5i-a13-q8-tablet.dts => axp809.dtsi} (83%)
 copy arch/arm/dts/{sun5i-a13-difrnce-dit4350.dts => sun5i-reference-design-tablet.dtsi} (81%)
 copy arch/arm/dts/{sun7i-a20-lamobo-r1.dts => sun7i-a20-bananapi-m1-plus.dts} (62%)
 copy arch/arm/dts/{sun8i-h3-orangepi-pc-plus.dts => sun7i-a20-olinuxino-lime2-emmc.dts} (70%)
 copy arch/arm/dts/{sun8i-h3-orangepi-2.dts => sun8i-h3-bananapi-m2-plus.dts} (76%)
 copy arch/arm/dts/{sun8i-a23-inet86dz.dts => sun8i-reference-design-tablet.dtsi} (80%)
 copy arch/arm/dts/{sun8i-a23-q8-tablet.dts => sunxi-reference-design-tablet.dtsi} (75%)
 create mode 100644 include/dt-bindings/clock/sun8i-h3-ccu.h
 copy arch/arm/dts/sun4i-a10-hyundai-a7hd.dts => include/dt-bindings/reset/sun8i-h3-ccu.h (55%)
arch/arm/dts/Makefile +3 -0
index 29d5567..815ea86 100644
@@ -208,6 +208,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
 dtb-$(CONFIG_MACH_SUN7I) += \
 	sun7i-a20-ainol-aw1.dtb \
 	sun7i-a20-bananapi.dtb \
+	sun7i-a20-bananapi-m1-plus.dtb \
 	sun7i-a20-bananapro.dtb \
 	sun7i-a20-cubieboard2.dtb \
 	sun7i-a20-cubietruck.dtb \
@@ -222,6 +223,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
 	sun7i-a20-olimex-som-evb.dtb \
 	sun7i-a20-olinuxino-lime.dtb \
 	sun7i-a20-olinuxino-lime2.dtb \
+	sun7i-a20-olinuxino-lime2-emmc.dtb \
 	sun7i-a20-olinuxino-micro.dtb \
 	sun7i-a20-orangepi.dtb \
 	sun7i-a20-orangepi-mini.dtb \
@@ -248,6 +250,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \
 	sun8i-a83t-cubietruck-plus.dtb \
 	sun8i-a83t-sinovoip-bpi-m3.dtb
 dtb-$(CONFIG_MACH_SUN8I_H3) += \
+	sun8i-h3-bananapi-m2-plus.dtb \
 	sun8i-h3-orangepi-2.dtb \
 	sun8i-h3-orangepi-lite.dtb \
 	sun8i-h3-orangepi-one.dtb \
arch/arm/dts/axp209.dtsi +1 -0
index 051ab3b..afbe89c 100644
@@ -87,6 +87,7 @@
 
 		reg_ldo5: ldo5 {
 			regulator-name = "ldo5";
+			status = "disabled";
 		};
 	};
 
arch/arm/dts/axp809.dtsi renamed from arch/arm/dts/sun5i-a13-q8-tablet.dts +10 -17
similarity index 83%
copy from arch/arm/dts/sun5i-a13-q8-tablet.dts
copy to arch/arm/dts/axp809.dtsi
index 72e93ac..ab8e5f2 100644
@@ -1,5 +1,7 @@
 /*
- * Copyright 2015 Hans de Goede <[email protected]>
+ * Copyright 2015 Chen-Yu Tsai
+ *
+ * Chen-Yu Tsai <[email protected]>
  *
  * 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
@@ -40,21 +42,12 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/dts-v1/;
-#include "sun5i-a13.dtsi"
-#include "sun5i-q8-common.dtsi"
-
-/ {
-	model = "Q8 A13 Tablet";
-	compatible = "allwinner,q8-a13", "allwinner,sun5i-a13";
-};
-
-&reg_ldo3 {
-	regulator-min-microvolt = <3300000>;
-	regulator-max-microvolt = <3300000>;
-	regulator-name = "vcc-wifi";
-};
+/*
+ * AXP809 Integrated Power Management Chip
+ */
 
-&usbphy {
-	usb1_vbus-supply = <&reg_ldo3>;
+&axp809 {
+	compatible = "x-powers,axp809";
+	interrupt-controller;
+	#interrupt-cells = <1>;
 };
arch/arm/dts/sun4i-a10-a1000.dts +27 -1
index 97570cb..39e368e 100644
@@ -72,8 +72,9 @@
 		};
 
 		blue {
-			label = "a1000:blue:usr";
+			label = "a1000:blue:pwr";
 			gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;
+			default-state = "on";
 		};
 	};
 
@@ -84,9 +85,28 @@
 		regulator-name = "emac-3v3";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <20000>;
 		enable-active-high;
 		gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>;
 	};
+
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "On-board SPDIF";
+
+		simple-audio-card,cpu {
+			sound-dai = <&spdif>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&spdif_out>;
+		};
+	};
+
+	spdif_out: spdif-out {
+		#sound-dai-cells = <0>;
+		compatible = "linux,spdif-dit";
+	};
 };
 
 &ahci {
@@ -188,6 +208,12 @@
 	status = "okay";
 };
 
+&spdif {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spdif_tx_pins_a>;
+	status = "okay";
+};
+
 &uart0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart0_pins_a>;
arch/arm/dts/sun4i-a10-hackberry.dts +1 -0
index 2b17c51..6de83a6 100644
@@ -66,6 +66,7 @@
 		regulator-name = "emac-3v3";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <20000>;
 		enable-active-high;
 		gpio = <&pio 7 19 GPIO_ACTIVE_HIGH>;
 	};
arch/arm/dts/sun4i-a10-hyundai-a7hd.dts +34 -0
index 43f58fb..9103864 100644
@@ -87,6 +87,30 @@
 	status = "okay";
 };
 
+&otg_sram {
+	status = "okay";
+};
+
+&pio {
+	usb0_id_detect_pin: usb0_id_detect_pin at 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 at 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/dts/sun4i-a10-jesurun-q5.dts +1 -0
index 7afc7a6..e28f080 100644
@@ -80,6 +80,7 @@
 		regulator-name = "emac-3v3";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <20000>;
 		enable-active-high;
 		gpio = <&pio 7 19 GPIO_ACTIVE_HIGH>;   /* PH19 */
 	};
arch/arm/dts/sun4i-a10.dtsi +226 -60

420 lines not on this page · raw message

arch/arm/dts/sun5i-a10s-mk802.dts +32 -0
index 46ff940..23b0114 100644
@@ -73,6 +73,20 @@
 	status = "okay";
 };
 
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0_pins_a>;
+	status = "okay";
+
+	axp152: pmic at 30 {
+		compatible = "x-powers,axp152";
+		reg = <0x30>;
+		interrupts = <0>;
+		interrupt-controller;
+		#interrupt-cells = <1>;
+	};
+};
+
 &mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_mk802>;
@@ -83,10 +97,23 @@
 	status = "okay";
 };
 
+&mmc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins_a>;
+	vmmc-supply = <&reg_vcc3v3>;
+	bus-width = <4>;
+	non-removable;
+	status = "okay";
+};
+
 &ohci0 {
 	status = "okay";
 };
 
+&otg_sram {
+	status = "okay";
+};
+
 &pio {
 	led_pins_mk802: led_pins at 0 {
 		allwinner,pins = "PB2";
@@ -122,6 +149,11 @@
 	status = "okay";
 };
 
+&usb_otg {
+	dr_mode = "otg";
+	status = "okay";
+};
+
 &usbphy {
 	usb1_vbus-supply = <&reg_usb1_vbus>;
 	status = "okay";
arch/arm/dts/sun5i-a10s-olinuxino-micro.dts +7 -0
index 86d046a..aef9147 100644
@@ -248,6 +248,13 @@
 	status = "okay";
 };
 
+&spi2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi2_pins_a>,
+		    <&spi2_cs0_pins_a>;
+	status = "okay";
+};
+
 &uart0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart0_pins_a>;
arch/arm/dts/sun5i-a10s-wobo-i5.dts +9 -1
index 9fea918..b5de75f 100644
@@ -79,6 +79,7 @@
 		regulator-name = "emac-3v3";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <20000>;
 		enable-active-high;
 		gpio = <&pio 0 2 GPIO_ACTIVE_HIGH>;
 	};
@@ -195,7 +196,14 @@
 	regulator-always-on;
 	regulator-min-microvolt = <3300000>;
 	regulator-max-microvolt = <3300000>;
-	regulator-name = "vcc-wifi";
+	regulator-name = "vcc-wifi1";
+};
+
+&reg_ldo4 {
+	regulator-always-on;
+	regulator-min-microvolt = <3300000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-name = "vcc-wifi2";
 };
 
 &reg_usb1_vbus {
arch/arm/dts/sun5i-a10s.dtsi +16 -15
index a5f8855..c41a2ba 100644
@@ -65,8 +65,8 @@
 			compatible = "allwinner,simple-framebuffer",
 				     "simple-framebuffer";
 			allwinner,pipeline = "de_be0-lcd0-hdmi";
-			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
-				 <&ahb_gates 44>;
+			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,
+				 <&ahb_gates 43>, <&ahb_gates 44>;
 			status = "disabled";
 		};
 
@@ -74,7 +74,8 @@
 			compatible = "allwinner,simple-framebuffer",
 				     "simple-framebuffer";
 			allwinner,pipeline = "de_be0-lcd0";
-			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>;
+			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,
+				 <&ahb_gates 44>;
 			status = "disabled";
 		};
 
@@ -82,8 +83,8 @@
 			compatible = "allwinner,simple-framebuffer",
 				     "simple-framebuffer";
 			allwinner,pipeline = "de_be0-lcd0-tve0";
-			clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,
-				 <&ahb_gates 44>;
+			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 34>,
+				 <&ahb_gates 36>, <&ahb_gates 44>;
 			status = "disabled";
 		};
 	};
@@ -242,18 +243,18 @@
 		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 	};
 
-	nand_cs2_pins_a: nand_cs at 2 {
-		allwinner,pins = "PC17";
-		allwinner,function = "nand0";
-		allwinner,drive = <0>;
-		allwinner,pull = <0>;
+	spi2_pins_a: spi2 at 0 {
+		allwinner,pins = "PB12", "PB13", "PB14";
+		allwinner,function = "spi2";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 	};
 
-	nand_cs3_pins_a: nand_cs at 3 {
-		allwinner,pins = "PC18";
-		allwinner,function = "nand0";
-		allwinner,drive = <0>;
-		allwinner,pull = <0>;
+	spi2_cs0_pins_a: spi2_cs0 at 0 {
+		allwinner,pins = "PB11";
+		allwinner,function = "spi2";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 	};
 };
 
arch/arm/dts/sun5i-a13-difrnce-dit4350.dts +1 -177

186 lines not on this page · raw message

arch/arm/dts/sun5i-a13-olinuxino-micro.dts +41 -0

66 lines not on this page · raw message

arch/arm/dts/sun5i-a13-olinuxino.dts +0 -15
index 30e069a..b3c234c 100644
@@ -155,21 +155,6 @@
 	status = "okay";
 };
 
-&nfc {
-	pinctrl-names = "default";
-	pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>;
-	status = "okay";
-
-	nand at 0 {
-		#address-cells = <2>;
-		#size-cells = <2>;
-		reg = <0>;
-		allwinner,rb = <0>;
-		nand-ecc-mode = "hw";
-		allwinner,randomize;
-	};
-};
-
 &ohci0 {
 	status = "okay";
 };
arch/arm/dts/sun5i-a13-q8-tablet.dts +33 -7
index 72e93ac..a89f29f 100644
@@ -42,19 +42,45 @@
 
 /dts-v1/;
 #include "sun5i-a13.dtsi"
-#include "sun5i-q8-common.dtsi"
+#include "sun5i-reference-design-tablet.dtsi"
 
 / {
 	model = "Q8 A13 Tablet";
 	compatible = "allwinner,q8-a13", "allwinner,sun5i-a13";
+
+	panel: panel {
+		compatible = "urt,umsh-8596md-t", "simple-panel";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port at 0 {
+			reg = <0>;
+			/* TODO: lcd panel uses axp gpio0 as enable pin */
+			backlight = <&backlight>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			panel_input: endpoint at 0 {
+				reg = <0>;
+				remote-endpoint = <&tcon0_out_lcd>;
+			};
+		};
+	};
+};
+
+&be0 {
+	status = "okay";
 };
 
-&reg_ldo3 {
-	regulator-min-microvolt = <3300000>;
-	regulator-max-microvolt = <3300000>;
-	regulator-name = "vcc-wifi";
+&tcon0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&lcd_rgb666_pins>;
+	status = "okay";
 };
 
-&usbphy {
-	usb1_vbus-supply = <&reg_ldo3>;
+&tcon0_out {
+	tcon0_out_lcd: endpoint at 0 {
+		reg = <0>;
+		remote-endpoint = <&panel_input>;
+	};
 };
arch/arm/dts/sun5i-a13-utoo-p66.dts +21 -159

230 lines not on this page · raw message

arch/arm/dts/sun5i-a13.dtsi +183 -5

227 lines not on this page · raw message

arch/arm/dts/sun5i-r8-chip.dts +13 -16
index b1b62d5..7a8cc27 100644
@@ -52,7 +52,7 @@
 
 / {
 	model = "NextThing C.H.I.P.";
-	compatible = "nextthing,chip", "allwinner,sun5i-r8";
+	compatible = "nextthing,chip", "allwinner,sun5i-r8", "allwinner,sun5i-a13";
 
 	aliases {
 		i2c0 = &i2c0;
@@ -78,6 +78,10 @@
 	};
 };
 
+&be0 {
+	status = "okay";
+};
+
 &codec {
 	status = "okay";
 };
@@ -142,21 +146,6 @@
 	status = "okay";
 };
 
-&nfc {
-	pinctrl-names = "default";
-	pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>;
-	status = "okay";
-
-	nand at 0 {
-		#address-cells = <2>;
-		#size-cells = <2>;
-		reg = <0>;
-		allwinner,rb = <0>;
-		nand-ecc-mode = "hw";
-		nand-on-flash-bbt;
-	};
-};
-
 &ohci0 {
 	status = "okay";
 };
@@ -240,6 +229,14 @@
 	status = "okay";
 };
 
+&tcon0 {
+	status = "okay";
+};
+
+&tve0 {
+	status = "okay";
+};
+
 &uart1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart1_pins_b>;
arch/arm/dts/sun5i-r8.dtsi +30 -2
index 0ef8656..8b058f5 100644
@@ -51,9 +51,37 @@
 			compatible = "allwinner,simple-framebuffer",
 				     "simple-framebuffer";
 			allwinner,pipeline = "de_be0-lcd0-tve0";
-			clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,
-				 <&ahb_gates 44>;
+			clocks = <&ahb_gates 34>, <&ahb_gates 36>,
+				 <&ahb_gates 44>, <&de_be_clk>,
+				 <&tcon_ch1_clk>, <&dram_gates 26>;
 			status = "disabled";
 		};
 	};
+
+	soc at 01c00000 {
+		tve0: tv-encoder at 01c0a000 {
+			compatible = "allwinner,sun4i-a10-tv-encoder";
+			reg = <0x01c0a000 0x1000>;
+			clocks = <&ahb_gates 34>;
+			resets = <&tcon_ch0_clk 0>;
+			status = "disabled";
+
+			port {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				tve0_in_tcon0: endpoint at 0 {
+					reg = <0>;
+					remote-endpoint = <&tcon0_out_tve0>;
+				};
+			};
+		};
+	};
+};
+
+&tcon0_out {
+	tcon0_out_tve0: endpoint at 1 {
+		reg = <1>;
+		remote-endpoint = <&tve0_in_tcon0>;
+	};
 };
arch/arm/dts/sun5i-reference-design-tablet.dtsi renamed from arch/arm/dts/sun5i-a13-difrnce-dit4350.dts +33 -49

162 lines not on this page · raw message

arch/arm/dts/sun5i.dtsi +43 -49

122 lines not on this page · raw message

arch/arm/dts/sun6i-a31-m9.dts +94 -2

136 lines not on this page · raw message

arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts +94 -2

136 lines not on this page · raw message

arch/arm/dts/sun6i-a31.dtsi +8 -4
index 1867af2..b674bf7 100644
@@ -469,7 +469,8 @@
 		};
 
 		mmc0: mmc at 01c0f000 {
-			compatible = "allwinner,sun5i-a13-mmc";
+			compatible = "allwinner,sun7i-a20-mmc",
+				     "allwinner,sun5i-a13-mmc";
 			reg = <0x01c0f000 0x1000>;
 			clocks = <&ahb1_gates 8>,
 				 <&mmc0_clk 0>,
@@ -488,7 +489,8 @@
 		};
 
 		mmc1: mmc at 01c10000 {
-			compatible = "allwinner,sun5i-a13-mmc";
+			compatible = "allwinner,sun7i-a20-mmc",
+				     "allwinner,sun5i-a13-mmc";
 			reg = <0x01c10000 0x1000>;
 			clocks = <&ahb1_gates 9>,
 				 <&mmc1_clk 0>,
@@ -507,7 +509,8 @@
 		};
 
 		mmc2: mmc at 01c11000 {
-			compatible = "allwinner,sun5i-a13-mmc";
+			compatible = "allwinner,sun7i-a20-mmc",
+				     "allwinner,sun5i-a13-mmc";
 			reg = <0x01c11000 0x1000>;
 			clocks = <&ahb1_gates 10>,
 				 <&mmc2_clk 0>,
@@ -526,7 +529,8 @@
 		};
 
 		mmc3: mmc at 01c12000 {
-			compatible = "allwinner,sun5i-a13-mmc";
+			compatible = "allwinner,sun7i-a20-mmc",
+				     "allwinner,sun5i-a13-mmc";
 			reg = <0x01c12000 0x1000>;
 			clocks = <&ahb1_gates 11>,
 				 <&mmc3_clk 0>,
arch/arm/dts/sun6i-a31s-colorfly-e708-q1.dts +1 -137

159 lines not on this page · raw message

arch/arm/dts/sun6i-a31s-primo81.dts +0 -10
index 379746a..73c133f 100644
@@ -53,14 +53,6 @@
 / {
 	model = "MSI Primo81 tablet";
 	compatible = "msi,primo81", "allwinner,sun6i-a31s";
-
-	aliases {
-		serial0 = &uart0;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
 };
 
 &cpu0 {
@@ -184,8 +176,6 @@
 };
 
 &reg_dc1sw {
-	regulator-min-microvolt = <3000000>;
-	regulator-max-microvolt = <3000000>;
 	regulator-name = "vcc-lcd";
 };
 
arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts +0 -2
index 360adfb..d6ad619 100644
@@ -135,8 +135,6 @@
 
 &reg_dc1sw {
 	regulator-name = "vcc-lcd-usb2";
-	regulator-min-microvolt = <3000000>;
-	regulator-max-microvolt = <3000000>;
 };
 
 &reg_dc5ldo {
arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts renamed from arch/arm/dts/sun7i-a20-lamobo-r1.dts +69 -127

288 lines not on this page · raw message

arch/arm/dts/sun7i-a20-cubietruck.dts +24 -0
index 8da939a..83f39b03 100644
@@ -94,6 +94,24 @@
 		pinctrl-0 = <&mmc3_pwrseq_pin_cubietruck>;
 		reset-gpios = <&pio 7 9 GPIO_ACTIVE_LOW>; /* PH9 WIFI_EN */
 	};
+
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "On-board SPDIF";
+
+		simple-audio-card,cpu {
+			sound-dai = <&spdif>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&spdif_out>;
+		};
+	};
+
+	spdif_out: spdif-out {
+		#sound-dai-cells = <0>;
+		compatible = "linux,spdif-dit";
+	};
 };
 
 &ahci {
@@ -301,6 +319,12 @@
 	status = "okay";
 };
 
+&spdif {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spdif_tx_pins_a>;
+	status = "okay";
+};
+
 &uart0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart0_pins_a>;
arch/arm/dts/sun7i-a20-itead-ibox.dts +24 -0
index 661c21d..10d48cb 100644
@@ -65,6 +65,24 @@
 			default-state = "on";
 		};
 	};
+
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "On-board SPDIF";
+
+		simple-audio-card,cpu {
+			sound-dai = <&spdif>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&spdif_out>;
+		};
+	};
+
+	spdif_out: spdif-out {
+		#sound-dai-cells = <0>;
+		compatible = "linux,spdif-dit";
+	};
 };
 
 &ahci {
@@ -123,3 +141,9 @@
 &reg_ahci_5v {
 	status = "okay";
 };
+
+&spdif {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spdif_tx_pins_a>;
+	status = "okay";
+};
arch/arm/dts/sun7i-a20-lamobo-r1.dts +67 -13

127 lines not on this page · raw message

arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc.dts renamed from arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts +26 -31

79 lines not on this page · raw message

arch/arm/dts/sun7i-a20.dtsi +399 -147

41 lines not on this page · raw message

arch/arm/dts/sun8i-a23-a33.dtsi +6 -3
index 7e05e09..f97c38f 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/sun8i-a23-gt90h-v4.dts +6 -188

194 lines not on this page · raw message

arch/arm/dts/sun8i-a23-inet86dz.dts +5 -233

238 lines not on this page · raw message

arch/arm/dts/sun8i-a23-polaroid-mid2407pxe03.dts +30 -213

243 lines not on this page · raw message

arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts +29 -172

201 lines not on this page · raw message

arch/arm/dts/sun8i-a23-q8-tablet.dts +0 -15
index 6062ea7..956320a 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/sun8i-a33-ga10h-v1.1.dts +16 -64

80 lines not on this page · raw message

arch/arm/dts/sun8i-a33-q8-tablet.dts +0 -15
index 44b3229..b0bc236 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts renamed from arch/arm/dts/sun8i-h3-orangepi-2.dts +50 -54

104 lines not on this page · raw message

arch/arm/dts/sun8i-h3-orangepi-2.dts +10 -13
index d3f8f55..f89fe00 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/sun8i-h3-orangepi-lite.dts +1 -1
index ac71749..1550fee 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts +2 -1
index 9a8cdd4..851fd2c 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/sun8i-h3-orangepi-pc.dts +10 -20
index 0a74a91..24f8e97 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/sun8i-h3-orangepi-plus.dts +34 -0
index 28f74f6..4f4bb0f 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/sun8i-h3.dtsi +95 -271

366 lines not on this page · raw message

arch/arm/dts/sun8i-q8-common.dtsi +50 -107

157 lines not on this page · raw message

arch/arm/dts/sun8i-r16-parrot.dts +4 -1
index 39c40be..47553e5 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/sun8i-reference-design-tablet.dtsi renamed from arch/arm/dts/sun8i-a23-inet86dz.dts +18 -67

85 lines not on this page · raw message

arch/arm/dts/sun9i-a80-cubieboard4.dts +145 -19

164 lines not on this page · raw message

arch/arm/dts/sun9i-a80-optimus.dts +163 -32

195 lines not on this page · raw message

arch/arm/dts/sunxi-reference-design-tablet.dtsi renamed from arch/arm/dts/sun8i-a23-q8-tablet.dts +33 -15

48 lines not on this page · raw message

configs/MSI_Primo81_defconfig +1 -0
index 3d71bf5..8847271 100644

Lines of this file are not shown. View the raw message.

include/dt-bindings/clock/sun8i-h3-ccu.h new file +145 -0

145 lines not on this page · raw message

include/dt-bindings/reset/sun8i-h3-ccu.h renamed from arch/arm/dts/sun4i-a10-hyundai-a7hd.dts +58 -63

121 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.7.4

Part of the diff is not shown here. View the raw message.

#1 lore raw

PATCH 1/1 sunxi: Sync dts files with upstream kernel

Quoted 2 lines · Hans de Goede

Sync dts files with the current (Aug 18th 2016) state of Maxime's linux/sunxi/for-next repo.

Is that a rebasing tree, or is the sha of the specific commit stable and therefore worth including here?

Quoted 6 lines

Note this commit also updates configs/MSI_Primo81_defconfig,
adding: "# CONFIG_REQUIRE_SERIAL_CONSOLE is not set", this is necessary because the tablet does not have a reachable uart so the dts sync drops its serial0 alias.

#2 lore raw

PATCH 1/1 sunxi: Sync dts files with upstream kernel

Hi,

Quoted 6 lines · Ian Campbell
Quoted 2 lines · Hans de Goede

Sync dts files with the current (Aug 18th 2016) state of Maxime's linux/sunxi/for-next repo.

Is that a rebasing tree, or is the sha of the specific commit stable and therefore worth including here?

It is stable for a kernel-devel cycle and then gets rebased, so it is not useful to include the hash IMHO.

Quoted 8 lines
Quoted 6 lines

Note this commit also updates configs/MSI_Primo81_defconfig,
adding: "# CONFIG_REQUIRE_SERIAL_CONSOLE is not set", this is necessary because the tablet does not have a reachable uart so the dts sync drops its serial0 alias.

Thanks for the reviews.

Regards,

Hans