Unverified Commit 72ee3b4d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ux500-dts-v5.15-1' of... 

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

Ux500 Device Tree updates for the v5.15 kernel cycle:

- New device trees for these mobile phones:
  - Samsung Gavini
  - Samsung Codina
  - Samsung Kyle
- Flag eMMC cards as non-SD non-SDIO to save time
- Link USB PHY to USB controller in the device tree
- Fix up the operating points to the actual clock frequencies

* tag 'ux500-dts-v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: ux500: Adjust operating points to reality
  ARM: dts: ux500: Add a device tree for Kyle
  ARM: dts: ux500: Add devicetree for Codina
  ARM: dts: ux500: ab8500: Link USB PHY to USB controller node
  ARM: dts: ux500: Flag eMMCs as non-SDIO/SD
  ARM: dts: ux500: Add device tree for Samsung Gavini

Link: https://lore.kernel.org/r/CACRpkdbjBv5ywZZD8rK07d5sLcHsG8o4iYD-3jHO=HLg6-nKnA@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c4994975 fe2fc0fd

arch/arm/boot/dts/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -1300,7 +1300,10 @@ dtb-$(CONFIG_ARCH_U8500) += \ 
	ste-href520-tvk.dtb \

	ste-ux500-samsung-golden.dtb \

	ste-ux500-samsung-janice.dtb \

	ste-ux500-samsung-skomer.dtb

	ste-ux500-samsung-gavini.dtb \

	ste-ux500-samsung-codina.dtb \

	ste-ux500-samsung-skomer.dtb \

	ste-ux500-samsung-kyle.dtb

dtb-$(CONFIG_ARCH_UNIPHIER) += \

	uniphier-ld4-ref.dtb \

	uniphier-ld6b-ref.dtb \

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

+7 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ 
					battery		= <&ab8500_battery>;

				};



				ab8500_usb {

				ab8500_usb: ab8500_usb {

					compatible = "stericsson,ab8500-usb";

					interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,

						     <96 IRQ_TYPE_LEVEL_HIGH>,
@@ -238,6 +238,7 @@ 
					musb_1v8-supply = <&db8500_vsmps2_reg>;

					clocks = <&prcmu_clk PRCMU_SYSCLK>;

					clock-names = "sysclk";

					#phy-cells = <0>;

				};



				ab8500-ponkey {
@@ -386,5 +387,10 @@ 
				vana-supply = <&ab8500_ldo_ana_reg>;

			};

		};



		usb_per5@a03e0000 {

			phys = <&ab8500_usb>;

			phy-names = "usb";

		};

	};

};

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

+6 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ 
					musb_1v8-supply = <&db8500_vsmps2_reg>;

					clocks = <&prcmu_clk PRCMU_SYSCLK>;

					clock-names = "sysclk";

					#phy-cells = <0>;

				};



				ab8500-ponkey {
@@ -322,5 +323,10 @@ 
				vana-supply = <&ab8500_ldo_ana_reg>;

			};

		};



		usb_per5@a03e0000 {

			phys = <&ab8500_usb>;

			phy-names = "usb";

		};

	};

};

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

+3 −4
Original line number Diff line number Diff line
@@ -5,11 +5,10 @@ 
/ {

	cpus {

		cpu@300 {

			/* cpufreq controls */

			operating-points = <998400 0

					    800000 0

					    400000 0

					    200000 0>;

					    798720 0

					    399360 0

					    199680 0>;

		};

	};

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

+3 −4
Original line number Diff line number Diff line
@@ -5,11 +5,10 @@ 
/ {

	cpus {

		cpu@300 {

			/* cpufreq controls */

			operating-points = <1152000 0

					    800000 0

					    400000 0

					    200000 0>;

					    798720 0

					    399360 0

					    199680 0>;

		};

	};