sunxi-7.0: rewrite patches against rc5

kernel config rewrite was also done but resulted in no changes

Author: EvilOlaf

patch/kernel/archive/sunxi-7.0/patches.armbian/drv-iommu-sunxi-add-iommu-driver.patch

@@ -13,8 +13,9 @@ Signed-off-by: Marvin Wewer <mwewer37@proton.me>
  drivers/iommu/sun55i-iommu.h         |   57 +
  include/sunxi-iommu.h                |   50 +
  7 files changed, 2318 insertions(+)
+
 diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
-index f86262b11416..1c118b2b528d 100644
+index 111111111111..222222222222 100644
 --- a/drivers/iommu/Kconfig
 +++ b/drivers/iommu/Kconfig
 @@ -245,6 +245,16 @@ config SUN50I_IOMMU
@@ -35,7 +36,7 @@ index f86262b11416..1c118b2b528d 100644
  config TEGRA_IOMMU_SMMU
  	bool "NVIDIA Tegra SMMU Support"
 diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
-index 0275821f4ef9..8e731e6a07e2 100644
+index 111111111111..222222222222 100644
 --- a/drivers/iommu/Makefile
 +++ b/drivers/iommu/Makefile
 @@ -37,3 +37,6 @@ obj-$(CONFIG_IOMMU_IOPF) += io-pgfault.o
@@ -47,7 +48,7 @@ index 0275821f4ef9..8e731e6a07e2 100644
 +sunxi-iommu-objs += sun55i-iommu.o
 diff --git a/drivers/iommu/sun55i-iommu-pgtable.c b/drivers/iommu/sun55i-iommu-pgtable.c
 new file mode 100644
-index 000000000000..f0d1e8808ef8
+index 000000000000..111111111111
 --- /dev/null
 +++ b/drivers/iommu/sun55i-iommu-pgtable.c
 @@ -0,0 +1,468 @@
@@ -521,7 +522,7 @@ index 000000000000..f0d1e8808ef8
 +}
 diff --git a/drivers/iommu/sun55i-iommu-pgtable.h b/drivers/iommu/sun55i-iommu-pgtable.h
 new file mode 100644
-index 000000000000..457b8ce1af0f
+index 000000000000..111111111111
 --- /dev/null
 +++ b/drivers/iommu/sun55i-iommu-pgtable.h
 @@ -0,0 +1,125 @@
@@ -652,7 +653,7 @@ index 000000000000..457b8ce1af0f
 +#endif
 diff --git a/drivers/iommu/sun55i-iommu.c b/drivers/iommu/sun55i-iommu.c
 new file mode 100644
-index 000000000000..89080fc2a034
+index 000000000000..111111111111
 --- /dev/null
 +++ b/drivers/iommu/sun55i-iommu.c
 @@ -0,0 +1,1605 @@
@@ -2263,7 +2264,7 @@ index 000000000000..89080fc2a034
 +module_exit(sunxi_iommu_exit);
 diff --git a/drivers/iommu/sun55i-iommu.h b/drivers/iommu/sun55i-iommu.h
 new file mode 100644
-index 000000000000..74c049ca8f30
+index 000000000000..111111111111
 --- /dev/null
 +++ b/drivers/iommu/sun55i-iommu.h
 @@ -0,0 +1,57 @@
@@ -2326,7 +2327,7 @@ index 000000000000..74c049ca8f30
 +void sun55i_enable_device_iommu(struct sunxi_iommu_dev *iommu, unsigned int master_id, bool flag);
 diff --git a/include/sunxi-iommu.h b/include/sunxi-iommu.h
 new file mode 100644
-index 000000000000..09b578e530bf
+index 000000000000..111111111111
 --- /dev/null
 +++ b/include/sunxi-iommu.h
 @@ -0,0 +1,50 @@
@@ -2380,3 +2381,6 @@ index 000000000000..09b578e530bf
 +};
 +
 +#endif  /* __LINUX_SUNXI_IOMMU_H */
+-- 
+Armbian
+

patch/kernel/archive/sunxi-7.0/patches.megous/a83t-suspend-7.0/0004-firmware-scpi-Add-support-for-sending-a-SCPI_CMD_SET.patch

@@ -25,31 +25,31 @@ diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
 index 111111111111..222222222222 100644
 --- a/drivers/firmware/arm_scpi.c
 +++ b/drivers/firmware/arm_scpi.c
-@@ -187,6 +187,7 @@ enum scpi_drv_cmds {
+@@ -188,6 +188,7 @@ enum scpi_drv_cmds {
  	CMD_SENSOR_VALUE,
  	CMD_SET_DEVICE_PWR_STATE,
  	CMD_GET_DEVICE_PWR_STATE,
 +	CMD_SET_SYS_PWR_STATE,
  	CMD_MAX_COUNT,
  };
 
-@@ -203,6 +204,7 @@ static int scpi_std_commands[CMD_MAX_COUNT] = {
+@@ -204,6 +205,7 @@ static int scpi_std_commands[CMD_MAX_COUNT] = {
  	SCPI_CMD_SENSOR_VALUE,
  	SCPI_CMD_SET_DEVICE_PWR_STATE,
  	SCPI_CMD_GET_DEVICE_PWR_STATE,
 +	SCPI_CMD_SET_SYS_PWR_STATE,
  };
 
  static int scpi_legacy_commands[CMD_MAX_COUNT] = {
-@@ -218,6 +220,7 @@ static int scpi_legacy_commands[CMD_MAX_COUNT] = {
+@@ -219,6 +221,7 @@ static int scpi_legacy_commands[CMD_MAX_COUNT] = {
  	LEGACY_SCPI_CMD_SENSOR_VALUE,
  	-1, /* SET_DEVICE_PWR_STATE */
  	-1, /* GET_DEVICE_PWR_STATE */
 +	LEGACY_SCPI_CMD_SYS_PWR_STATE,
  };
 
  struct scpi_xfer {
-@@ -785,6 +788,12 @@ static int scpi_device_set_power_state(u16 dev_id, u8 pstate)
+@@ -786,6 +789,12 @@ static int scpi_device_set_power_state(u16 dev_id, u8 pstate)
  				 sizeof(dev_set), &stat, sizeof(stat));
  }
 
@@ -62,7 +62,7 @@ index 111111111111..222222222222 100644
  static struct scpi_ops scpi_ops = {
  	.get_version = scpi_get_version,
  	.clk_get_range = scpi_clk_get_range,
-@@ -801,6 +810,7 @@ static struct scpi_ops scpi_ops = {
+@@ -802,6 +811,7 @@ static struct scpi_ops scpi_ops = {
  	.sensor_get_value = scpi_sensor_get_value,
  	.device_get_power_state = scpi_device_get_power_state,
  	.device_set_power_state = scpi_device_set_power_state,

patch/kernel/archive/sunxi-7.0/patches.megous/aw-suspend-7.0/0002-firmware-arm_scpi-Support-unidirectional-mailbox-cha.patch

@@ -21,7 +21,7 @@ diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
 index 111111111111..222222222222 100644
 --- a/drivers/firmware/arm_scpi.c
 +++ b/drivers/firmware/arm_scpi.c
-@@ -237,7 +237,8 @@ struct scpi_xfer {
+@@ -238,7 +238,8 @@ struct scpi_xfer {
 
  struct scpi_chan {
  	struct mbox_client cl;
@@ -31,7 +31,7 @@ index 111111111111..222222222222 100644
  	void __iomem *tx_payload;
  	void __iomem *rx_payload;
  	struct list_head rx_pending;
-@@ -511,7 +512,7 @@ static int scpi_send_message(u8 idx, void *tx_buf, unsigned int tx_len,
+@@ -512,7 +513,7 @@ static int scpi_send_message(u8 idx, void *tx_buf, unsigned int tx_len,
  	msg->rx_len = rx_len;
  	reinit_completion(&msg->done);
 
@@ -40,7 +40,7 @@ index 111111111111..222222222222 100644
  	if (ret < 0 || !rx_buf)
  		goto out;
 
-@@ -872,8 +873,13 @@ static void scpi_free_channels(void *data)
+@@ -873,8 +874,13 @@ static void scpi_free_channels(void *data)
  	struct scpi_drvinfo *info = data;
  	int i;
 
@@ -56,15 +56,15 @@ index 111111111111..222222222222 100644
  }
 
  static void scpi_remove(struct platform_device *pdev)
-@@ -923,6 +929,7 @@ static int scpi_probe(struct platform_device *pdev)
+@@ -924,6 +930,7 @@ static int scpi_probe(struct platform_device *pdev)
  	struct device *dev = &pdev->dev;
  	struct device_node *np = dev->of_node;
  	struct scpi_drvinfo *scpi_drvinfo;
 +	bool use_mbox_names = false;
 
  	scpi_drvinfo = devm_kzalloc(dev, sizeof(*scpi_drvinfo), GFP_KERNEL);
  	if (!scpi_drvinfo)
-@@ -935,6 +942,14 @@ static int scpi_probe(struct platform_device *pdev)
+@@ -936,6 +943,14 @@ static int scpi_probe(struct platform_device *pdev)
  		dev_err(dev, "no mboxes property in '%pOF'\n", np);
  		return -ENODEV;
  	}
@@ -79,7 +79,7 @@ index 111111111111..222222222222 100644
 
  	scpi_drvinfo->channels =
  		devm_kcalloc(dev, count, sizeof(struct scpi_chan), GFP_KERNEL);
-@@ -983,15 +998,34 @@ static int scpi_probe(struct platform_device *pdev)
+@@ -984,15 +999,34 @@ static int scpi_probe(struct platform_device *pdev)
  		mutex_init(&pchan->xfers_lock);
 
  		ret = scpi_alloc_xfer_list(dev, pchan);