Unverified Commit 1e52d6c8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v6.2/dt-signed' of... 

Merge tag 'omap-for-v6.2/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into soc/dt

Devicetree fixes for omaps for v6.2

Two devicetree fixes for omaps. These fixes are not urgent and
can wait for the merge window:

- Fix up the node names and missing #pwm-cells property for
  ti,omap-dmtimer-pwm to avoid warnings when the the related
  yaml binding gets merged

- Fix TDA998x port addressing

* tag 'omap-for-v6.2/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Unify pwm-omap-dmtimer node names
  ARM: dts: am335x: Fix TDA998x ports addressing
  ARM: dts: am335x-pcm-953: Define fixed regulators in root node

Link: https://lore.kernel.org/r/pull-1669363695-856423@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents bcbc4685 4f15fc7c

arch/arm/boot/dts/am335x-boneblack-hdmi.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -85,8 +85,13 @@ tda19988: tda19988@70 { 
		audio-ports = <	TDA998x_I2S	0x03>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				hdmi_0: endpoint@0 {

				reg = <0>;



				hdmi_0: endpoint {

					remote-endpoint = <&lcdc_0>;

				};

			};

arch/arm/boot/dts/am335x-guardian.dts

+2 −1
Original line number Diff line number Diff line
@@ -103,8 +103,9 @@ panel-info { 


	};



	guardian_beeper: dmtimer-pwm@7 {

	guardian_beeper: pwm-7 {

		compatible = "ti,omap-dmtimer-pwm";

		#pwm-cells = <3>;

		ti,timers = <&timer7>;

		pinctrl-names = "default";

		pinctrl-0 = <&guardian_beeper_pins>;

arch/arm/boot/dts/am335x-myirtech-myd.dts

+6 −1
Original line number Diff line number Diff line
@@ -161,8 +161,13 @@ tda9988: tda9988@70 { 
		#sound-dai-cells = <0>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				hdmi_0: endpoint@0 {

				reg = <0>;



				hdmi_0: endpoint {

					remote-endpoint = <&lcdc_0>;

				};

			};

arch/arm/boot/dts/am335x-pcm-953.dtsi

+13 −15
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ / { 
	compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx";



	/* Power */

	regulators {

		vcc3v3: fixedregulator@1 {

	vcc3v3: fixedregulator1 {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3";

		regulator-min-microvolt = <3300000>;
@@ -21,14 +20,13 @@ vcc3v3: fixedregulator@1 { 
		regulator-boot-on;

	};



		vcc1v8: fixedregulator@2 {

	vcc1v8: fixedregulator2 {

		compatible = "regulator-fixed";

		regulator-name = "vcc1v8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-boot-on;

	};

	};



	/* User IO */

	user_leds: user_leds {

arch/arm/boot/dts/am3517-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ bl: backlight { 
		enable-gpios = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* gpio_182 */

	};



	pwm11: dmtimer-pwm@11 {

	pwm11: pwm-11 {

		compatible = "ti,omap-dmtimer-pwm";

		pinctrl-names = "default";

		pinctrl-0 = <&pwm_pins>;