[PATCH 1/3] mach-ipq40xx: add CPU specific code

[PATCH 1/3] mach-ipq40xx: add CPU specific code

[Robert Marko]

Provide basic DRAM info population from DT, cache setting and the
board_init stub.

Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---
 arch/arm/mach-ipq40xx/Makefile |  7 ++++++
 arch/arm/mach-ipq40xx/cpu.c    | 44 ++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 arch/arm/mach-ipq40xx/Makefile
 create mode 100644 arch/arm/mach-ipq40xx/cpu.c

diff --git a/arch/arm/mach-ipq40xx/Makefile b/arch/arm/mach-ipq40xx/Makefile
new file mode 100644
index 0000000000..d611de9933
--- /dev/null
+++ b/arch/arm/mach-ipq40xx/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (c) 2024 Sartura Ltd.
+#
+# Author: Robert Marko <robert.marko@sartura.hr>
+
+obj-y += cpu.o
diff --git a/arch/arm/mach-ipq40xx/cpu.c b/arch/arm/mach-ipq40xx/cpu.c
new file mode 100644
index 0000000000..0446627a8f
--- /dev/null
+++ b/arch/arm/mach-ipq40xx/cpu.c
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * CPU code for Qualcomm IPQ40xx SoC
+ *
+ * Copyright (c) 2024 Sartura Ltd.
+ *
+ * Author: Robert Marko <robert.marko@sartura.hr>
+ */
+
+#include <common.h>
+#include <cpu_func.h>
+#include <init.h>
+
+int dram_init(void)
+{
+	int ret;
+
+	ret = fdtdec_setup_memory_banksize();
+	if (ret)
+		return ret;
+	return fdtdec_setup_mem_size_base();
+}
+
+/*
+ * Enable/Disable D-cache.
+ * I-cache is already enabled in start.S
+ */
+void enable_caches(void)
+{
+	dcache_enable();
+}
+
+void disable_caches(void)
+{
+	dcache_disable();
+}
+
+/*
+ * In case boards need specific init code, they can override this stub.
+ */
+int __weak board_init(void)
+{
+	return 0;
+}
-- 
2.44.0

[PATCH 2/3] mach-ipq40xx: use OF_UPSTREAM

[Robert Marko]

Now that drivers are compatible enough with the upstream DTS, there is no
reason to not use the upstream DTS, so imply OF_UPSTREAM by default.

Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---
 arch/arm/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 93e12d8d53..5c2769b59d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -768,6 +768,7 @@ config ARCH_IPQ40XX
 	select CLK_QCOM_IPQ4019
 	select PINCTRL_QCOM_IPQ4019
 	imply CMD_DM
+	imply OF_UPSTREAM
 
 config ARCH_KEYSTONE
 	bool "TI Keystone"
-- 
2.44.0

[PATCH 3/3] arm: dts: drop downstream IPQ4019 DTSI

[Robert Marko]

We want to use OF_UPSTREAM on IPQ40XX as its well supported upstream, so
lets drop our downstream DTSI.

Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---
 arch/arm/dts/qcom-ipq4019.dtsi | 202 ---------------------------------
 1 file changed, 202 deletions(-)
 delete mode 100644 arch/arm/dts/qcom-ipq4019.dtsi

diff --git a/arch/arm/dts/qcom-ipq4019.dtsi b/arch/arm/dts/qcom-ipq4019.dtsi
deleted file mode 100644
index f9489e42ea..0000000000
--- a/arch/arm/dts/qcom-ipq4019.dtsi
+++ /dev/null
@@ -1,202 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (c) 2019 Sartura Ltd.
- *
- * Author: Robert Marko <robert.marko@sartura.hr>
- */
-
- /dts-v1/;
-
-#include "skeleton.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/clock/qcom,ipq4019-gcc.h>
-#include <dt-bindings/reset/qcom,ipq4019-reset.h>
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	model = "Qualcomm Technologies, Inc. IPQ4019";
-	compatible = "qcom,ipq4019";
-
-	aliases {
-		serial0 = &blsp1_uart1;
-		spi0 = &blsp1_spi1;
-	};
-
-	reserved-memory {
-		#address-cells = <0x1>;
-		#size-cells = <0x1>;
-		ranges;
-
-		smem_mem: smem_region: smem@87e00000 {
-			reg = <0x87e00000 0x080000>;
-			no-map;
-		};
-
-		tz@87e80000 {
-			reg = <0x87e80000 0x180000>;
-			no-map;
-		};
-	};
-
-	smem {
-		compatible = "qcom,smem";
-		memory-region = <&smem_mem>;
-	};
-
-	soc: soc {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		compatible = "simple-bus";
-
-		gcc: clock-controller@1800000 {
-			compatible = "qcom,gcc-ipq4019";
-			reg = <0x1800000 0x60000>;
-			#clock-cells = <1>;
-			#reset-cells = <1>;
-			bootph-all;
-		};
-
-		rng: rng@22000 {
-			compatible = "qcom,prng";
-			reg = <0x22000 0x140>;
-			clocks = <&gcc GCC_PRNG_AHB_CLK>;
-			status = "disabled";
-		};
-
-		soc_gpios: pinctrl@1000000 {
-			compatible = "qcom,ipq4019-pinctrl";
-			reg = <0x1000000 0x300000>;
-			gpio-controller;
-			gpio-count = <100>;
-			gpio-bank-name="soc";
-			#gpio-cells = <2>;
-			bootph-all;
-		};
-
-		blsp1_uart1: serial@78af000 {
-			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
-			reg = <0x78af000 0x200>;
-			clock = <&gcc GCC_BLSP1_UART1_APPS_CLK>;
-			bit-rate = <0xFF>;
-			status = "disabled";
-			bootph-all;
-		};
-
-		blsp1_spi1: spi@78b5000 {
-			compatible = "qcom,spi-qup-v2.2.1";
-			reg = <0x78b5000 0x600>;
-			clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "disabled";
-			bootph-all;
-		};
-
-		mdio: mdio@90000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "qcom,ipq4019-mdio";
-			reg = <0x90000 0x64>;
-			status = "disabled";
-
-			ethphy0: ethernet-phy@0 {
-				reg = <0>;
-			};
-
-			ethphy1: ethernet-phy@1 {
-				reg = <1>;
-			};
-
-			ethphy2: ethernet-phy@2 {
-				reg = <2>;
-			};
-
-			ethphy3: ethernet-phy@3 {
-				reg = <3>;
-			};
-
-			ethphy4: ethernet-phy@4 {
-				reg = <4>;
-			};
-		};
-
-		usb3_ss_phy: ssphy@9a000 {
-			compatible = "qcom,usb-ss-ipq4019-phy";
-			#phy-cells = <0>;
-			reg = <0x9a000 0x800>;
-			reg-names = "phy_base";
-			resets = <&gcc USB3_UNIPHY_PHY_ARES>;
-			reset-names = "por_rst";
-			status = "disabled";
-		};
-
-		usb3_hs_phy: hsphy@a6000 {
-			compatible = "qcom,usb-hs-ipq4019-phy";
-			#phy-cells = <0>;
-			reg = <0xa6000 0x40>;
-			reg-names = "phy_base";
-			resets = <&gcc USB3_HSPHY_POR_ARES>, <&gcc USB3_HSPHY_S_ARES>;
-			reset-names = "por_rst", "srif_rst";
-			status = "disabled";
-		};
-
-		usb3: usb3@8af8800 {
-			compatible = "qcom,dwc3";
-			reg = <0x8af8800 0x100>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			clocks = <&gcc GCC_USB3_MASTER_CLK>,
-				 <&gcc GCC_USB3_SLEEP_CLK>,
-				 <&gcc GCC_USB3_MOCK_UTMI_CLK>;
-			clock-names = "master", "sleep", "mock_utmi";
-			ranges;
-			status = "disabled";
-
-			dwc3@8a00000 {
-				compatible = "snps,dwc3";
-				reg = <0x8a00000 0xf8000>;
-				phys = <&usb3_hs_phy>, <&usb3_ss_phy>;
-				phy-names = "usb2-phy", "usb3-phy";
-				dr_mode = "host";
-				maximum-speed = "super-speed";
-				snps,dis_u2_susphy_quirk;
-			};
-		};
-
-		usb2_hs_phy: hsphy@a8000 {
-			compatible = "qcom,usb-hs-ipq4019-phy";
-			#phy-cells = <0>;
-			reg = <0xa8000 0x40>;
-			reg-names = "phy_base";
-			resets = <&gcc USB2_HSPHY_POR_ARES>, <&gcc USB2_HSPHY_S_ARES>;
-			reset-names = "por_rst", "srif_rst";
-			status = "disabled";
-		};
-
-		usb2: usb2@60f8800 {
-			compatible = "qcom,dwc3";
-			reg = <0x60f8800 0x100>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			clocks = <&gcc GCC_USB2_MASTER_CLK>,
-				 <&gcc GCC_USB2_SLEEP_CLK>,
-				 <&gcc GCC_USB2_MOCK_UTMI_CLK>;
-			clock-names = "master", "sleep", "mock_utmi";
-			ranges;
-			status = "disabled";
-
-			dwc3@6000000 {
-				compatible = "snps,dwc3";
-				reg = <0x6000000 0xf8000>;
-				phys = <&usb2_hs_phy>;
-				phy-names = "usb2-phy";
-				dr_mode = "host";
-				maximum-speed = "high-speed";
-				snps,dis_u2_susphy_quirk;
-			};
-		};
-	};
-};
-- 
2.44.0

Re: [PATCH 1/3] mach-ipq40xx: add CPU specific code

[Caleb Connolly]

On 24/04/2024 13:13, Robert Marko wrote:
> Provide basic DRAM info population from DT, cache setting and the
> board_init stub.
> 
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>
Acked-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
>   arch/arm/mach-ipq40xx/Makefile |  7 ++++++
>   arch/arm/mach-ipq40xx/cpu.c    | 44 ++++++++++++++++++++++++++++++++++
>   2 files changed, 51 insertions(+)
>   create mode 100644 arch/arm/mach-ipq40xx/Makefile
>   create mode 100644 arch/arm/mach-ipq40xx/cpu.c
> 
> diff --git a/arch/arm/mach-ipq40xx/Makefile b/arch/arm/mach-ipq40xx/Makefile
> new file mode 100644
> index 0000000000..d611de9933
> --- /dev/null
> +++ b/arch/arm/mach-ipq40xx/Makefile
> @@ -0,0 +1,7 @@
> +# SPDX-License-Identifier: GPL-2.0+
> +#
> +# Copyright (c) 2024 Sartura Ltd.
> +#
> +# Author: Robert Marko <robert.marko@sartura.hr>
> +
> +obj-y += cpu.o
> diff --git a/arch/arm/mach-ipq40xx/cpu.c b/arch/arm/mach-ipq40xx/cpu.c
> new file mode 100644
> index 0000000000..0446627a8f
> --- /dev/null
> +++ b/arch/arm/mach-ipq40xx/cpu.c
> @@ -0,0 +1,44 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * CPU code for Qualcomm IPQ40xx SoC
> + *
> + * Copyright (c) 2024 Sartura Ltd.
> + *
> + * Author: Robert Marko <robert.marko@sartura.hr>
> + */
> +
> +#include <common.h>
> +#include <cpu_func.h>
> +#include <init.h>
> +
> +int dram_init(void)
> +{
> +	int ret;
> +
> +	ret = fdtdec_setup_memory_banksize();
> +	if (ret)
> +		return ret;
> +	return fdtdec_setup_mem_size_base();
> +}
> +
> +/*
> + * Enable/Disable D-cache.
> + * I-cache is already enabled in start.S
> + */
> +void enable_caches(void)
> +{
> +	dcache_enable();
> +}
> +
> +void disable_caches(void)
> +{
> +	dcache_disable();
> +}
> +
> +/*
> + * In case boards need specific init code, they can override this stub.
> + */
> +int __weak board_init(void)
> +{
> +	return 0;
> +}

-- 
// Caleb (they/them)

Re: [PATCH 2/3] mach-ipq40xx: use OF_UPSTREAM

[Caleb Connolly]

On 24/04/2024 13:13, Robert Marko wrote:
> Now that drivers are compatible enough with the upstream DTS, there is no
> reason to not use the upstream DTS, so imply OF_UPSTREAM by default.
> 
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>
Acked-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
>   arch/arm/Kconfig | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 93e12d8d53..5c2769b59d 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -768,6 +768,7 @@ config ARCH_IPQ40XX
>   	select CLK_QCOM_IPQ4019
>   	select PINCTRL_QCOM_IPQ4019
>   	imply CMD_DM
> +	imply OF_UPSTREAM
>   
>   config ARCH_KEYSTONE
>   	bool "TI Keystone"

-- 
// Caleb (they/them)

Re: [PATCH 3/3] arm: dts: drop downstream IPQ4019 DTSI

[Caleb Connolly]

On 24/04/2024 13:13, Robert Marko wrote:
> We want to use OF_UPSTREAM on IPQ40XX as its well supported upstream, so
> lets drop our downstream DTSI.
> 
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>
Acked-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
>   arch/arm/dts/qcom-ipq4019.dtsi | 202 ---------------------------------
>   1 file changed, 202 deletions(-)
>   delete mode 100644 arch/arm/dts/qcom-ipq4019.dtsi
> 
> diff --git a/arch/arm/dts/qcom-ipq4019.dtsi b/arch/arm/dts/qcom-ipq4019.dtsi
> deleted file mode 100644
> index f9489e42ea..0000000000
> --- a/arch/arm/dts/qcom-ipq4019.dtsi
> +++ /dev/null
> @@ -1,202 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+
> -/*
> - * Copyright (c) 2019 Sartura Ltd.
> - *
> - * Author: Robert Marko <robert.marko@sartura.hr>
> - */
> -
> - /dts-v1/;
> -
> -#include "skeleton.dtsi"
> -#include <dt-bindings/gpio/gpio.h>
> -#include <dt-bindings/clock/qcom,ipq4019-gcc.h>
> -#include <dt-bindings/reset/qcom,ipq4019-reset.h>
> -
> -/ {
> -	#address-cells = <1>;
> -	#size-cells = <1>;
> -
> -	model = "Qualcomm Technologies, Inc. IPQ4019";
> -	compatible = "qcom,ipq4019";
> -
> -	aliases {
> -		serial0 = &blsp1_uart1;
> -		spi0 = &blsp1_spi1;
> -	};
> -
> -	reserved-memory {
> -		#address-cells = <0x1>;
> -		#size-cells = <0x1>;
> -		ranges;
> -
> -		smem_mem: smem_region: smem@87e00000 {
> -			reg = <0x87e00000 0x080000>;
> -			no-map;
> -		};
> -
> -		tz@87e80000 {
> -			reg = <0x87e80000 0x180000>;
> -			no-map;
> -		};
> -	};
> -
> -	smem {
> -		compatible = "qcom,smem";
> -		memory-region = <&smem_mem>;
> -	};
> -
> -	soc: soc {
> -		#address-cells = <1>;
> -		#size-cells = <1>;
> -		ranges;
> -		compatible = "simple-bus";
> -
> -		gcc: clock-controller@1800000 {
> -			compatible = "qcom,gcc-ipq4019";
> -			reg = <0x1800000 0x60000>;
> -			#clock-cells = <1>;
> -			#reset-cells = <1>;
> -			bootph-all;
> -		};
> -
> -		rng: rng@22000 {
> -			compatible = "qcom,prng";
> -			reg = <0x22000 0x140>;
> -			clocks = <&gcc GCC_PRNG_AHB_CLK>;
> -			status = "disabled";
> -		};
> -
> -		soc_gpios: pinctrl@1000000 {
> -			compatible = "qcom,ipq4019-pinctrl";
> -			reg = <0x1000000 0x300000>;
> -			gpio-controller;
> -			gpio-count = <100>;
> -			gpio-bank-name="soc";
> -			#gpio-cells = <2>;
> -			bootph-all;
> -		};
> -
> -		blsp1_uart1: serial@78af000 {
> -			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
> -			reg = <0x78af000 0x200>;
> -			clock = <&gcc GCC_BLSP1_UART1_APPS_CLK>;
> -			bit-rate = <0xFF>;
> -			status = "disabled";
> -			bootph-all;
> -		};
> -
> -		blsp1_spi1: spi@78b5000 {
> -			compatible = "qcom,spi-qup-v2.2.1";
> -			reg = <0x78b5000 0x600>;
> -			clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>;
> -			#address-cells = <1>;
> -			#size-cells = <0>;
> -			status = "disabled";
> -			bootph-all;
> -		};
> -
> -		mdio: mdio@90000 {
> -			#address-cells = <1>;
> -			#size-cells = <0>;
> -			compatible = "qcom,ipq4019-mdio";
> -			reg = <0x90000 0x64>;
> -			status = "disabled";
> -
> -			ethphy0: ethernet-phy@0 {
> -				reg = <0>;
> -			};
> -
> -			ethphy1: ethernet-phy@1 {
> -				reg = <1>;
> -			};
> -
> -			ethphy2: ethernet-phy@2 {
> -				reg = <2>;
> -			};
> -
> -			ethphy3: ethernet-phy@3 {
> -				reg = <3>;
> -			};
> -
> -			ethphy4: ethernet-phy@4 {
> -				reg = <4>;
> -			};
> -		};
> -
> -		usb3_ss_phy: ssphy@9a000 {
> -			compatible = "qcom,usb-ss-ipq4019-phy";
> -			#phy-cells = <0>;
> -			reg = <0x9a000 0x800>;
> -			reg-names = "phy_base";
> -			resets = <&gcc USB3_UNIPHY_PHY_ARES>;
> -			reset-names = "por_rst";
> -			status = "disabled";
> -		};
> -
> -		usb3_hs_phy: hsphy@a6000 {
> -			compatible = "qcom,usb-hs-ipq4019-phy";
> -			#phy-cells = <0>;
> -			reg = <0xa6000 0x40>;
> -			reg-names = "phy_base";
> -			resets = <&gcc USB3_HSPHY_POR_ARES>, <&gcc USB3_HSPHY_S_ARES>;
> -			reset-names = "por_rst", "srif_rst";
> -			status = "disabled";
> -		};
> -
> -		usb3: usb3@8af8800 {
> -			compatible = "qcom,dwc3";
> -			reg = <0x8af8800 0x100>;
> -			#address-cells = <1>;
> -			#size-cells = <1>;
> -			clocks = <&gcc GCC_USB3_MASTER_CLK>,
> -				 <&gcc GCC_USB3_SLEEP_CLK>,
> -				 <&gcc GCC_USB3_MOCK_UTMI_CLK>;
> -			clock-names = "master", "sleep", "mock_utmi";
> -			ranges;
> -			status = "disabled";
> -
> -			dwc3@8a00000 {
> -				compatible = "snps,dwc3";
> -				reg = <0x8a00000 0xf8000>;
> -				phys = <&usb3_hs_phy>, <&usb3_ss_phy>;
> -				phy-names = "usb2-phy", "usb3-phy";
> -				dr_mode = "host";
> -				maximum-speed = "super-speed";
> -				snps,dis_u2_susphy_quirk;
> -			};
> -		};
> -
> -		usb2_hs_phy: hsphy@a8000 {
> -			compatible = "qcom,usb-hs-ipq4019-phy";
> -			#phy-cells = <0>;
> -			reg = <0xa8000 0x40>;
> -			reg-names = "phy_base";
> -			resets = <&gcc USB2_HSPHY_POR_ARES>, <&gcc USB2_HSPHY_S_ARES>;
> -			reset-names = "por_rst", "srif_rst";
> -			status = "disabled";
> -		};
> -
> -		usb2: usb2@60f8800 {
> -			compatible = "qcom,dwc3";
> -			reg = <0x60f8800 0x100>;
> -			#address-cells = <1>;
> -			#size-cells = <1>;
> -			clocks = <&gcc GCC_USB2_MASTER_CLK>,
> -				 <&gcc GCC_USB2_SLEEP_CLK>,
> -				 <&gcc GCC_USB2_MOCK_UTMI_CLK>;
> -			clock-names = "master", "sleep", "mock_utmi";
> -			ranges;
> -			status = "disabled";
> -
> -			dwc3@6000000 {
> -				compatible = "snps,dwc3";
> -				reg = <0x6000000 0xf8000>;
> -				phys = <&usb2_hs_phy>;
> -				phy-names = "usb2-phy";
> -				dr_mode = "host";
> -				maximum-speed = "high-speed";
> -				snps,dis_u2_susphy_quirk;
> -			};
> -		};
> -	};
> -};

-- 
// Caleb (they/them)