Unverified Commit 97736c2e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ux500-dts-v5.19' of... 

Merge tag 'ux500-dts-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt

Ux500 DTS updates for the v5.19 kernel cycle:

- New devicetree for Codina TMO (SGH-T599).

- Add the Amastaos proximity sensor to the Codina.

- Add line impedance per machine to the Fuel Gauge
  nodes.

- Add GPS to Janice, Skomer and Codina.

- Add NFC to the Codina for GT-I8160P.

- Some janitorial like clock names.

* tag 'ux500-dts-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: ux500: Add GPS to the Codina
  ARM: dts: ux500: Add NFC to the Codina
  ARM: dts: ux500: Add GPS to Skomer device tree
  ARM: dts: ux500: Add GPS to Janice device tree
  ARM: dts: ux500: Add line impedance to fuel gauge
  ARM: dts: ux500: Register Amstaos proximity sensor
  ARM: dts: ux500: Add Codina TMO device tree
  dt-bindings: arm: ux500: Document Codina-TMO
  ARM: dts: ste-dbx: Update spi clock-names property

Link: https://lore.kernel.org/r/CACRpkdYngWscqak5phKm58O2GF0RmVETgwW4NCKTBiASdaEcyg@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents cbc842c2 49148f4c

Documentation/devicetree/bindings/arm/ux500.yaml

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ properties: 
          - const: samsung,codina

          - const: st-ericsson,u8500



      - description: Samsung Galaxy Exhibit (SGH-T599)

        items:

          - const: samsung,codina-tmo

          - const: st-ericsson,u8500



      - description: Samsung Galaxy Beam (GT-I8530)

        items:

          - const: samsung,gavini

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1382,6 +1382,7 @@ dtb-$(CONFIG_ARCH_U8500) += \ 
	ste-ux500-samsung-janice.dtb \

	ste-ux500-samsung-gavini.dtb \

	ste-ux500-samsung-codina.dtb \

	ste-ux500-samsung-codina-tmo.dtb \

	ste-ux500-samsung-skomer.dtb \

	ste-ux500-samsung-kyle.dtb

dtb-$(CONFIG_ARCH_UNIPHIER) += \

arch/arm/boot/dts/ste-dbx5x0.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -755,7 +755,7 @@ ssp0: spi@80002000 { 
			#address-cells = <1>;

			#size-cells = <0>;

			clocks = <&prcc_kclk 3 1>, <&prcc_pclk 3 1>;

			clock-names = "SSPCLK", "apb_pclk";

			clock-names = "sspclk", "apb_pclk";

			dmas = <&dma 8 0 0x2>, /* Logical - DevToMem */

			       <&dma 8 0 0x0>; /* Logical - MemToDev */

			dma-names = "rx", "tx";
@@ -772,7 +772,7 @@ ssp1: spi@80003000 { 
			#address-cells = <1>;

			#size-cells = <0>;

			clocks = <&prcc_kclk 3 2>, <&prcc_pclk 3 2>;

			clock-names = "SSPCLK", "apb_pclk";

			clock-names = "sspclk", "apb_pclk";

			dmas = <&dma 9 0 0x2>, /* Logical - DevToMem */

			       <&dma 9 0 0x0>; /* Logical - MemToDev */

			dma-names = "rx", "tx";
@@ -790,7 +790,7 @@ spi0: spi@8011a000 { 
			#size-cells = <0>;

			/* Same clock wired to kernel and pclk */

			clocks = <&prcc_pclk 2 8>, <&prcc_pclk 2 8>;

			clock-names = "SSPCLK", "apb_pclk";

			clock-names = "sspclk", "apb_pclk";

			dmas = <&dma 0 0 0x2>, /* Logical - DevToMem */

			       <&dma 0 0 0x0>; /* Logical - MemToDev */

			dma-names = "rx", "tx";
@@ -807,7 +807,7 @@ spi1: spi@80112000 { 
			#size-cells = <0>;

			/* Same clock wired to kernel and pclk */

			clocks = <&prcc_pclk 2 2>, <&prcc_pclk 2 2>;

			clock-names = "SSPCLK", "apb_pclk";

			clock-names = "sspclk", "apb_pclk";

			dmas = <&dma 35 0 0x2>, /* Logical - DevToMem */

			       <&dma 35 0 0x0>; /* Logical - MemToDev */

			dma-names = "rx", "tx";
@@ -824,7 +824,7 @@ spi2: spi@80111000 { 
			#size-cells = <0>;

			/* Same clock wired to kernel and pclk */

			clocks = <&prcc_pclk 2 1>, <&prcc_pclk 2 1>;

			clock-names = "SSPCLK", "apb_pclk";

			clock-names = "sspclk", "apb_pclk";

			dmas = <&dma 33 0 0x2>, /* Logical - DevToMem */

			       <&dma 33 0 0x0>; /* Logical - MemToDev */

			dma-names = "rx", "tx";
@@ -841,7 +841,7 @@ spi3: spi@80129000 { 
			#size-cells = <0>;

			/* Same clock wired to kernel and pclk */

			clocks = <&prcc_pclk 1 7>, <&prcc_pclk 1 7>;

			clock-names = "SSPCLK", "apb_pclk";

			clock-names = "sspclk", "apb_pclk";

			dmas = <&dma 40 0 0x2>, /* Logical - DevToMem */

			       <&dma 40 0 0x0>; /* Logical - MemToDev */

			dma-names = "rx", "tx";

arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts

0 → 100644
+785 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/ste-ux500-samsung-codina.dts

+70 −10

File changed.

Preview size limit exceeded, changes collapsed.