[PATCH] ARM: socfpga: fix include after upstream DT reorganization

[PATCH] ARM: socfpga: fix include after upstream DT reorganization

[Ahmad Fatoum]

Upstream arm32 device trees are now organized by vendor and optionally SoC
family. Running:

  $ rg '[<"]arm/' arch/arm/dts/ | rg '[^:]+:[^/]+/[^/]+[">]'

shows that there is at least one device tree in the barebox tree, which was
not fixed up to use the new paths, so fix that one.

Fixes: 1f2570eb41c8 ("dts: update to v6.5-rc1")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/dts/socfpga_cyclone5_socdk.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts
index 0dfd5ebaed6e..ef1f9af9cf14 100644
--- a/arch/arm/dts/socfpga_cyclone5_socdk.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <arm/socfpga_cyclone5_socdk.dts>
+#include <arm/intel/socfpga/socfpga_cyclone5_socdk.dts>
 #include "socfpga.dtsi"
 
 / {
-- 
2.39.2

Re: [PATCH] ARM: socfpga: fix include after upstream DT reorganization

[Sascha Hauer]

On Fri, Aug 04, 2023 at 03:38:40PM +0200, Ahmad Fatoum wrote:
> Upstream arm32 device trees are now organized by vendor and optionally SoC
> family. Running:
> 
>   $ rg '[<"]arm/' arch/arm/dts/ | rg '[^:]+:[^/]+/[^/]+[">]'
> 
> shows that there is at least one device tree in the barebox tree, which was
> not fixed up to use the new paths, so fix that one.
> 
> Fixes: 1f2570eb41c8 ("dts: update to v6.5-rc1")
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  arch/arm/dts/socfpga_cyclone5_socdk.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

> 
> diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts
> index 0dfd5ebaed6e..ef1f9af9cf14 100644
> --- a/arch/arm/dts/socfpga_cyclone5_socdk.dts
> +++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts
> @@ -15,7 +15,7 @@
>   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
>   */
>  
> -#include <arm/socfpga_cyclone5_socdk.dts>
> +#include <arm/intel/socfpga/socfpga_cyclone5_socdk.dts>

This one slipped through the cracks because I only fixed up until
MAKEALL was happy and this board is not enabled in any defconfig. I just
sent a patch to enable the remaining SoCFPGA boards in
socfpga_defconfig.

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |