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

Commit d4bc63b1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

This are some DTS changes for the Ux500 for the v5.4 kernel cycle:

- Update the CoreSight blocks to use the latest and greatest
  bindings

- Push the thermal driver config down to the main SoC DTSI
  as it applies to all ASICs.

- Set a pull-up on the ST UIB right.

* tag 'ux500-dts-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: dts: ux500: set pull-up on STUIB STMPE IRQ line
  ARM: dts: ux500: Fix up the thermal nodes
  ARM: dts: ste: Update coresight DT bindings

Link: https://lore.kernel.org/r/CACRpkdbKX7a15SC-zwxmH_ygGzOKrn0h-pzzm22UpRcLRfRVNA@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents da5fbcb1 07523a6c

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

+23 −3
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
		};



		funnel@801a6000 {

			compatible = "arm,coresight-funnel", "arm,primecell";

			compatible = "arm,coresight-dynamic-funnel", "arm,primecell";

			reg = <0x801a6000 0x1000>;



			clocks = <&prcmu_clk PRCMU_APETRACECLK>, <&prcmu_clk PRCMU_APEATCLK>;
@@ -127,7 +127,7 @@ 
		};



		replicator {

			compatible = "arm,coresight-replicator";

			compatible = "arm,coresight-static-replicator";

			clocks = <&prcmu_clk PRCMU_APEATCLK>;

			clock-names = "atclk";
@@ -505,10 +505,30 @@ 
			thermal@801573c0 {

				compatible = "stericsson,db8500-thermal";

				reg = <0x801573c0 0x40>;

				interrupt-parent = <&prcmu>;

				interrupts = <21 IRQ_TYPE_LEVEL_HIGH>,

					     <22 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH";

				status = "disabled";

				num-trips = <4>;



				trip0-temp = <70000>;

				trip0-type = "active";

				trip0-cdev-num = <1>;

				trip0-cdev-name0 = "thermal-cpufreq-0";



				trip1-temp = <75000>;

				trip1-type = "active";

				trip1-cdev-num = <1>;

				trip1-cdev-name0 = "thermal-cpufreq-0";



				trip2-temp = <80000>;

				trip2-type = "active";

				trip2-cdev-num = <1>;

				trip2-cdev-name0 = "thermal-cpufreq-0";



				trip3-temp = <85000>;

				trip3-type = "critical";

				trip3-cdev-num = <0>;

			};



			db8500-prcmu-regulators {

arch/arm/boot/dts/ste-href-stuib.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
				interrupt-controller;

				vcc-supply = <&db8500_vsmps2_reg>;

				vio-supply = <&db8500_vsmps2_reg>;

				pinctrl-names = "default";

				pinctrl-0 = <&stmpe_stuib_mode>;



				wakeup-source;

				st,autosleep-timeout = <1024>;
@@ -126,6 +128,15 @@ 
		};



		pinctrl {

			/* Pull up this GPIO pin */

			stmpe {

				stmpe_stuib_mode: stmpe_stuib {

					stuib_cfg {

						ste,pins = "GPIO218_AH11";

						ste,config = <&gpio_in_pu>;

					};

				};

			};

			prox {

				prox_stuib_mode: prox_stuib {

					stuib_cfg {

arch/arm/boot/dts/ste-snowball.dts

+0 −29
Original line number Diff line number Diff line
@@ -376,40 +376,11 @@ 
			pinctrl-0 = <&ssp0_snowball_mode>;

		};



		cpufreq-cooling {

			status = "okay";

		};



		prcmu@80157000 {

			cpufreq {

				status = "okay";

			};



			thermal@801573c0 {

				num-trips = <4>;



				trip0-temp = <70000>;

				trip0-type = "active";

				trip0-cdev-num = <1>;

				trip0-cdev-name0 = "thermal-cpufreq-0";



				trip1-temp = <75000>;

				trip1-type = "active";

				trip1-cdev-num = <1>;

				trip1-cdev-name0 = "thermal-cpufreq-0";



				trip2-temp = <80000>;

				trip2-type = "active";

				trip2-cdev-num = <1>;

				trip2-cdev-name0 = "thermal-cpufreq-0";



				trip3-temp = <85000>;

				trip3-type = "critical";

				trip3-cdev-num = <0>;



				status = "okay";

			};



			ab8500 {

				ab8500-gpio {

					/*