Commit 0dfe186a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'integrator-dts-v5.3-arm-soc' of... 

Merge tag 'integrator-dts-v5.3-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into arm/dt

DTS updates for the Integrator, target kernel v5.3.

* tag 'integrator-dts-v5.3-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator

:
  ARM: dts: vexpress: specify AFS partition
  ARM: dts: realview: specify AFS partition
  ARM: dts: versatile: specify AFS partition
  ARM: dts: integrator: specify AFS partition

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9e0babf2 62a5017b

arch/arm/boot/dts/arm-realview-eb.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ 
		compatible = "arm,versatile-flash", "cfi-flash";

		reg = <0x40000000 0x04000000>;

		bank-width = <4>;

		partitions {

			compatible = "arm,arm-firmware-suite";

		};

	};



	flash1@44000000 {
@@ -126,6 +129,9 @@ 
		compatible = "arm,versatile-flash", "cfi-flash";

		reg = <0x44000000 0x04000000>;

		bank-width = <4>;

		partitions {

			compatible = "arm,arm-firmware-suite";

		};

	};



	/* SMSC LAN91C111 ethernet with PHY and EEPROM */

arch/arm/boot/dts/arm-realview-pb1176.dts

+6 −0
Original line number Diff line number Diff line
@@ -120,12 +120,18 @@ 
		compatible = "arm,versatile-flash", "cfi-flash";

		reg = <0x30000000 0x4000000>;

		bank-width = <4>;

		partitions {

			compatible = "arm,arm-firmware-suite";

		};

	};



	fpga_flash@38000000 {

		compatible = "arm,versatile-flash", "cfi-flash";

		reg = <0x38000000 0x800000>;

		bank-width = <4>;

		partitions {

			compatible = "arm,arm-firmware-suite";

		};

	};



	/*

arch/arm/boot/dts/arm-realview-pb11mp.dts

+6 −0
Original line number Diff line number Diff line
@@ -235,6 +235,9 @@ 
		compatible = "arm,versatile-flash", "cfi-flash";

		reg = <0x40000000 0x04000000>;

		bank-width = <4>;

		partitions {

			compatible = "arm,arm-firmware-suite";

		};

	};



	flash1@44000000 {
@@ -242,6 +245,9 @@ 
		compatible = "arm,versatile-flash", "cfi-flash";

		reg = <0x44000000 0x04000000>;

		bank-width = <4>;

		partitions {

			compatible = "arm,arm-firmware-suite";

		};

	};



	bridge {

arch/arm/boot/dts/arm-realview-pbx.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ 
		compatible = "arm,versatile-flash", "cfi-flash";

		reg = <0x40000000 0x04000000>;

		bank-width = <4>;

		partitions {

			compatible = "arm,arm-firmware-suite";

		};

	};



	flash1@44000000 {
@@ -141,6 +144,9 @@ 
		compatible = "arm,versatile-flash", "cfi-flash";

		reg = <0x44000000 0x04000000>;

		bank-width = <4>;

		partitions {

			compatible = "arm,arm-firmware-suite";

		};

	};



	/* SMSC 9118 ethernet with PHY and EEPROM */

arch/arm/boot/dts/integrator.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ 
		compatible = "arm,versatile-flash", "cfi-flash";

		reg = <0x24000000 0x02000000>;

		bank-width = <4>;

		partitions {

			compatible = "arm,arm-firmware-suite";

		};

	};



	fpga {

CRA Git | Maintained and supported by SUSTech CRA and CCSE