Unverified Commit 4216cd95 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-5.18-2' of... 

Merge tag 'samsung-dt-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Samsung DTS ARM changes for v5.18, part two

Various cleanups after introducing DT schema: adding missing HDMI
supplies and aligning PPMU event node names with DT schema.

* tag 'samsung-dt-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: align PPMU event node names with dtschema
  ARM: dts: exynos: add missing HDMI supplies on SMDK5420
  ARM: dts: exynos: add missing HDMI supplies on SMDK5250

Link: https://lore.kernel.org/r/20220226220116.13452-1-krzysztof.kozlowski@canonical.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 664abe88 7cdfe3b3

arch/arm/boot/dts/exynos5250-smdk5250.dts

+3 −0
Original line number Diff line number Diff line
@@ -118,6 +118,9 @@ &hdmi { 
	status = "okay";

	ddc = <&i2c_2>;

	hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;

	vdd-supply = <&ldo8_reg>;

	vdd_osc-supply = <&ldo10_reg>;

	vdd_pll-supply = <&ldo8_reg>;

};



&i2c_0 {

arch/arm/boot/dts/exynos5420-smdk5420.dts

+3 −0
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ &hdmi { 
	hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_hpd_irq>;

	vdd-supply = <&ldo6_reg>;

	vdd_osc-supply = <&ldo7_reg>;

	vdd_pll-supply = <&ldo6_reg>;

};



&hsi2c_4 {

arch/arm/boot/dts/exynos5420.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -302,8 +302,8 @@ ppmu_dmc0_0: ppmu@10d00000 { 
			clocks = <&clock CLK_PCLK_PPMU_DREX0_0>;

			clock-names = "ppmu";

			events {

				ppmu_event3_dmc0_0: ppmu-event3-dmc0_0 {

					event-name = "ppmu-event3-dmc0_0";

				ppmu_event3_dmc0_0: ppmu-event3-dmc0-0 {

					event-name = "ppmu-event3-dmc0-0";

				};

			};

		};
@@ -314,8 +314,8 @@ ppmu_dmc0_1: ppmu@10d10000 { 
			clocks = <&clock CLK_PCLK_PPMU_DREX0_1>;

			clock-names = "ppmu";

			events {

				ppmu_event3_dmc0_1: ppmu-event3-dmc0_1 {

					event-name = "ppmu-event3-dmc0_1";

				ppmu_event3_dmc0_1: ppmu-event3-dmc0-1 {

					event-name = "ppmu-event3-dmc0-1";

				};

			};

		};
@@ -326,8 +326,8 @@ ppmu_dmc1_0: ppmu@10d60000 { 
			clocks = <&clock CLK_PCLK_PPMU_DREX1_0>;

			clock-names = "ppmu";

			events {

				ppmu_event3_dmc1_0: ppmu-event3-dmc1_0 {

					event-name = "ppmu-event3-dmc1_0";

				ppmu_event3_dmc1_0: ppmu-event3-dmc1-0 {

					event-name = "ppmu-event3-dmc1-0";

				};

			};

		};
@@ -338,8 +338,8 @@ ppmu_dmc1_1: ppmu@10d70000 { 
			clocks = <&clock CLK_PCLK_PPMU_DREX1_1>;

			clock-names = "ppmu";

			events {

				ppmu_event3_dmc1_1: ppmu-event3-dmc1_1 {

					event-name = "ppmu-event3-dmc1_1";

				ppmu_event3_dmc1_1: ppmu-event3-dmc1-1 {

					event-name = "ppmu-event3-dmc1-1";

				};

			};

		};