Skip to contentSkip to conversation

sunxi: Sync dts files with the upstream kernel

PATCH New Hans de Goede 3 participants 5 messages Mar 14, 2016 – Mar 15, 2016

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

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

Sync dts files with the upstream kernel including
changes queued for 4.6:

https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?h=sunxi/dt-for-4.6

Note this adds a number of new unused board dts files. I've asked the authors of the kernel commits adding these to submit a matching defconfig to u-boot.

---
 arch/arm/dts/Makefile                              |   8 +-
 arch/arm/dts/{sun8i-a23.dtsi => axp22x.dtsi}       | 138 ++++++++----
 arch/arm/dts/sun4i-a10-a1000.dts                   |   4 +
 arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts         |  22 ++
 arch/arm/dts/sun4i-a10-cubieboard.dts              |   4 +
 arch/arm/dts/sun4i-a10-gemei-g9.dts                |  63 +++++-
 arch/arm/dts/sun4i-a10-inet1.dts                   |  48 ++++
 arch/arm/dts/sun4i-a10-inet97fv2.dts               | 127 ++++++++++-
 arch/arm/dts/sun4i-a10-inet9f-rev03.dts            | 181 +++++++++++++++
 arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts    |  86 +------
 arch/arm/dts/sun4i-a10-jesurun-q5.dts              |  15 ++
 arch/arm/dts/sun4i-a10-marsboard.dts               |  23 ++
 arch/arm/dts/sun4i-a10-mk802.dts                   |  37 +++
 arch/arm/dts/sun4i-a10-olinuxino-lime.dts          |  12 +
 arch/arm/dts/sun4i-a10-pcduino.dts                 |  58 ++++-
 ...sun8i-q8-common.dtsi => sun4i-a10-pcduino2.dts} |  54 ++---
 arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts        |  69 ++++++
 arch/arm/dts/sun4i-a10.dtsi                        | 153 +++++++++++--
 arch/arm/dts/sun5i-a10s-auxtek-t004.dts            |  14 ++
 arch/arm/dts/sun5i-a10s-olinuxino-micro.dts        |   2 +-
 arch/arm/dts/sun5i-a13-empire-electronix-d709.dts  |  19 +-
 arch/arm/dts/sun5i-a13-inet-98v-rev2.dts           |  26 +--
 arch/arm/dts/sun5i-a13-utoo-p66.dts                |  30 +++
 arch/arm/dts/sun5i-q8-common.dtsi                  |  10 +
 arch/arm/dts/sun5i-r8-chip.dts                     |  47 +++-
 arch/arm/dts/sun5i.dtsi                            |  31 +++
 arch/arm/dts/sun6i-a31-colombus.dts                |  24 ++
 arch/arm/dts/sun6i-a31-hummingbird.dts             | 132 ++++++-----
 arch/arm/dts/sun6i-a31.dtsi                        |  65 +++++-
 arch/arm/dts/sun6i-a31s-primo81.dts                | 247 ++++++++++++++++++++-
 ...er-tab7200.dts => sun6i-a31s-sina31s-core.dtsi} | 143 +++++-------
 ...n8i-a23-gt90h-v4.dts => sun6i-a31s-sina31s.dts} | 106 +++++----
 ....dts => sun6i-a31s-yones-toptech-bs1078-v2.dts} | 180 ++++++++-------
 arch/arm/dts/sun7i-a20-bananapi.dts                |  78 ++++++-
 arch/arm/dts/sun7i-a20-cubieboard2.dts             |  23 ++
 arch/arm/dts/sun7i-a20-cubietruck.dts              |   4 +
 ...exler-tab7200.dts => sun7i-a20-icnova-swac.dts} |  50 ++---
 ...un4i-a10-mk802.dts => sun7i-a20-itead-ibox.dts} |  91 ++++----
 arch/arm/dts/sun7i-a20-lamobo-r1.dts               |  10 -
 arch/arm/dts/sun7i-a20-mk808c.dts                  |  39 ++++
 arch/arm/dts/sun7i-a20-olimex-som-evb.dts          |  95 ++++++--
 arch/arm/dts/sun7i-a20-olinuxino-lime.dts          |  12 +
 arch/arm/dts/sun7i-a20-olinuxino-lime2.dts         |  47 ++++
 arch/arm/dts/sun7i-a20-olinuxino-micro.dts         |   6 +
 arch/arm/dts/sun7i-a20-orangepi-mini.dts           |  33 +++
 arch/arm/dts/sun7i-a20-orangepi.dts                |  29 +++
 arch/arm/dts/sun7i-a20-pcduino3-nano.dts           |  69 +++++-
 arch/arm/dts/sun7i-a20-pcduino3.dts                |  58 ++++-
 arch/arm/dts/sun7i-a20-wexler-tab7200.dts          |  90 +++++++-
 arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts        | 187 +++++++++++++++-
 arch/arm/dts/sun7i-a20.dtsi                        | 113 +++++++++-
 arch/arm/dts/sun8i-a23-a33.dtsi                    |  71 ++++--
 arch/arm/dts/sun8i-a23-gt90h-v4.dts                | 120 +++++++++-
 arch/arm/dts/sun8i-a23.dtsi                        |  25 +++
 arch/arm/dts/sun8i-a33-sinlinx-sina33.dts          |  83 ++++++-
 arch/arm/dts/sun8i-a33.dtsi                        |  45 ++++
 ...-common.dtsi => sun8i-a83t-cubietruck-plus.dts} |  48 ++--
 arch/arm/dts/sun8i-a83t.dtsi                       | 125 +++++------
 arch/arm/dts/sun8i-h3-orangepi-pc.dts              |  69 ++++++
 arch/arm/dts/sun8i-h3-orangepi-plus.dts            |  63 ++++++
 arch/arm/dts/sun8i-h3.dtsi                         | 189 +++++++++++-----
 arch/arm/dts/sun8i-q8-common.dtsi                  |  96 +++++++-
 arch/arm/dts/sun9i-a80-cubieboard4.dts             |  36 +++
 arch/arm/dts/sun9i-a80-optimus.dts                 |  48 ++--
 arch/arm/dts/sun9i-a80.dtsi                        | 204 +++++++++++++++--
 ...-inet97fv2.dts => sunxi-itead-core-common.dtsi} |  55 +++--
 arch/arm/dts/sunxi-q8-common.dtsi                  |   6 +
 67 files changed, 3566 insertions(+), 929 deletions(-)
 copy arch/arm/dts/{sun8i-a23.dtsi => axp22x.dtsi} (55%)
 copy arch/arm/dts/{sun8i-q8-common.dtsi => sun4i-a10-pcduino2.dts} (71%)
 copy arch/arm/dts/{sun7i-a20-wexler-tab7200.dts => sun6i-a31s-sina31s-core.dtsi} (60%)
 copy arch/arm/dts/{sun8i-a23-gt90h-v4.dts => sun6i-a31s-sina31s.dts} (67%)
 copy arch/arm/dts/{sun4i-a10-pov-protab2-ips9.dts => sun6i-a31s-yones-toptech-bs1078-v2.dts} (62%)
 copy arch/arm/dts/{sun7i-a20-wexler-tab7200.dts => sun7i-a20-icnova-swac.dts} (85%)
 copy arch/arm/dts/{sun4i-a10-mk802.dts => sun7i-a20-itead-ibox.dts} (70%)
 copy arch/arm/dts/{sunxi-q8-common.dtsi => sun8i-a83t-cubietruck-plus.dts} (76%)
 copy arch/arm/dts/{sun4i-a10-inet97fv2.dts => sunxi-itead-core-common.dtsi} (80%)
arch/arm/dts/Makefile +7 -1
index 9566c81..ec99835 100644
@@ -126,6 +126,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
 	sun4i-a10-mk802ii.dtb \
 	sun4i-a10-olinuxino-lime.dtb \
 	sun4i-a10-pcduino.dtb \
+	sun4i-a10-pcduino2.dtb \
 	sun4i-a10-pov-protab2-ips9.dtb
 dtb-$(CONFIG_MACH_SUN5I) += \
 	sun5i-a10s-auxtek-t003.dtb \
@@ -156,7 +157,9 @@ dtb-$(CONFIG_MACH_SUN6I) += \
 	sun6i-a31s-colorfly-e708-q1.dtb \
 	sun6i-a31s-cs908.dtb \
 	sun6i-a31s-primo81.dtb \
-	sun6i-a31s-sinovoip-bpi-m2.dtb
+	sun6i-a31s-sina31s.dtb \
+	sun6i-a31s-sinovoip-bpi-m2.dtb \
+	sun6i-a31s-yones-toptech-bs1078-v2.dtb
 dtb-$(CONFIG_MACH_SUN7I) += \
 	sun7i-a20-ainol-aw1.dtb \
 	sun7i-a20-bananapi.dtb \
@@ -165,6 +168,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \
 	sun7i-a20-cubietruck.dtb \
 	sun7i-a20-hummingbird.dtb \
 	sun7i-a20-i12-tvbox.dtb \
+	sun7i-a20-icnova-swac.dtb \
+	sun7i-a20-itead-ibox.dtb \
 	sun7i-a20-lamobo-r1.dtb \
 	sun7i-a20-m3.dtb \
 	sun7i-a20-m5.dtb \
@@ -191,6 +196,7 @@ dtb-$(CONFIG_MACH_SUN8I_A33) += \
 	sun8i-a33-sinlinx-sina33.dtb
 dtb-$(CONFIG_MACH_SUN8I_A83T) += \
 	sun8i-a83t-allwinner-h8homlet-v2.dtb \
+	sun8i-a83t-cubietruck-plus.dtb \
 	sun8i-a83t-sinovoip-bpi-m3.dtb
 dtb-$(CONFIG_MACH_SUN8I_H3) += \
 	sun8i-h3-orangepi-pc.dtb \
arch/arm/dts/axp22x.dtsi renamed from arch/arm/dts/sun8i-a23.dtsi +91 -47

156 lines not on this page · raw message

arch/arm/dts/sun4i-a10-a1000.dts +4 -0
index 2630d78..97570cb 100644
@@ -93,6 +93,10 @@
 	status = "okay";
 };
 
+&codec {
+	status = "okay";
+};
+
 &ehci0 {
 	status = "okay";
 };
arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts +22 -0
index 1430568..023b03e 100644
@@ -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";
@@ -78,6 +79,27 @@
 	};
 };
 
+&i2c1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c1_pins_a>;
+	status = "okay";
+};
+
+&i2c2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c2_pins_a>;
+	status = "okay";
+
+	ft5306de4: touchscreen at 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 {
 	vref-supply = <&reg_vcc3v0>;
 	status = "okay";
arch/arm/dts/sun4i-a10-cubieboard.dts +4 -0
index 046a84d..710e2ef 100644
@@ -83,6 +83,10 @@
 	status = "okay";
 };
 
+&codec {
+	status = "okay";
+};
+
 &cpu0 {
 	cpu-supply = <&reg_dcdc2>;
 };
arch/arm/dts/sun4i-a10-gemei-g9.dts +51 -12

107 lines not on this page · raw message

arch/arm/dts/sun4i-a10-inet1.dts +48 -0

83 lines not on this page · raw message

arch/arm/dts/sun4i-a10-inet97fv2.dts +117 -10

166 lines not on this page · raw message

arch/arm/dts/sun4i-a10-inet9f-rev03.dts +181 -0

205 lines not on this page · raw message

arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts +2 -84

127 lines not on this page · raw message

arch/arm/dts/sun4i-a10-jesurun-q5.dts +15 -0
index dc2f2ae..7afc7a6 100644
@@ -156,6 +156,10 @@
 	status = "okay";
 };
 
+&otg_sram {
+	status = "okay";
+};
+
 &pio {
 	emac_power_pin_q5: emac_power_pin at 0 {
 		allwinner,pins = "PH19";
@@ -172,6 +176,11 @@
 	};
 };
 
+&reg_usb0_vbus {
+	regulator-boot-on;
+	status = "okay";
+};
+
 &reg_usb1_vbus {
 	status = "okay";
 };
@@ -186,7 +195,13 @@
 	status = "okay";
 };
 
+&usb_otg {
+	dr_mode = "host";
+	status = "okay";
+};
+
 &usbphy {
+	usb0_vbus-supply = <&reg_usb0_vbus>;
 	usb1_vbus-supply = <&reg_usb1_vbus>;
 	usb2_vbus-supply = <&reg_usb2_vbus>;
 	status = "okay";
arch/arm/dts/sun4i-a10-marsboard.dts +23 -0
index 02158bc..8e50723 100644
@@ -91,6 +91,10 @@
 	status = "okay";
 };
 
+&codec {
+	status = "okay";
+};
+
 &ehci0 {
 	status = "okay";
 };
@@ -154,6 +158,10 @@
 	status = "okay";
 };
 
+&otg_sram {
+	status = "okay";
+};
+
 &pio {
 	led_pins_marsboard: led_pins at 0 {
 		allwinner,pins = "PB5", "PB6", "PB7", "PB8";
@@ -161,6 +169,13 @@
 		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 	};
+
+	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>;
+	};
 };
 
 &reg_usb1_vbus {
@@ -184,7 +199,15 @@
 	status = "okay";
 };
 
+&usb_otg {
+	dr_mode = "otg";
+	status = "okay";
+};
+
 &usbphy {
+	pinctrl-names = "default";
+	pinctrl-0 = <&usb0_id_detect_pin>;
+	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
 	usb1_vbus-supply = <&reg_usb1_vbus>;
 	usb2_vbus-supply = <&reg_usb2_vbus>;
 	status = "okay";
arch/arm/dts/sun4i-a10-mk802.dts +37 -0
index 3c7eebe..ee46ea8 100644
@@ -44,6 +44,7 @@
 #include "sun4i-a10.dtsi"
 #include "sunxi-common-regulators.dtsi"
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
 	model = "MK802";
@@ -58,6 +59,10 @@
 	};
 };
 
+&codec {
+	status = "okay";
+};
+
 &ehci0 {
 	status = "okay";
 };
@@ -80,7 +85,25 @@
 	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_NO_PULL>;
+	};
+
+	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_NO_PULL>;
+	};
+
 	usb2_vbus_pin_mk802: usb2_vbus_pin at 0 {
 		allwinner,pins = "PH12";
 		allwinner,function = "gpio_out";
@@ -89,6 +112,10 @@
 	};
 };
 
+&reg_usb0_vbus {
+	status = "okay";
+};
+
 &reg_usb1_vbus {
 	status = "okay";
 };
@@ -105,7 +132,17 @@
 	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-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
+	usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
+	usb0_vbus-supply = <&reg_usb0_vbus>;
 	usb1_vbus-supply = <&reg_usb1_vbus>;
 	usb2_vbus-supply = <&reg_usb2_vbus>;
 	status = "okay";
arch/arm/dts/sun4i-a10-olinuxino-lime.dts +12 -0
index 28e32ad..b350448 100644
@@ -124,6 +124,18 @@
 	};
 };
 
+&i2c1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c1_pins_a>;
+	status = "okay";
+
+	eeprom: eeprom at 50 {
+		compatible = "atmel,24c16";
+		reg = <0x50>;
+		pagesize = <16>;
+	};
+};
+
 &mdio {
 	status = "okay";
 
arch/arm/dts/sun4i-a10-pcduino.dts +48 -10

94 lines not on this page · raw message

arch/arm/dts/sun4i-a10-pcduino2.dts renamed from arch/arm/dts/sun8i-q8-common.dtsi +24 -30

75 lines not on this page · raw message

arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts +69 -0

110 lines not on this page · raw message

arch/arm/dts/sun4i-a10.dtsi +132 -21

234 lines not on this page · raw message

arch/arm/dts/sun5i-a10s-auxtek-t004.dts +14 -0
index 2b3511e..a790ec8 100644
@@ -86,6 +86,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_t004>;
arch/arm/dts/sun5i-a10s-olinuxino-micro.dts +1 -1
index 5a422c1..86d046a 100644
@@ -111,7 +111,7 @@
 	status = "okay";
 
 	at24 at 50 {
-		compatible = "at,24c16";
+		compatible = "atmel,24c16";
 		pagesize = <16>;
 		reg = <0x50>;
 		read-only;
arch/arm/dts/sun5i-a13-empire-electronix-d709.dts +2 -17
index 7fbb0b0..6efbba6 100644
@@ -123,7 +123,7 @@
 
 &mmc0 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_inet98fv2>;
+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_d709>;
 	vmmc-supply = <&reg_vcc3v3>;
 	bus-width = <4>;
 	cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */
@@ -131,27 +131,12 @@
 	status = "okay";
 };
 
-&mmc2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&mmc2_pins_a>;
-	vmmc-supply = <&reg_vcc3v3>;
-	bus-width = <8>;
-	non-removable;
-	status = "okay";
-
-	mmccard: mmccard at 0 {
-		reg = <0>;
-		compatible = "mmc-card";
-		broken-hpi;
-	};
-};
-
 &otg_sram {
 	status = "okay";
 };
 
 &pio {
-	mmc0_cd_pin_inet98fv2: mmc0_cd_pin at 0 {
+	mmc0_cd_pin_d709: mmc0_cd_pin at 0 {
 		allwinner,pins = "PG0";
 		allwinner,function = "gpio_in";
 		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
arch/arm/dts/sun5i-a13-inet-98v-rev2.dts +1 -25
index 6d466a2..1b11ec9 100644
@@ -123,21 +123,6 @@
 	status = "okay";
 };
 
-&mmc2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&mmc2_pins_a>;
-	vmmc-supply = <&reg_vcc3v3>;
-	bus-width = <8>;
-	non-removable;
-	status = "okay";
-
-	mmccard: mmccard at 0 {
-		reg = <0>;
-		compatible = "mmc-card";
-		broken-hpi;
-	};
-};
-
 &otg_sram {
 	status = "okay";
 };
@@ -201,11 +186,6 @@
 	status = "okay";
 };
 
-&reg_usb1_vbus {
-	gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */
-	status = "okay";
-};
-
 &uart1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart1_pins_b>;
@@ -221,16 +201,12 @@
 	allwinner,pins = "PG12";
 };
 
-&usb1_vbus_pin_a {
-	allwinner,pins = "PG11";
-};
-
 &usbphy {
 	pinctrl-names = "default";
 	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
 	usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
 	usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
 	usb0_vbus-supply = <&reg_usb0_vbus>;
-	usb1_vbus-supply = <&reg_usb1_vbus>;
+	usb1_vbus-supply = <&reg_ldo3>;
 	status = "okay";
 };
arch/arm/dts/sun5i-a13-utoo-p66.dts +30 -0
index eb793d5..fa9ddfd 100644
@@ -47,11 +47,21 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
+#include <dt-bindings/pwm/pwm.h>
 
 / {
 	model = "Utoo P66";
 	compatible = "utoo,p66", "allwinner,sun5i-a13";
 
+	backlight: backlight {
+		compatible = "pwm-backlight";
+		pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
+		/* Note levels of 10 / 20% result in backlight off */
+		brightness-levels = <0 30 40 50 60 70 80 90 100>;
+		default-brightness-level = <6>;
+		/* TODO: backlight uses axp gpio1 as enable pin */
+	};
+
 	i2c_lcd: i2c at 0 {
 		/* The lcd panel i2c interface is hooked up via gpios */
 		compatible = "i2c-gpio";
@@ -63,6 +73,13 @@
 	};
 };
 
+&codec {
+	pinctrl-names = "default";
+	pinctrl-0 = <&codec_pa_pin>;
+	allwinner,pa-gpios = <&pio 6 3 GPIO_ACTIVE_HIGH>; /* PG3 */
+	status = "okay";
+};
+
 &cpu0 {
 	cpu-supply = <&reg_dcdc2>;
 };
@@ -158,6 +175,13 @@
 };
 
 &pio {
+	codec_pa_pin: codec_pa_pin at 0 {
+		allwinner,pins = "PG3";
+		allwinner,function = "gpio_out";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+	};
+
 	mmc0_cd_pin_p66: mmc0_cd_pin at 0 {
 		allwinner,pins = "PG0";
 		allwinner,function = "gpio_in";
@@ -201,6 +225,12 @@
 	};
 };
 
+&pwm {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pwm0_pins>;
+	status = "okay";
+};
+
 &reg_dcdc2 {
 	regulator-always-on;
 	regulator-min-microvolt = <1000000>;
arch/arm/dts/sun5i-q8-common.dtsi +10 -0
index 0641d68..a78e189 100644
@@ -41,11 +41,21 @@
  */
 #include "sunxi-q8-common.dtsi"
 
+#include <dt-bindings/pwm/pwm.h>
+
 / {
 	aliases {
 		serial0 = &uart1;
 	};
 
+	backlight: backlight {
+		compatible = "pwm-backlight";
+		pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
+		brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
+		default-brightness-level = <8>;
+		/* TODO: backlight uses axp gpio1 as enable pin */
+	};
+
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};
arch/arm/dts/sun5i-r8-chip.dts +46 -1

74 lines not on this page · raw message

arch/arm/dts/sun5i.dtsi +31 -0
index 9ffee9b..59a9426 100644
@@ -44,6 +44,7 @@
 
 #include "skeleton.dtsi"
 
+#include <dt-bindings/clock/sun4i-a10-pll2.h>
 #include <dt-bindings/dma/sun4i-a10.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
@@ -102,6 +103,15 @@
 			clock-output-names = "pll1";
 		};
 
+		pll2: clk at 01c20008 {
+			#clock-cells = <1>;
+			compatible = "allwinner,sun5i-a13-pll2-clk";
+			reg = <0x01c20008 0x8>;
+			clocks = <&osc24M>;
+			clock-output-names = "pll2-1x", "pll2-2x",
+					     "pll2-4x", "pll2-8x";
+		};
+
 		pll4: clk at 01c20018 {
 			#clock-cells = <0>;
 			compatible = "allwinner,sun4i-a10-pll1-clk";
@@ -285,6 +295,14 @@
 			clock-output-names = "usb_ohci0", "usb_phy";
 		};
 
+		codec_clk: clk at 01c20140 {
+			#clock-cells = <0>;
+			compatible = "allwinner,sun4i-a10-codec-clk";
+			reg = <0x01c20140 0x4>;
+			clocks = <&pll2 SUN4I_A10_PLL2_1X>;
+			clock-output-names = "codec";
+		};
+
 		mbus_clk: clk at 01c2015c {
 			#clock-cells = <0>;
 			compatible = "allwinner,sun5i-a13-mbus-clk";
@@ -571,6 +589,19 @@
 			status = "disabled";
 		};
 
+		codec: codec at 01c22c00 {
+			#sound-dai-cells = <0>;
+			compatible = "allwinner,sun4i-a10-codec";
+			reg = <0x01c22c00 0x40>;
+			interrupts = <30>;
+			clocks = <&apb0_gates 0>, <&codec_clk>;
+			clock-names = "apb", "codec";
+			dmas = <&dma SUN4I_DMA_NORMAL 19>,
+			       <&dma SUN4I_DMA_NORMAL 19>;
+			dma-names = "rx", "tx";
+			status = "disabled";
+		};
+
 		sid: eeprom at 01c23800 {
 			compatible = "allwinner,sun4i-a10-sid";
 			reg = <0x01c23800 0x10>;
arch/arm/dts/sun6i-a31-colombus.dts +24 -0
index 0d0b6f2..f9cf368 100644
@@ -60,6 +60,16 @@
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};
+
+	i2c_lcd: i2c at 0 {
+		/* The lcd panel i2c interface is hooked up via gpios */
+		compatible = "i2c-gpio";
+		pinctrl-names = "default";
+		pinctrl-0 = <&i2c_lcd_pins>;
+		gpios = <&pio 0 23 GPIO_ACTIVE_HIGH>, /* PA23, sda */
+			<&pio 0 24 GPIO_ACTIVE_HIGH>; /* PA24, scl */
+		i2c-gpio,delay-us = <5>;
+	};
 };
 
 &ehci1 {
@@ -94,6 +104,13 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c2_pins_a>;
 	status = "okay";
+
+	mma8452: mma8452 at 1d {
+		compatible = "fsl,mma8452";
+		reg = <0x1d>;
+		interrupt-parent = <&pio>;
+		interrupts = <0 9 IRQ_TYPE_LEVEL_LOW>; /* PA9 */
+	};
 };
 
 &mmc0 {
@@ -124,6 +141,13 @@
 		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 	};
+
+	i2c_lcd_pins: i2c_lcd_pin at 0 {
+		allwinner,pins = "PA23", "PA24";
+		allwinner,function = "gpio_out";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
 };
 
 &reg_usb2_vbus {
arch/arm/dts/sun6i-a31-hummingbird.dts +72 -60

181 lines not on this page · raw message

arch/arm/dts/sun6i-a31.dtsi +62 -3

131 lines not on this page · raw message

arch/arm/dts/sun6i-a31s-primo81.dts +241 -6

265 lines not on this page · raw message

arch/arm/dts/sun6i-a31s-sina31s-core.dtsi renamed from arch/arm/dts/sun7i-a20-wexler-tab7200.dts +51 -92

199 lines not on this page · raw message

arch/arm/dts/sun6i-a31s-sina31s.dts renamed from arch/arm/dts/sun8i-a23-gt90h-v4.dts +57 -49

166 lines not on this page · raw message

arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts renamed from arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts +88 -92

82 lines not on this page · raw message

arch/arm/dts/sun7i-a20-bananapi.dts +74 -4

78 lines not on this page · raw message

arch/arm/dts/sun7i-a20-cubieboard2.dts +23 -0
index 39a51d5..1fa832d 100644

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

arch/arm/dts/sun7i-a20-cubietruck.dts +4 -0
index e6b0192..8da939a 100644

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

arch/arm/dts/sun7i-a20-icnova-swac.dts renamed from arch/arm/dts/sun7i-a20-wexler-tab7200.dts +18 -32

50 lines not on this page · raw message

arch/arm/dts/sun7i-a20-itead-ibox.dts renamed from arch/arm/dts/sun4i-a10-mk802.dts +52 -39

91 lines not on this page · raw message

arch/arm/dts/sun7i-a20-lamobo-r1.dts +0 -10
index 975b0b2..5ee43d8 100644

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

arch/arm/dts/sun7i-a20-mk808c.dts +39 -0
index 4f432f8..90ff4a2 100644

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

arch/arm/dts/sun7i-a20-olimex-som-evb.dts +79 -16

95 lines not on this page · raw message

arch/arm/dts/sun7i-a20-olinuxino-lime.dts +12 -0
index 0423708..35ad700 100644

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

arch/arm/dts/sun7i-a20-olinuxino-lime2.dts +47 -0

47 lines not on this page · raw message

arch/arm/dts/sun7i-a20-olinuxino-micro.dts +6 -0
index c5d70ca..7e3006f 100644

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

arch/arm/dts/sun7i-a20-orangepi-mini.dts +33 -0
index 73cd81e..2be04c4 100644

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

arch/arm/dts/sun7i-a20-orangepi.dts +29 -0
index 55a06ce..71125bf 100644

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

arch/arm/dts/sun7i-a20-pcduino3-nano.dts +58 -11

69 lines not on this page · raw message

arch/arm/dts/sun7i-a20-pcduino3.dts +54 -4

58 lines not on this page · raw message

arch/arm/dts/sun7i-a20-wexler-tab7200.dts +89 -1

90 lines not on this page · raw message

arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts +184 -3

187 lines not on this page · raw message

arch/arm/dts/sun7i-a20.dtsi +109 -4

113 lines not on this page · raw message

arch/arm/dts/sun8i-a23-a33.dtsi +53 -18

71 lines not on this page · raw message

arch/arm/dts/sun8i-a23-gt90h-v4.dts +116 -4

120 lines not on this page · raw message

arch/arm/dts/sun8i-a23.dtsi +25 -0
index 2cc27c7..92e6616 100644

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

arch/arm/dts/sun8i-a33-sinlinx-sina33.dts +80 -3

83 lines not on this page · raw message

arch/arm/dts/sun8i-a33.dtsi +45 -0

45 lines not on this page · raw message

arch/arm/dts/sun8i-a83t-cubietruck-plus.dts renamed from arch/arm/dts/sunxi-q8-common.dtsi +18 -30

48 lines not on this page · raw message

arch/arm/dts/sun8i-a83t.dtsi +53 -72

125 lines not on this page · raw message

arch/arm/dts/sun8i-h3-orangepi-pc.dts +69 -0

69 lines not on this page · raw message

arch/arm/dts/sun8i-h3-orangepi-plus.dts +63 -0

63 lines not on this page · raw message

arch/arm/dts/sun8i-h3.dtsi +133 -56

189 lines not on this page · raw message

arch/arm/dts/sun8i-q8-common.dtsi +95 -1

96 lines not on this page · raw message

arch/arm/dts/sun9i-a80-cubieboard4.dts +36 -0
index 6484dcf..eb2ccd0 100644

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

arch/arm/dts/sun9i-a80-optimus.dts +26 -22

48 lines not on this page · raw message

arch/arm/dts/sun9i-a80.dtsi +187 -17

204 lines not on this page · raw message

arch/arm/dts/sunxi-itead-core-common.dtsi renamed from arch/arm/dts/sun4i-a10-inet97fv2.dts +34 -21

55 lines not on this page · raw message

arch/arm/dts/sunxi-q8-common.dtsi +6 -0
index 17b26ff..b824146 100644

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

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

Signature · 1 line
2.7.2

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

#1 lore raw

PATCH 2/2 sunxi: Add defconfig and dts for the Polaroid MID2809PXE4 tablet

The Polaroid MID2809PXE4 is a 9" tablet which is clearly marked Polaroid MID2809PXE4 on the back. It features a 9" 16:9?800x480 LCD, A23 Soc, 1GB RAM, 8GB NAND, gsl3670 touchscreen and esp8089 wifi.

The dts file is identical to the one submitted to the upstream kernel.

---
 arch/arm/dts/Makefile                            |   1 +
 arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 243 +++++++++++++++++++++++
 board/sunxi/MAINTAINERS                          |   1 +
 configs/polaroid_mid2809pxe04_defconfig          |  25 +++
 4 files changed, 270 insertions(+)
 create mode 100644 arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts
 create mode 100644 configs/polaroid_mid2809pxe04_defconfig
arch/arm/dts/Makefile +1 -0
index ec99835..1a0d577 100644
@@ -189,6 +189,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
 dtb-$(CONFIG_MACH_SUN8I_A23) += \
 	sun8i-a23-evb.dtb \
 	sun8i-a23-gt90h-v4.dtb \
+	sun8i-a23-polaroid-mid2809pxe04.dtb \
 	sun8i-a23-q8-tablet.dtb
 dtb-$(CONFIG_MACH_SUN8I_A33) += \
 	sun8i-a33-ga10h-v1.1.dtb \
arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts new file +243 -0

243 lines not on this page · raw message

board/sunxi/MAINTAINERS +1 -0
index 7c1c025..5535326 100644
@@ -55,6 +55,7 @@ F:	configs/ga10h_v1_1_defconfig
 F:	configs/gt90h_v4_defconfig
 F:	configs/orangepi_pc_defconfig
 F:	configs/orangepi_plus_defconfig
+F:	configs/polaroid_mid2809pxe04_defconfig
 F:	configs/q8_a23_tablet_800x480_defconfig
 F:	configs/q8_a33_tablet_800x480_defconfig
 F:	configs/q8_a33_tablet_1024x600_defconfig
configs/polaroid_mid2809pxe04_defconfig new file +25 -0
new file mode 100644
index 0000000..019f6da
@@ -0,0 +1,25 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN8I_A23=y
+CONFIG_DRAM_CLK=432
+CONFIG_DRAM_ZQ=63351
+CONFIG_MMC0_CD_PIN="PB4"
+CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE"
+CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
+CONFIG_USB0_ID_DET="PH8"
+CONFIG_AXP_GPIO=y
+CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:36,ri:210,up:18,lo:22,hs:10,vs:5,sync:3,vmode:0"
+CONFIG_VIDEO_LCD_DCLK_PHASE=0
+CONFIG_VIDEO_LCD_POWER="PH7"
+CONFIG_VIDEO_LCD_BL_EN="PH6"
+CONFIG_VIDEO_LCD_BL_PWM="PH0"
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-polaroid-mid2809pxe04"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_GPIO=y
+CONFIG_AXP_DLDO1_VOLT=3300
+CONFIG_USB_MUSB_HOST=y
Signature · 1 line
2.7.2
#2 lore raw

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

In reply to Hans de Goede
Quoted 10 lines · Hans de Goede

Sync dts files with the upstream kernel including
changes queued for 4.6:

https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?h=sunxi/dt-for-4.6

Note this adds a number of new unused board dts files. I've asked the authors of the kernel commits adding these to submit a matching defconfig to u-boot.

Both patches here: Acked-by: Ian Campbell <[email protected]>

Do you have a script or something which (semi-)automates these imports, or is it manual faff each time?

Ian.

#3 lore raw

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

Hi,

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

Sync dts files with the upstream kernel including
changes queued for 4.6:

https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?h=sunxi/dt-for-4.6

Quoted 7 lines
Quoted 5 lines

Note this adds a number of new unused board dts files. I've asked the authors of the kernel commits adding these to submit a matching defconfig to u-boot.

Both patches here: Acked-by: Ian Campbell <[email protected]>

Thanks.

Quoted 2 lines

Do you have a script or something which (semi-)automates these imports, or is it manual faff each time?

Manual, it is not that much work, just cp the files over since we are using pristine kernel files with no u-boot specific mods.

Then git add all of them, and do a commit, in the commit msg editor look at the list of "new file"'s, add those to the Makefile and then commit the Makefile as a fixup.

Starting with this sync I also lookup the first kernel commit of any new dts files (not dtsi files only dts files) and then send a mail to the committer asking them to submit a matching u-boot defconfig.

Regards,

Hans

#4 lore raw

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

In reply to Hans de Goede
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Hans" == Hans de Goede <[email protected]> writes:

Sync dts files with the upstream kernel including
changes queued for 4.6:

Quoted 7 lines

https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?h=sunxi/dt-for-4.6

Note this adds a number of new unused board dts files. I've asked the authors of the kernel commits adding these to submit a matching defconfig to u-boot.

 ....dts => sun6i-a31s-yones-toptech-bs1078-v2.dts} | 180 ++++++++-------

FYI, I've done some work for this one. I'll send a defconfig this week.

Signature · 1 line
Bye, Peter Korsgaard