Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 189e542b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-ab-4.17-dt' of... 

Merge tag 'at91-ab-4.17-dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

Pull "AT91 DT for 4.17" from Alexandre Belloni:

Not much this cycle, mainly changes on the Axentia boards from Peter and
a cleanup from Bartosz:

 - use 'atmel' as at24 manufacturer
 - device addition and fixes for axentia boards
 - fix sama5d4 pinctrl compatible

* tag 'at91-ab-4.17-dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91: use 'atmel' as at24 manufacturer for at91sam9263ek
  ARM: dts: at91: use 'atmel' as at24 manufacturer for at91-sama5d2_ptc_ek
  ARM: dts: at91: use 'atmel' as at24 manufacturer for at91sam9g20ek
  ARM: dts: at91: use 'atmel' as at24 manufacturer for at91sam9260ek
  ARM: dts: at91: use 'atmel' as at24 manufacturer for sama5d34ek
  ARM: dts: at91: sama5d4: fix pinctrl compatible string
  ARM: dts: at91: tse850: make the sound dai cell count explicit
  ARM: dts: at91: nattis: add lvds-encoder
  ARM: dts: at91: nattis: use up-to-date mtd partitions
  ARM: dts: at91: tse850: use the correct compatible for the eeprom
  ARM: dts: at91: nattis: use the correct compatible for the eeprom
  ARM: dts: at91: sam9rl: Properly assign copyright
parents 9f07438d 6fa65edf

arch/arm/boot/dts/at91-nattis-2-natte-2.dts

+45 −15
Original line number Diff line number Diff line
@@ -109,7 +109,32 @@ 


		port {

			panel_input: endpoint {

				remote-endpoint = <&hlcdc_panel_output>;

				remote-endpoint = <&lvds_encoder_output>;

			};

		};

	};



	lvds-encoder {

		compatible = "lvds-encoder";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;



				lvds_encoder_input: endpoint {

					remote-endpoint = <&hlcdc_output>;

				};

			};



			port@1 {

				reg = <1>;



				lvds_encoder_output: endpoint {

					remote-endpoint = <&panel_input>;

				};

			};

		};

	};
@@ -146,7 +171,7 @@ 
	};



	eeprom@50 {

		compatible = "nxp,24c02";

		compatible = "nxp,se97b", "atmel,24c02";

		reg = <0x50>;

		pagesize = <16>;

	};
@@ -176,8 +201,8 @@ 
			     &pinctrl_lcd_hipow0>;



		port@0 {

			hlcdc_panel_output: endpoint {

				remote-endpoint = <&panel_input>;

			hlcdc_output: endpoint {

				remote-endpoint = <&lvds_encoder_input>;

			};

		};

	};
@@ -216,29 +241,34 @@ 
			reg = <0x0 0x40000>;

		};



		bootloader@40000 {

			label = "bootloader";

			reg = <0x40000 0x80000>;

		barebox@40000 {

			label = "barebox";

			reg = <0x40000 0x60000>;

		};



		bareboxenv@c0000 {

			label = "bareboxenv";

			reg = <0xc0000 0x40000>;

		};



		bootloaderenv@c0000 {

			label = "bootloader env";

			reg = <0xc0000 0xc0000>;

		bareboxenv2@100000 {

			label = "bareboxenv2";

			reg = <0x100000 0x40000>;

		};



		dtb@180000 {

			label = "device tree";

			reg = <0x180000 0x80000>;

		oftree@180000 {

			label = "oftree";

			reg = <0x180000 0x20000>;

		};



		kernel@200000 {

			label = "kernel";

			reg = <0x200000 0x600000>;

			reg = <0x200000 0x500000>;

		};



		rootfs@800000 {

			label = "rootfs";

			reg = <0x800000 0x0f800000>;

			reg = <0x800000 0x1f800000>;

		};

	};

};

arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ 
				status = "okay";



				at24@50 {

					compatible = "24c02";

					compatible = "atmel,24c02";

					reg = <0x50>;

					pagesize = <8>;

				};

arch/arm/boot/dts/at91-tse850-3.dts

+2 −1
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ 
		compatible = "ti,pcm5142";



		reg = <0x4c>;

		#sound-dai-cells = <0>;



		AVDD-supply = <&reg_3v3>;

		DVDD-supply = <&reg_3v3>;
@@ -246,7 +247,7 @@ 
	};



	eeprom@50 {

		compatible = "nxp,24c02", "atmel,24c02";

		compatible = "nxp,se97b", "atmel,24c02";

		reg = <0x50>;

		pagesize = <16>;

	};

arch/arm/boot/dts/at91sam9260ek.dts

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ 
		status = "okay";



		24c512@50 {

			compatible = "24c512";

			compatible = "atmel,24c512";

			reg = <0x50>;

		};

	};

arch/arm/boot/dts/at91sam9263ek.dts

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ 
		status = "okay";



		24c512@50 {

			compatible = "24c512";

			compatible = "atmel,24c512";

			reg = <0x50>;

			pagesize = <128>;

		};