Skip to contentSkip to conversation

ARM: upgrade Amlogic DT to Linux 5.10

PATCH New Neil Armstrong 1 participant 6 messages Nov 6, 2020 – Nov 12, 2020

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

cover ARM: upgrade Amlogic DT to Linux 5.10

This syncs the Amlogic DT to 5.10, and :
- adds support for the new common MESON_EE_POWER_DOMAIN synced on 5.10
- adds Odroid-N2+ DT using the Odroid-N2 DT as base

Neil Armstrong (4):
ARM: dts: sync Amlogic GX & AXG from Linux 5.10-rc1
power: domain: meson-ee-pwrc: add support for the Meson GX SoCs
power: domain: meson-ee-pwrc: add support for the Meson AXG SoCs
configs: use the new MESON_EE_POWER_DOMAIN driver for Amlogic
GXBB/GXL/GXM boards

 arch/arm/dts/Makefile                         |   1 +
 arch/arm/dts/meson-axg.dtsi                   |   6 +-
 arch/arm/dts/meson-g12b-khadas-vim3.dtsi      |  88 ---
 arch/arm/dts/meson-g12b-odroid-n2-plus.dts    |  31 +
 arch/arm/dts/meson-g12b-odroid-n2.dts         | 618 +----------------
 arch/arm/dts/meson-g12b-odroid-n2.dtsi        | 625 ++++++++++++++++++
 arch/arm/dts/meson-gx-mali450.dtsi            |  61 ++
 arch/arm/dts/meson-gx.dtsi                    |  18 +-
 arch/arm/dts/meson-gxbb.dtsi                  |  63 +-
 arch/arm/dts/meson-gxl-mali.dtsi              |  46 +-
 arch/arm/dts/meson-gxl-s805x-libretech-ac.dts |   2 +-
 arch/arm/dts/meson-gxl-s805x.dtsi             |  23 +
 arch/arm/dts/meson-gxl.dtsi                   |  17 +-
 arch/arm/dts/meson-gxm.dtsi                   |  45 +-
 arch/arm/dts/meson-khadas-vim3.dtsi           |  94 ++-
 arch/arm/dts/meson-sm1-khadas-vim3l.dts       |  86 ---
 configs/libretech-ac_defconfig                |   2 +-
 configs/libretech-cc_defconfig                |   2 +-
 configs/libretech-s905d-pc_defconfig          |   2 +-
 configs/libretech-s912-pc_defconfig           |   2 +-
 configs/odroid-c2_defconfig                   |   2 +-
 drivers/power/domain/meson-ee-pwrc.c          |  52 +-
 include/dt-bindings/power/meson-axg-power.h   |  14 +
 include/dt-bindings/power/meson-gxbb-power.h  |  13 +
 24 files changed, 1002 insertions(+), 911 deletions(-)
 create mode 100644 arch/arm/dts/meson-g12b-odroid-n2-plus.dts
 create mode 100644 arch/arm/dts/meson-g12b-odroid-n2.dtsi
 create mode 100644 arch/arm/dts/meson-gx-mali450.dtsi
 create mode 100644 arch/arm/dts/meson-gxl-s805x.dtsi
 create mode 100644 include/dt-bindings/power/meson-axg-power.h
 create mode 100644 include/dt-bindings/power/meson-gxbb-power.h
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/4 ARM: dts: sync Amlogic GX & AXG from Linux 5.10-rc1

Synced from Linux commit 3650b228f83a ("Linux 5.10-rc1")

---
 arch/arm/dts/Makefile                         |   1 +
 arch/arm/dts/meson-axg.dtsi                   |   6 +-
 arch/arm/dts/meson-g12b-khadas-vim3.dtsi      |  88 ---
 arch/arm/dts/meson-g12b-odroid-n2-plus.dts    |  31 +
 arch/arm/dts/meson-g12b-odroid-n2.dts         | 618 +----------------
 arch/arm/dts/meson-g12b-odroid-n2.dtsi        | 625 ++++++++++++++++++
 arch/arm/dts/meson-gx-mali450.dtsi            |  61 ++
 arch/arm/dts/meson-gx.dtsi                    |  18 +-
 arch/arm/dts/meson-gxbb.dtsi                  |  63 +-
 arch/arm/dts/meson-gxl-mali.dtsi              |  46 +-
 arch/arm/dts/meson-gxl-s805x-libretech-ac.dts |   2 +-
 arch/arm/dts/meson-gxl-s805x.dtsi             |  23 +
 arch/arm/dts/meson-gxl.dtsi                   |  17 +-
 arch/arm/dts/meson-gxm.dtsi                   |  45 +-
 arch/arm/dts/meson-khadas-vim3.dtsi           |  94 ++-
 arch/arm/dts/meson-sm1-khadas-vim3l.dts       |  86 ---
 include/dt-bindings/power/meson-axg-power.h   |  14 +
 include/dt-bindings/power/meson-gxbb-power.h  |  13 +
 18 files changed, 947 insertions(+), 904 deletions(-)
 create mode 100644 arch/arm/dts/meson-g12b-odroid-n2-plus.dts
 create mode 100644 arch/arm/dts/meson-g12b-odroid-n2.dtsi
 create mode 100644 arch/arm/dts/meson-gx-mali450.dtsi
 create mode 100644 arch/arm/dts/meson-gxl-s805x.dtsi
 create mode 100644 include/dt-bindings/power/meson-axg-power.h
 create mode 100644 include/dt-bindings/power/meson-gxbb-power.h
arch/arm/dts/Makefile +1 -0
index d8b0a913be..b153478645 100644
@@ -167,6 +167,7 @@ dtb-$(CONFIG_ARCH_MESON) += \
 	meson-g12a-u200.dtb \
 	meson-g12a-sei510.dtb \
 	meson-g12b-odroid-n2.dtb \
+	meson-g12b-odroid-n2-plus.dtb \
 	meson-g12b-a311d-khadas-vim3.dtb \
 	meson-sm1-khadas-vim3l.dtb \
 	meson-sm1-odroid-c4.dtb \
arch/arm/dts/meson-axg.dtsi +4 -2
index 8e6281c685..b9efc84692 100644
@@ -181,8 +181,10 @@
 			interrupt-names = "macirq";
 			clocks = <&clkc CLKID_ETH>,
 				 <&clkc CLKID_FCLK_DIV2>,
-				 <&clkc CLKID_MPLL2>;
-			clock-names = "stmmaceth", "clkin0", "clkin1";
+				 <&clkc CLKID_MPLL2>,
+				 <&clkc CLKID_FCLK_DIV2>;
+			clock-names = "stmmaceth", "clkin0", "clkin1",
+				      "timing-adjustment";
 			rx-fifo-depth = <4096>;
 			tx-fifo-depth = <2048>;
 			status = "disabled";
arch/arm/dts/meson-g12b-khadas-vim3.dtsi +0 -88

109 lines not on this page · raw message

arch/arm/dts/meson-g12b-odroid-n2-plus.dts new file +31 -0
new file mode 100644
index 0000000000..5de2815ba9
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre, SAS
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+/dts-v1/;
+
+/* The Amlogic S922X Rev. C supports the same OPPs as the A311D variant */
+#include "meson-g12b-a311d.dtsi"
+#include "meson-g12b-odroid-n2.dtsi"
+
+/ {
+	compatible = "hardkernel,odroid-n2-plus", "amlogic,s922x", "amlogic,g12b";
+	model = "Hardkernel ODROID-N2Plus";
+};
+
+&vddcpu_a {
+	regulator-min-microvolt = <680000>;
+	regulator-max-microvolt = <1040000>;
+
+	pwms = <&pwm_AO_cd 1 1500 0>;
+};
+
+&vddcpu_b {
+	regulator-min-microvolt = <680000>;
+	regulator-max-microvolt = <1040000>;
+
+	pwms = <&pwm_AO_cd 1 1500 0>;
+};
+
arch/arm/dts/meson-g12b-odroid-n2.dts +1 -617

626 lines not on this page · raw message

arch/arm/dts/meson-g12b-odroid-n2.dtsi new file +625 -0

625 lines not on this page · raw message

arch/arm/dts/meson-gx-mali450.dtsi new file +61 -0

61 lines not on this page · raw message

arch/arm/dts/meson-gx.dtsi +10 -8
index ba63c36b22..0edd137151 100644
@@ -12,6 +12,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/power/meson-gxbb-power.h>
 #include <dt-bindings/thermal/thermal.h>
 
 / {
@@ -60,7 +61,7 @@
 			compatible = "amlogic,simple-framebuffer",
 				     "simple-framebuffer";
 			amlogic,pipeline = "vpu-cvbs";
-			power-domains = <&pwrc_vpu>;
+			power-domains = <&pwrc PWRC_GXBB_VPU_ID>;
 			status = "disabled";
 		};
 
@@ -68,7 +69,7 @@
 			compatible = "amlogic,simple-framebuffer",
 				     "simple-framebuffer";
 			amlogic,pipeline = "vpu-hdmi";
-			power-domains = <&pwrc_vpu>;
+			power-domains = <&pwrc PWRC_GXBB_VPU_ID>;
 			status = "disabled";
 		};
 	};
@@ -438,12 +439,6 @@
 				compatible = "amlogic,meson-gx-ao-sysctrl", "simple-mfd", "syscon";
 				reg =  <0x0 0x0 0x0 0x100>;
 
-				pwrc_vpu: power-controller-vpu {
-					compatible = "amlogic,meson-gx-pwrc-vpu";
-					#power-domain-cells = <0>;
-					amlogic,hhi-sysctrl = <&sysctrl>;
-				};
-
 				clkc_AO: clock-controller {
 					compatible = "amlogic,meson-gx-aoclkc";
 					#clock-cells = <1>;
@@ -552,6 +547,12 @@
 			sysctrl: system-controller at 0 {
 				compatible = "amlogic,meson-gx-hhi-sysctrl", "simple-mfd", "syscon";
 				reg = <0 0 0 0x400>;
+
+				pwrc: power-controller {
+					compatible = "amlogic,meson-gxbb-pwrc";
+					#power-domain-cells = <1>;
+					amlogic,ao-sysctrl = <&sysctrl_AO>;
+				};
 			};
 
 			mailbox: mailbox at 404 {
@@ -574,6 +575,7 @@
 			interrupt-names = "macirq";
 			rx-fifo-depth = <4096>;
 			tx-fifo-depth = <2048>;
+			power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>;
 			status = "disabled";
 		};
 
arch/arm/dts/meson-gxbb.dtsi +19 -44

105 lines not on this page · raw message

arch/arm/dts/meson-gxl-mali.dtsi +9 -37

51 lines not on this page · raw message

arch/arm/dts/meson-gxl-s805x-libretech-ac.dts +1 -1
index 6a226faab1..9e43f4dca9 100644
@@ -10,7 +10,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/sound/meson-aiu.h>
 
-#include "meson-gxl-s905x.dtsi"
+#include "meson-gxl-s805x.dtsi"
 
 / {
 	compatible = "libretech,aml-s805x-ac", "amlogic,s805x",
arch/arm/dts/meson-gxl-s805x.dtsi new file +23 -0
new file mode 100644
index 0000000000..2997584982
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 BayLibre SAS
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+#include "meson-gxl-s905x.dtsi"
+
+/ {
+	compatible = "amlogic,s805x", "amlogic,meson-gxl";
+};
+
+/* The S805X Package doesn't seem to handle the 744MHz OPP correctly */
+&gpu_opp_table {
+	opp-744000000 {
+		status = "disabled";
+	};
+};
+
+&mali {
+	/delete-property/ assigned-clocks;
+	/delete-property/ assigned-clock-rates;
+};
arch/arm/dts/meson-gxl.dtsi +13 -4
index fc59c8534c..c3ac531c4f 100644
@@ -131,8 +131,9 @@
 &ethmac {
 	clocks = <&clkc CLKID_ETH>,
 		 <&clkc CLKID_FCLK_DIV2>,
-		 <&clkc CLKID_MPLL2>;
-	clock-names = "stmmaceth", "clkin0", "clkin1";
+		 <&clkc CLKID_MPLL2>,
+		 <&clkc CLKID_FCLK_DIV2>;
+	clock-names = "stmmaceth", "clkin0", "clkin1", "timing-adjustment";
 
 	mdio0: mdio {
 		#address-cells = <1>;
@@ -337,6 +338,11 @@
 	};
 };
 
+&hwrng {
+	clocks = <&clkc CLKID_RNG0>;
+	clock-names = "core";
+};
+
 &i2c_A {
 	clocks = <&clkc CLKID_I2C>;
 };
@@ -782,7 +788,7 @@
 	};
 };
 
-&pwrc_vpu {
+&pwrc {
 	resets = <&reset RESET_VIU>,
 		 <&reset RESET_VENC>,
 		 <&reset RESET_VCBUS>,
@@ -795,6 +801,9 @@
 		 <&reset RESET_VDI6>,
 		 <&reset RESET_VENCL>,
 		 <&reset RESET_VID_LOCK>;
+	reset-names = "viu", "venc", "vcbus", "bt656",
+		      "dvin", "rdma", "venci", "vencp",
+		      "vdac", "vdi6", "vencl", "vid_lock";
 	clocks = <&clkc CLKID_VPU>,
 	         <&clkc CLKID_VAPB>;
 	clock-names = "vpu", "vapb";
@@ -901,7 +910,7 @@
 
 &vpu {
 	compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu";
-	power-domains = <&pwrc_vpu>;
+	power-domains = <&pwrc PWRC_GXBB_VPU_ID>;
 };
 
 &vdec {
arch/arm/dts/meson-gxm.dtsi +30 -15

57 lines not on this page · raw message

arch/arm/dts/meson-khadas-vim3.dtsi +92 -2

135 lines not on this page · raw message

arch/arm/dts/meson-sm1-khadas-vim3l.dts +0 -86

101 lines not on this page · raw message

include/dt-bindings/power/meson-axg-power.h new file +14 -0
new file mode 100644
index 0000000000..e5243884b2
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
+/*
+ * Copyright (c) 2020 BayLibre, SAS
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+#ifndef _DT_BINDINGS_MESON_AXG_POWER_H
+#define _DT_BINDINGS_MESON_AXG_POWER_H
+
+#define PWRC_AXG_VPU_ID			0
+#define PWRC_AXG_ETHERNET_MEM_ID	1
+#define PWRC_AXG_AUDIO_ID		2
+
+#endif
include/dt-bindings/power/meson-gxbb-power.h new file +13 -0
new file mode 100644
index 0000000000..1262dac696
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
+/*
+ * Copyright (c) 2019 BayLibre, SAS
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+#ifndef _DT_BINDINGS_MESON_GXBB_POWER_H
+#define _DT_BINDINGS_MESON_GXBB_POWER_H
+
+#define PWRC_GXBB_VPU_ID		0
+#define PWRC_GXBB_ETHERNET_MEM_ID	1
+
+#endif
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/4 power: domain: meson-ee-pwrc: add support for the Meson GX SoCs

In reply to Neil Armstrong

This syncs with the linux meson-ee-pwrc driver from Linux 5.10-rc1.

---
 drivers/power/domain/meson-ee-pwrc.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/power/domain/meson-ee-pwrc.c +24 -2
index 8349a9c158..dfedddd950 100644
@@ -14,6 +14,7 @@
 #include <reset.h>
 #include <clk.h>
 #include <dt-bindings/power/meson-g12a-power.h>
+#include <dt-bindings/power/meson-gxbb-power.h>
 #include <dt-bindings/power/meson-sm1-power.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
@@ -68,7 +69,7 @@ struct meson_ee_pwrc_domain_data {
 
 /* TOP Power Domains */
 
-static struct meson_ee_pwrc_top_domain g12a_pwrc_vpu = {
+static struct meson_ee_pwrc_top_domain gx_pwrc_vpu = {
 	.sleep_reg = AO_RTI_GEN_PWR_SLEEP0,
 	.sleep_mask = BIT(8),
 	.iso_reg = AO_RTI_GEN_PWR_SLEEP0,
@@ -126,6 +127,12 @@ static struct meson_ee_pwrc_mem_domain g12a_pwrc_mem_vpu[] = {
 	VPU_HHI_MEMPD(HHI_MEM_PD_REG0),
 };
 
+static struct meson_ee_pwrc_mem_domain gxbb_pwrc_mem_vpu[] = {
+	VPU_MEMPD(HHI_VPU_MEM_PD_REG0),
+	VPU_MEMPD(HHI_VPU_MEM_PD_REG1),
+	VPU_HHI_MEMPD(HHI_MEM_PD_REG0),
+};
+
 static struct meson_ee_pwrc_mem_domain g12a_pwrc_mem_eth[] = {
 	{ HHI_MEM_PD_REG0, GENMASK(3, 2) },
 };
@@ -201,11 +208,17 @@ static struct meson_ee_pwrc_mem_domain sm1_pwrc_mem_audio[] = {
 static bool pwrc_ee_get_power(struct power_domain *power_domain);
 
 static struct meson_ee_pwrc_domain_desc g12a_pwrc_domains[] = {
-	[PWRC_G12A_VPU_ID]  = VPU_PD("VPU", &g12a_pwrc_vpu, g12a_pwrc_mem_vpu,
+	[PWRC_G12A_VPU_ID]  = VPU_PD("VPU", &gx_pwrc_vpu, g12a_pwrc_mem_vpu,
 				     pwrc_ee_get_power, 11, 2),
 	[PWRC_G12A_ETH_ID] = MEM_PD("ETH", g12a_pwrc_mem_eth),
 };
 
+static struct meson_ee_pwrc_domain_desc gxbb_pwrc_domains[] = {
+	[PWRC_GXBB_VPU_ID]  = VPU_PD("VPU", &gx_pwrc_vpu, gxbb_pwrc_mem_vpu,
+			pwrc_ee_get_power, 12, 2),
+	[PWRC_GXBB_ETHERNET_MEM_ID] = MEM_PD("ETH", g12a_pwrc_mem_eth),
+};
+
 static struct meson_ee_pwrc_domain_desc sm1_pwrc_domains[] = {
 	[PWRC_SM1_VPU_ID]  = VPU_PD("VPU", &sm1_pwrc_vpu, sm1_pwrc_mem_vpu,
 				    pwrc_ee_get_power, 11, 2),
@@ -369,6 +382,11 @@ static struct meson_ee_pwrc_domain_data meson_ee_g12a_pwrc_data = {
 	.domains = g12a_pwrc_domains,
 };
 
+static struct meson_ee_pwrc_domain_data meson_ee_gxbb_pwrc_data = {
+	.count = ARRAY_SIZE(gxbb_pwrc_domains),
+	.domains = gxbb_pwrc_domains,
+};
+
 static struct meson_ee_pwrc_domain_data meson_ee_sm1_pwrc_data = {
 	.count = ARRAY_SIZE(sm1_pwrc_domains),
 	.domains = sm1_pwrc_domains,
@@ -379,6 +397,10 @@ static const struct udevice_id meson_ee_pwrc_ids[] = {
 		.compatible = "amlogic,meson-g12a-pwrc",
 		.data = (unsigned long)&meson_ee_g12a_pwrc_data,
 	},
+	{
+		.compatible = "amlogic,meson-gxbb-pwrc",
+		.data = (unsigned long)&meson_ee_gxbb_pwrc_data,
+	},
 	{
 		.compatible = "amlogic,meson-sm1-pwrc",
 		.data = (unsigned long)&meson_ee_sm1_pwrc_data,
Signature · 1 line
2.25.1
#3 lore raw

PATCH 3/4 power: domain: meson-ee-pwrc: add support for the Meson AXG SoCs

In reply to Neil Armstrong

This syncs with the linux meson-ee-pwrc driver from Linux 5.10-rc1.

---
 drivers/power/domain/meson-ee-pwrc.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
drivers/power/domain/meson-ee-pwrc.c +26 -0
index dfedddd950..fa1ee93837 100644
@@ -13,6 +13,7 @@
 #include <syscon.h>
 #include <reset.h>
 #include <clk.h>
+#include <dt-bindings/power/meson-axg-power.h>
 #include <dt-bindings/power/meson-g12a-power.h>
 #include <dt-bindings/power/meson-gxbb-power.h>
 #include <dt-bindings/power/meson-sm1-power.h>
@@ -127,6 +128,11 @@ static struct meson_ee_pwrc_mem_domain g12a_pwrc_mem_vpu[] = {
 	VPU_HHI_MEMPD(HHI_MEM_PD_REG0),
 };
 
+static struct meson_ee_pwrc_mem_domain axg_pwrc_mem_vpu[] = {
+	VPU_MEMPD(HHI_VPU_MEM_PD_REG0),
+	VPU_HHI_MEMPD(HHI_MEM_PD_REG0),
+};
+
 static struct meson_ee_pwrc_mem_domain gxbb_pwrc_mem_vpu[] = {
 	VPU_MEMPD(HHI_VPU_MEM_PD_REG0),
 	VPU_MEMPD(HHI_VPU_MEM_PD_REG1),
@@ -166,6 +172,10 @@ static struct meson_ee_pwrc_mem_domain sm1_pwrc_mem_ge2d[] = {
 	{ HHI_MEM_PD_REG0, GENMASK(25, 18) },
 };
 
+static struct meson_ee_pwrc_mem_domain axg_pwrc_mem_audio[] = {
+	{ HHI_MEM_PD_REG0, GENMASK(5, 4) },
+};
+
 static struct meson_ee_pwrc_mem_domain sm1_pwrc_mem_audio[] = {
 	{ HHI_MEM_PD_REG0, GENMASK(5, 4) },
 	{ HHI_AUDIO_MEM_PD_REG0, GENMASK(1, 0) },
@@ -213,6 +223,13 @@ static struct meson_ee_pwrc_domain_desc g12a_pwrc_domains[] = {
 	[PWRC_G12A_ETH_ID] = MEM_PD("ETH", g12a_pwrc_mem_eth),
 };
 
+static struct meson_ee_pwrc_domain_desc axg_pwrc_domains[] = {
+	[PWRC_AXG_VPU_ID]  = VPU_PD("VPU", &gx_pwrc_vpu, axg_pwrc_mem_vpu,
+			pwrc_ee_get_power, 5, 2),
+	[PWRC_AXG_ETHERNET_MEM_ID] = MEM_PD("ETH", g12a_pwrc_mem_eth),
+	[PWRC_AXG_AUDIO_ID] = MEM_PD("AUDIO", axg_pwrc_mem_audio),
+};
+
 static struct meson_ee_pwrc_domain_desc gxbb_pwrc_domains[] = {
 	[PWRC_GXBB_VPU_ID]  = VPU_PD("VPU", &gx_pwrc_vpu, gxbb_pwrc_mem_vpu,
 			pwrc_ee_get_power, 12, 2),
@@ -382,6 +399,11 @@ static struct meson_ee_pwrc_domain_data meson_ee_g12a_pwrc_data = {
 	.domains = g12a_pwrc_domains,
 };
 
+static struct meson_ee_pwrc_domain_data meson_ee_axg_pwrc_data = {
+	.count = ARRAY_SIZE(axg_pwrc_domains),
+	.domains = axg_pwrc_domains,
+};
+
 static struct meson_ee_pwrc_domain_data meson_ee_gxbb_pwrc_data = {
 	.count = ARRAY_SIZE(gxbb_pwrc_domains),
 	.domains = gxbb_pwrc_domains,
@@ -401,6 +423,10 @@ static const struct udevice_id meson_ee_pwrc_ids[] = {
 		.compatible = "amlogic,meson-gxbb-pwrc",
 		.data = (unsigned long)&meson_ee_gxbb_pwrc_data,
 	},
+	{
+		.compatible = "amlogic,meson-axg-pwrc",
+		.data = (unsigned long)&meson_ee_axg_pwrc_data,
+	},
 	{
 		.compatible = "amlogic,meson-sm1-pwrc",
 		.data = (unsigned long)&meson_ee_sm1_pwrc_data,
Signature · 1 line
2.25.1
#4 lore raw

PATCH 4/4 configs: use the new MESON_EE_POWER_DOMAIN driver for Amlogic GXBB/GXL/GXM boards

In reply to Neil Armstrong

Linux 5.10-rc1 uses the new generic driver, so switch to it since GXBB and later is now supported.

---
 configs/libretech-ac_defconfig       | 2 +-
 configs/libretech-cc_defconfig       | 2 +-
 configs/libretech-s905d-pc_defconfig | 2 +-
 configs/libretech-s912-pc_defconfig  | 2 +-
 configs/odroid-c2_defconfig          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
configs/libretech-ac_defconfig +1 -1
index 171d793ae3..ca61591bd7 100644
@@ -51,7 +51,7 @@ CONFIG_MESON_GXL_USB_PHY=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_MESON_GXL=y
 CONFIG_POWER_DOMAIN=y
-CONFIG_MESON_GX_VPU_POWER_DOMAIN=y
+CONFIG_MESON_EE_POWER_DOMAIN=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_RESET=y
configs/libretech-cc_defconfig +1 -1
index aaab1a2d08..fb4bf4c929 100644
@@ -38,7 +38,7 @@ CONFIG_MESON_GXL_USB_PHY=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_MESON_GXL=y
 CONFIG_POWER_DOMAIN=y
-CONFIG_MESON_GX_VPU_POWER_DOMAIN=y
+CONFIG_MESON_EE_POWER_DOMAIN=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_RESET=y
configs/libretech-s905d-pc_defconfig +1 -1
index f4e289aca1..9d4c880a3b 100644
@@ -46,7 +46,7 @@ CONFIG_MESON_GXL_USB_PHY=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_MESON_GXL=y
 CONFIG_POWER_DOMAIN=y
-CONFIG_MESON_GX_VPU_POWER_DOMAIN=y
+CONFIG_MESON_EE_POWER_DOMAIN=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_RESET=y
configs/libretech-s912-pc_defconfig +1 -1
index 24e410c5aa..cf600c1cbe 100644
@@ -45,7 +45,7 @@ CONFIG_MESON_GXL_USB_PHY=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_MESON_GXL=y
 CONFIG_POWER_DOMAIN=y
-CONFIG_MESON_GX_VPU_POWER_DOMAIN=y
+CONFIG_MESON_EE_POWER_DOMAIN=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_RESET=y
configs/odroid-c2_defconfig +1 -1
index 5fdce3b463..a692179956 100644
@@ -39,7 +39,7 @@ CONFIG_MESON_GXBB_USB_PHY=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_MESON_GXBB=y
 CONFIG_POWER_DOMAIN=y
-CONFIG_MESON_GX_VPU_POWER_DOMAIN=y
+CONFIG_MESON_EE_POWER_DOMAIN=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
Signature · 1 line
2.25.1
#5 lore raw

cover ARM: upgrade Amlogic DT to Linux 5.10

In reply to Neil Armstrong
Quoted 34 lines · Neil Armstrong

This syncs the Amlogic DT to 5.10, and :
- adds support for the new common MESON_EE_POWER_DOMAIN synced on 5.10
- adds Odroid-N2+ DT using the Odroid-N2 DT as base

Neil Armstrong (4):
ARM: dts: sync Amlogic GX & AXG from Linux 5.10-rc1
power: domain: meson-ee-pwrc: add support for the Meson GX SoCs
power: domain: meson-ee-pwrc: add support for the Meson AXG SoCs
configs: use the new MESON_EE_POWER_DOMAIN driver for Amlogic
GXBB/GXL/GXM boards

 arch/arm/dts/Makefile                         |   1 +
 arch/arm/dts/meson-axg.dtsi                   |   6 +-
 arch/arm/dts/meson-g12b-khadas-vim3.dtsi      |  88 ---
 arch/arm/dts/meson-g12b-odroid-n2-plus.dts    |  31 +
 arch/arm/dts/meson-g12b-odroid-n2.dts         | 618 +----------------
 arch/arm/dts/meson-g12b-odroid-n2.dtsi        | 625 ++++++++++++++++++
 arch/arm/dts/meson-gx-mali450.dtsi            |  61 ++
 arch/arm/dts/meson-gx.dtsi                    |  18 +-
 arch/arm/dts/meson-gxbb.dtsi                  |  63 +-
 arch/arm/dts/meson-gxl-mali.dtsi              |  46 +-
 arch/arm/dts/meson-gxl-s805x-libretech-ac.dts |   2 +-
 arch/arm/dts/meson-gxl-s805x.dtsi             |  23 +
 arch/arm/dts/meson-gxl.dtsi                   |  17 +-
 arch/arm/dts/meson-gxm.dtsi                   |  45 +-
 arch/arm/dts/meson-khadas-vim3.dtsi           |  94 ++-
 arch/arm/dts/meson-sm1-khadas-vim3l.dts       |  86 ---
 configs/libretech-ac_defconfig                |   2 +-
 configs/libretech-cc_defconfig                |   2 +-
 configs/libretech-s905d-pc_defconfig          |   2 +-
 configs/libretech-s912-pc_defconfig           |   2 +-
 configs/odroid-c2_defconfig                   |   2 +-
 drivers/power/domain/meson-ee-pwrc.c          |  52 +-
 include/dt-bindings/power/meson-axg-power.h   |  14 +
Quoted 9 lines
 include/dt-bindings/power/meson-gxbb-power.h  |  13 +
 24 files changed, 1002 insertions(+), 911 deletions(-)
 create mode 100644 arch/arm/dts/meson-g12b-odroid-n2-plus.dts
 create mode 100644 arch/arm/dts/meson-g12b-odroid-n2.dtsi
 create mode 100644 arch/arm/dts/meson-gx-mali450.dtsi
 create mode 100644 arch/arm/dts/meson-gxl-s805x.dtsi
 create mode 100644 include/dt-bindings/power/meson-axg-power.h
 create mode 100644 include/dt-bindings/power/meson-gxbb-power.h

Applied to u-boot-amlogic-next