Skip to contentSkip to conversation

ARM: dts: sun8i: Update A80 dts(i) from Linux-v4.18-rc3

PATCH New Jagan Teki 3 participants 6 messages Jan 11, 2019 – Jan 19, 2019

Subsystems (6)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/2 ARM: dts: sun8i: Update A80 dts(i) from Linux-v4.18-rc3

Update all A80 devicetree dtsi and dtsi files from Linux-v4.18-rc3 with below commits.

arch/arm/boot/dts/sun9i-a80*:

commit 190e3138f9577885691540dca59c2f07540bde04
Merge: cafc87023b0d a7affb13b271
Author: Arnd Bergmann <[email protected]>
Date: Tue Mar 27 14:58:00 2018 +0200

Merge tag 'sunxi-h3-h5-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

include/dt-bindings/*/sun9i-a80-*:

commit 783ab76ae553abc23f80ef7511052d055697531b

Author: Chen-Yu Tsai <[email protected]>
Date:   Sat Jan 28 20:22:36 2017 +0800

clk: sunxi-ng: Add A80 Display Engine CCU

Note: sun9i-a80-cx-a99.dts is updated only uart0, since the same dts is not available in Linux.

---
 arch/arm/dts/sun9i-a80-cubieboard4.dts    |  260 ++++-
 arch/arm/dts/sun9i-a80-cx-a99.dts         |    2 +-
 arch/arm/dts/sun9i-a80-optimus.dts        |  227 ++++-
 arch/arm/dts/sun9i-a80.dtsi               | 1062 +++++++++++++--------
 include/dt-bindings/clock/sun9i-a80-ccu.h |  162 ++++
 include/dt-bindings/clock/sun9i-a80-de.h  |   80 ++
 include/dt-bindings/clock/sun9i-a80-usb.h |   59 ++
 include/dt-bindings/reset/sun9i-a80-ccu.h |  102 ++
 include/dt-bindings/reset/sun9i-a80-de.h  |   58 ++
 include/dt-bindings/reset/sun9i-a80-usb.h |   56 ++
 10 files changed, 1597 insertions(+), 471 deletions(-)
 create mode 100644 include/dt-bindings/clock/sun9i-a80-ccu.h
 create mode 100644 include/dt-bindings/clock/sun9i-a80-de.h
 create mode 100644 include/dt-bindings/clock/sun9i-a80-usb.h
 create mode 100644 include/dt-bindings/reset/sun9i-a80-ccu.h
 create mode 100644 include/dt-bindings/reset/sun9i-a80-de.h
 create mode 100644 include/dt-bindings/reset/sun9i-a80-usb.h
arch/arm/dts/sun9i-a80-cubieboard4.dts +238 -22
index 1526b41c70..85da85faf8 100644
@@ -47,7 +47,6 @@
 #include "sun9i-a80.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
 	model = "Cubietech Cubieboard4";
@@ -63,8 +62,6 @@
 
 	leds {
 		compatible = "gpio-leds";
-		pinctrl-names = "default";
-		pinctrl-0 = <&led_pins_cubieboard4>;
 
 		green {
 			label = "cubieboard4:green:usr";
@@ -76,18 +73,96 @@
 			gpios = <&pio 7 6 GPIO_ACTIVE_HIGH>; /* PH6 */
 		};
 	};
+
+	vga-connector {
+		compatible = "vga-connector";
+		label = "vga";
+		ddc-i2c-bus = <&i2c3>;
+
+		port {
+			vga_con_in: endpoint {
+				remote-endpoint = <&vga_dac_out>;
+			};
+		};
+	};
+
+	vga-dac {
+		compatible = "corpro,gm7123", "adi,adv7123", "dumb-vga-dac";
+		vdd-supply = <&reg_dcdc1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port at 0 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0>;
+
+				vga_dac_in: endpoint at 0 {
+					reg = <0>;
+					remote-endpoint = <&tcon0_out_vga>;
+				};
+			};
+
+			port at 1 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <1>;
+
+				vga_dac_out: endpoint at 0 {
+					reg = <0>;
+					remote-endpoint = <&vga_con_in>;
+				};
+			};
+		};
+	};
+
+	wifi_pwrseq: wifi-pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		clocks = <&ac100_rtc 1>;
+		clock-names = "ext_clock";
+		/* enables internal regulator and de-asserts reset */
+		reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 WL-PMU-EN */
+	};
+};
+
+&de {
+	status = "okay";
+};
+
+&i2c3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c3_pins>;
+	status = "okay";
 };
 
 &mmc0 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&mmc0_pins>, <&mmc0_cd_pin_cubieboard4>;
+	pinctrl-0 = <&mmc0_pins>;
 	vmmc-supply = <&reg_dcdc1>;
 	bus-width = <4>;
-	cd-gpios = <&pio 7 18 GPIO_ACTIVE_HIGH>; /* PH18 */
-	cd-inverted;
+	cd-gpios = <&pio 7 18 GPIO_ACTIVE_LOW>; /* PH18 */
+	status = "okay";
+};
+
+&mmc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins>;
+	vmmc-supply = <&reg_dldo1>;
+	vqmmc-supply = <&reg_cldo3>;
+	mmc-pwrseq = <&wifi_pwrseq>;
+	bus-width = <4>;
+	non-removable;
 	status = "okay";
 };
 
+&mmc1_pins {
+	bias-pull-up;
+};
+
 &mmc2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc2_8bit_pins>;
@@ -100,23 +175,12 @@
 
 &mmc2_8bit_pins {
 	/* Increase drive strength for DDR modes */
-	allwinner,drive = <SUN4I_PINCTRL_40_MA>;
+	drive-strength = <40>;
 };
 
-&pio {
-	led_pins_cubieboard4: led-pins at 0 {
-		allwinner,pins = "PH6", "PH17";
-		allwinner,function = "gpio_out";
-		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
-	};
-
-	mmc0_cd_pin_cubieboard4: mmc0_cd_pin at 0 {
-		allwinner,pins = "PH18";
-		allwinner,function = "gpio_in";
-		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
-	};
+&osc32k {
+	/* osc32k input is from AC100 */
+	clocks = <&ac100_rtc 0>;
 };
 
 &r_ir {
@@ -248,14 +312,166 @@
 			reg_rtc_ldo: rtc_ldo {
 				regulator-name = "vcc-rtc-vdd1v8-io";
 			};
+
+			sw {
+				/* unused */
+			};
+		};
+	};
+
+	axp806: pmic at 745 {
+		compatible = "x-powers,axp806";
+		reg = <0x745>;
+		interrupt-parent = <&nmi_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		interrupt-controller;
+		#interrupt-cells = <1>;
+		bldoin-supply = <&reg_dcdce>;
+
+		regulators {
+			reg_s_aldo1: aldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-name = "avcc";
+			};
+
+			aldo2 {
+				/*
+				 * unused, but use a different name to
+				 * avoid name clash with axp809's aldo's
+				 */
+				regulator-name = "s_aldo2";
+			};
+
+			aldo3 {
+				/*
+				 * unused, but use a different name to
+				 * avoid name clash with axp809's aldo's
+				 */
+				regulator-name = "s_aldo3";
+			};
+
+			reg_bldo1: bldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = <1700000>;
+				regulator-max-microvolt = <1900000>;
+				regulator-name = "vcc18-efuse-adc-display-csi";
+			};
+
+			reg_bldo2: bldo2 {
+				regulator-always-on;
+				regulator-min-microvolt = <1700000>;
+				regulator-max-microvolt = <1900000>;
+				regulator-name =
+					"vdd18-drampll-vcc18-pll-cpvdd";
+			};
+
+			bldo3 {
+				/* unused */
+			};
+
+			reg_bldo4: bldo4 {
+				regulator-min-microvolt = <1100000>;
+				regulator-max-microvolt = <1300000>;
+				regulator-name = "vcc12-hsic";
+			};
+
+			reg_cldo1: cldo1 {
+				/*
+				 * This was 3V in the original design, but
+				 * 3.3V is the recommended supply voltage
+				 * for the Ethernet PHY.
+				 */
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc-gmac-phy";
+			};
+
+			reg_cldo2: cldo2 {
+				regulator-min-microvolt = <2800000>;
+				regulator-max-microvolt = <2800000>;
+				regulator-name = "afvcc-cam";
+			};
+
+			reg_cldo3: cldo3 {
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-name = "vcc-io-wifi-codec-io2";
+			};
+
+			reg_dcdca: dcdca {
+				regulator-always-on;
+				regulator-min-microvolt = <800000>;
+				regulator-max-microvolt = <1100000>;
+				regulator-name = "vdd-cpub";
+			};
+
+			reg_dcdcd: dcdcd {
+				regulator-always-on;
+				regulator-min-microvolt = <800000>;
+				regulator-max-microvolt = <1100000>;
+				regulator-name = "vdd-vpu";
+			};
+
+			reg_dcdce: dcdce {
+				regulator-always-on;
+				regulator-min-microvolt = <2100000>;
+				regulator-max-microvolt = <2100000>;
+				regulator-name = "vcc-bldo-codec-ldoin";
+			};
+
+			sw {
+				/*
+				 * unused, but use a different name to
+				 * avoid name clash with axp809's sw
+				 */
+				regulator-name = "s_sw";
+			};
+		};
+	};
+
+	ac100: codec at e89 {
+		compatible = "x-powers,ac100";
+		reg = <0xe89>;
+
+		ac100_codec: codec {
+			compatible = "x-powers,ac100-codec";
+			interrupt-parent = <&r_pio>;
+			interrupts = <0 9 IRQ_TYPE_LEVEL_LOW>; /* PL9 */
+			#clock-cells = <0>;
+			clock-output-names = "4M_adda";
+		};
+
+		ac100_rtc: rtc {
+			compatible = "x-powers,ac100-rtc";
+			interrupt-parent = <&nmi_intc>;
+			interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+			clocks = <&ac100_codec>;
+			#clock-cells = <1>;
+			clock-output-names = "cko1_rtc",
+					     "cko2_rtc",
+					     "cko3_rtc";
 		};
 	};
 };
 
 #include "axp809.dtsi"
 
+&tcon0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&lcd0_rgb888_pins>;
+};
+
+&tcon0_out {
+	tcon0_out_vga: endpoint at 0 {
+		reg = <0>;
+		remote-endpoint = <&vga_dac_in>;
+	};
+};
+
 &uart0 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&uart0_pins_a>;
+	pinctrl-0 = <&uart0_ph_pins>;
 	status = "okay";
 };
arch/arm/dts/sun9i-a80-cx-a99.dts +1 -1
index a30b6fec56..cf126bbd2c 100644
@@ -365,7 +365,7 @@
  */
 &uart0 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&uart0_pins_a>;
+	pinctrl-0 = <&uart0_ph_pins>;
 	status = "okay";
 };
 
arch/arm/dts/sun9i-a80-optimus.dts +175 -52

311 lines not on this page · raw message

arch/arm/dts/sun9i-a80.dtsi +666 -396

1,473 lines not on this page · raw message

include/dt-bindings/clock/sun9i-a80-ccu.h new file +162 -0

162 lines not on this page · raw message

include/dt-bindings/clock/sun9i-a80-de.h new file +80 -0

80 lines not on this page · raw message

include/dt-bindings/clock/sun9i-a80-usb.h new file +59 -0

59 lines not on this page · raw message

include/dt-bindings/reset/sun9i-a80-ccu.h new file +102 -0

102 lines not on this page · raw message

include/dt-bindings/reset/sun9i-a80-de.h new file +58 -0

58 lines not on this page · raw message

include/dt-bindings/reset/sun9i-a80-usb.h new file +56 -0

56 lines not on this page · raw message

Signature · 1 line
2.18.0.321.gffc6fa0e3
author
#1 lore raw

PATCH 1/2 ARM: dts: sun8i: Update A80 dts(i) from Linux-v4.18-rc3

Chen-Yu and Rask,

Quoted 35 lines · Jagan Teki

Update all A80 devicetree dtsi and dtsi files from Linux-v4.18-rc3 with below commits.

arch/arm/boot/dts/sun9i-a80*:

commit 190e3138f9577885691540dca59c2f07540bde04
Merge: cafc87023b0d a7affb13b271
Author: Arnd Bergmann <[email protected]>
Date: Tue Mar 27 14:58:00 2018 +0200

Merge tag 'sunxi-h3-h5-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

include/dt-bindings/*/sun9i-a80-*:

commit 783ab76ae553abc23f80ef7511052d055697531b

Author: Chen-Yu Tsai <[email protected]>
Date:   Sat Jan 28 20:22:36 2017 +0800

clk: sunxi-ng: Add A80 Display Engine CCU

Note: sun9i-a80-cx-a99.dts is updated only uart0, since the same dts is not available in Linux.

---
 arch/arm/dts/sun9i-a80-cubieboard4.dts    |  260 ++++-
 arch/arm/dts/sun9i-a80-cx-a99.dts         |    2 +-
 arch/arm/dts/sun9i-a80-optimus.dts        |  227 ++++-
 arch/arm/dts/sun9i-a80.dtsi               | 1062 +++++++++++++--------
 include/dt-bindings/clock/sun9i-a80-ccu.h |  162 ++++
 include/dt-bindings/clock/sun9i-a80-de.h  |   80 ++
 include/dt-bindings/clock/sun9i-a80-usb.h |   59 ++
 include/dt-bindings/reset/sun9i-a80-ccu.h |  102 ++
 include/dt-bindings/reset/sun9i-a80-de.h  |   58 ++
Quoted 8 lines
 include/dt-bindings/reset/sun9i-a80-usb.h |   56 ++
 10 files changed, 1597 insertions(+), 471 deletions(-)
 create mode 100644 include/dt-bindings/clock/sun9i-a80-ccu.h
 create mode 100644 include/dt-bindings/clock/sun9i-a80-de.h
 create mode 100644 include/dt-bindings/clock/sun9i-a80-usb.h
 create mode 100644 include/dt-bindings/reset/sun9i-a80-ccu.h
 create mode 100644 include/dt-bindings/reset/sun9i-a80-de.h
 create mode 100644 include/dt-bindings/reset/sun9i-a80-usb.h

Can you check this sync on your A80 boards?

#2 lore raw

PATCH 1/2 ARM: dts: sun8i: Update A80 dts(i) from Linux-v4.18-rc3

Quoted 48 lines · Jagan Teki

Chen-Yu and Rask,

Quoted 35 lines · Jagan Teki

Update all A80 devicetree dtsi and dtsi files from Linux-v4.18-rc3 with below commits.

arch/arm/boot/dts/sun9i-a80*:

commit 190e3138f9577885691540dca59c2f07540bde04
Merge: cafc87023b0d a7affb13b271
Author: Arnd Bergmann <[email protected]>
Date: Tue Mar 27 14:58:00 2018 +0200

Merge tag 'sunxi-h3-h5-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

include/dt-bindings/*/sun9i-a80-*:

commit 783ab76ae553abc23f80ef7511052d055697531b

Author: Chen-Yu Tsai <[email protected]>
Date:   Sat Jan 28 20:22:36 2017 +0800

clk: sunxi-ng: Add A80 Display Engine CCU

Note: sun9i-a80-cx-a99.dts is updated only uart0, since the same dts is not available in Linux.

---
 arch/arm/dts/sun9i-a80-cubieboard4.dts    |  260 ++++-
 arch/arm/dts/sun9i-a80-cx-a99.dts         |    2 +-
 arch/arm/dts/sun9i-a80-optimus.dts        |  227 ++++-
 arch/arm/dts/sun9i-a80.dtsi               | 1062 +++++++++++++--------
 include/dt-bindings/clock/sun9i-a80-ccu.h |  162 ++++
 include/dt-bindings/clock/sun9i-a80-de.h  |   80 ++
 include/dt-bindings/clock/sun9i-a80-usb.h |   59 ++
 include/dt-bindings/reset/sun9i-a80-ccu.h |  102 ++
 include/dt-bindings/reset/sun9i-a80-de.h  |   58 ++
Quoted 8 lines
 include/dt-bindings/reset/sun9i-a80-usb.h |   56 ++
 10 files changed, 1597 insertions(+), 471 deletions(-)
 create mode 100644 include/dt-bindings/clock/sun9i-a80-ccu.h
 create mode 100644 include/dt-bindings/clock/sun9i-a80-de.h
 create mode 100644 include/dt-bindings/clock/sun9i-a80-usb.h
 create mode 100644 include/dt-bindings/reset/sun9i-a80-ccu.h
 create mode 100644 include/dt-bindings/reset/sun9i-a80-de.h
 create mode 100644 include/dt-bindings/reset/sun9i-a80-usb.h
Quoted 1 line

Can you check this sync on your A80 boards?

Tried sunxi/next on the A80 Optimus, and it correctly boots to Linux. That's all I can say though.

ChenYu

author
#3 lore raw

PATCH 1/2 ARM: dts: sun8i: Update A80 dts(i) from Linux-v4.18-rc3

In reply to Jagan Teki
Quoted 19 lines · Jagan Teki

Update all A80 devicetree dtsi and dtsi files from Linux-v4.18-rc3 with below commits.

arch/arm/boot/dts/sun9i-a80*:

commit 190e3138f9577885691540dca59c2f07540bde04
Merge: cafc87023b0d a7affb13b271
Author: Arnd Bergmann <[email protected]>
Date: Tue Mar 27 14:58:00 2018 +0200

Merge tag 'sunxi-h3-h5-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

include/dt-bindings/*/sun9i-a80-*:

commit 783ab76ae553abc23f80ef7511052d055697531b

Author: Chen-Yu Tsai <[email protected]>
Date:   Sat Jan 28 20:22:36 2017 +0800
Quoted 7 lines

clk: sunxi-ng: Add A80 Display Engine CCU

Note: sun9i-a80-cx-a99.dts is updated only uart0, since the same dts is not available in Linux.

---

Applied both to u-boot-sunxi/master

author
#4 lore raw

PATCH 2/2 clk: sunxi: Add Allwinner A80 CLK driver

In reply to Jagan Teki

Add initial clock driver for Allwinner A80.

- Implement UART bus clocks via ccu_clk_gate table for A80, so it can accessed in common clk enable and disable functions from clk_sunxi.c
- Implement UART bus resets via ccu_reset table for A80, so it can accessed in common reset deassert and assert functions from reset-sunxi.c

---
 drivers/clk/sunxi/Kconfig   |  7 +++++
 drivers/clk/sunxi/Makefile  |  1 +
 drivers/clk/sunxi/clk_a80.c | 57 +++++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 drivers/clk/sunxi/clk_a80.c
drivers/clk/sunxi/Kconfig +7 -0
index cb11c7c21e..5ff101b993 100644
@@ -58,6 +58,13 @@ config CLK_SUN8I_V3S
 	  This enables common clock driver support for platforms based
 	  on Allwinner V3S SoC.
 
+config CLK_SUN9I_A80
+	bool "Clock driver for Allwinner A80"
+	default MACH_SUN9I
+	help
+	  This enables common clock driver support for platforms based
+	  on Allwinner A80 SoC.
+
 config CLK_SUN8I_H3
 	bool "Clock driver for Allwinner H3/H5"
 	default MACH_SUNXI_H3_H5
drivers/clk/sunxi/Makefile +1 -0
index 794aa2461c..36fb2aeb56 100644
@@ -13,6 +13,7 @@ obj-$(CONFIG_CLK_SUN8I_A23) += clk_a23.o
 obj-$(CONFIG_CLK_SUN8I_A83T) += clk_a83t.o
 obj-$(CONFIG_CLK_SUN8I_R40) += clk_r40.o
 obj-$(CONFIG_CLK_SUN8I_V3S) += clk_v3s.o
+obj-$(CONFIG_CLK_SUN9I_A80) += clk_a80.o
 obj-$(CONFIG_CLK_SUN8I_H3) += clk_h3.o
 obj-$(CONFIG_CLK_SUN50I_H6) += clk_h6.o
 obj-$(CONFIG_CLK_SUN50I_A64) += clk_a64.o
drivers/clk/sunxi/clk_a80.c new file +57 -0

57 lines not on this page · raw message

Signature · 1 line
2.18.0.321.gffc6fa0e3
#5 lore raw

PATCH 1/2 ARM: dts: sun8i: Update A80 dts(i) from Linux-v4.18-rc3

In reply to Jagan Teki

Den 11-01-2019 kl. 16:45 +0530 skrev Jagan Teki:

Quoted 18 lines

Update all A80 devicetree dtsi and dtsi files from Linux-v4.18-rc3 with below commits.

arch/arm/boot/dts/sun9i-a80*:

commit 190e3138f9577885691540dca59c2f07540bde04
Merge: cafc87023b0d a7affb13b271
Author: Arnd Bergmann <[email protected]>
Date: Tue Mar 27 14:58:00 2018 +0200

Merge tag 'sunxi-h3-h5-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

include/dt-bindings/*/sun9i-a80-*:

commit 783ab76ae553abc23f80ef7511052d055697531b

Author: Chen-Yu Tsai <[email protected]>
Date:   Sat Jan 28 20:22:36 2017 +0800
Quoted 7 lines

clk: sunxi-ng: Add A80 Display Engine CCU

Note: sun9i-a80-cx-a99.dts is updated only uart0, since the same dts is not available in Linux.

---

It boots Linux from eMMC on a CX-A99 board just as well as it did before.

Signature · 2 lines
Best regards,
Rask Ingemann Lambertsen