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

Commit 171b1185 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'juno-updates-4.18' of... 

Merge tag 'juno-updates-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/dt

ARMv8 Juno/Vexpress updates/cleanups for v4.18

1. Add the missing connections to the STM output port as all endpoint
   connections must be bidirectional.

2. Replace all the custom OF graph endpoint node names with the standard
   'endpoint'

3. Cleanup to replace all underscores('_') with hyphens('-') in the
   device node names

4. Syntactic restructuring of motherboard include file so that it can be
   included at the top of any other DTS file as it should be rather than
   existing include in the middle of the file at a specific location

* tag 'juno-updates-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux

:
  arm64: dts: juno/rtsm: re-structure motherboard includes
  arm64: dts: juno: replace '_' with '-' in node names
  arm64: dts: juno: Fix "debounce-interval" property misspelling
  arm64: dts: juno: fix OF graph endpoint node names
  arm64: dts: juno: fix missing Coresight STM graph connection

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 23fe7cb6 349b0f95

arch/arm64/boot/dts/arm/juno-base.dtsi

+7 −8
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include "juno-clocks.dtsi"

#include "juno-motherboard.dtsi"



/ {

	/*
@@ -572,14 +573,14 @@ 
			thermal-sensors = <&scpi_sensors0 3>;

		};



		big_cluster_thermal_zone: big_cluster {

		big_cluster_thermal_zone: big-cluster {

			polling-delay = <1000>;

			polling-delay-passive = <100>;

			thermal-sensors = <&scpi_sensors0 21>;

			status = "disabled";

		};



		little_cluster_thermal_zone: little_cluster {

		little_cluster_thermal_zone: little-cluster {

			polling-delay = <1000>;

			polling-delay-passive = <100>;

			thermal-sensors = <&scpi_sensors0 22>;
@@ -677,7 +678,7 @@ 
		clock-names = "pxlclk";



		port {

			hdlcd1_output: hdlcd1-endpoint {

			hdlcd1_output: endpoint {

				remote-endpoint = <&tda998x_1_input>;

			};

		};
@@ -692,7 +693,7 @@ 
		clock-names = "pxlclk";



		port {

			hdlcd0_output: hdlcd0-endpoint {

			hdlcd0_output: endpoint {

				remote-endpoint = <&tda998x_0_input>;

			};

		};
@@ -720,7 +721,7 @@ 
			compatible = "nxp,tda998x";

			reg = <0x70>;

			port {

				tda998x_0_input: tda998x-0-endpoint {

				tda998x_0_input: endpoint {

					remote-endpoint = <&hdlcd0_output>;

				};

			};
@@ -730,7 +731,7 @@ 
			compatible = "nxp,tda998x";

			reg = <0x71>;

			port {

				tda998x_1_input: tda998x-1-endpoint {

				tda998x_1_input: endpoint {

					remote-endpoint = <&hdlcd1_output>;

				};

			};
@@ -795,8 +796,6 @@ 
				<0 0 10 &gic 0 0 0 167 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 11 &gic 0 0 0 168 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 12 &gic 0 0 0 169 IRQ_TYPE_LEVEL_HIGH>;



		/include/ "juno-motherboard.dtsi"

	};



	site2: tlx@60000000 {

arch/arm64/boot/dts/arm/juno-motherboard.dtsi

+11 −7
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 *

 */



/ {

	smb@8000000 {

		mb_clk24mhz: clk24mhz {

			compatible = "fixed-clock";

			#clock-cells = <0>;
@@ -54,46 +56,46 @@ 
				regulator-always-on;

			};



			gpio_keys {

			gpio-keys {

				compatible = "gpio-keys";



				power-button {

					debounce_interval = <50>;

					debounce-interval = <50>;

					wakeup-source;

					linux,code = <116>;

					label = "POWER";

					gpios = <&iofpga_gpio0 0 0x4>;

				};

				home-button {

					debounce_interval = <50>;

					debounce-interval = <50>;

					wakeup-source;

					linux,code = <102>;

					label = "HOME";

					gpios = <&iofpga_gpio0 1 0x4>;

				};

				rlock-button {

					debounce_interval = <50>;

					debounce-interval = <50>;

					wakeup-source;

					linux,code = <152>;

					label = "RLOCK";

					gpios = <&iofpga_gpio0 2 0x4>;

				};

				vol-up-button {

					debounce_interval = <50>;

					debounce-interval = <50>;

					wakeup-source;

					linux,code = <115>;

					label = "VOL+";

					gpios = <&iofpga_gpio0 3 0x4>;

				};

				vol-down-button {

					debounce_interval = <50>;

					debounce-interval = <50>;

					wakeup-source;

					linux,code = <114>;

					label = "VOL-";

					gpios = <&iofpga_gpio0 4 0x4>;

				};

				nmi-button {

					debounce_interval = <50>;

					debounce-interval = <50>;

					wakeup-source;

					linux,code = <99>;

					label = "NMI";
@@ -287,3 +289,5 @@ 
				};

			};

		};

	};

};

arch/arm64/boot/dts/arm/juno-r1.dts

+6 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ 
		};

	};



	pmu_a57 {

	pmu-a57 {

		compatible = "arm,cortex-a57-pmu";

		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
@@ -209,7 +209,7 @@ 
				     <&A57_1>;

	};



	pmu_a53 {

	pmu-a53 {

		compatible = "arm,cortex-a53-pmu";

		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
@@ -278,6 +278,10 @@ 
	remote-endpoint = <&csys2_funnel_out_port>;

};



&csys1_funnel_in_port0 {

	remote-endpoint = <&stm_out_port>;

};



&stm_out_port {

	remote-endpoint = <&csys1_funnel_in_port0>;

};

arch/arm64/boot/dts/arm/juno-r2.dts

+6 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ 
		};

	};



	pmu_a72 {

	pmu-a72 {

		compatible = "arm,cortex-a72-pmu";

		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
@@ -209,7 +209,7 @@ 
				     <&A72_1>;

	};



	pmu_a53 {

	pmu-a53 {

		compatible = "arm,cortex-a53-pmu";

		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
@@ -278,6 +278,10 @@ 
	remote-endpoint = <&csys2_funnel_out_port>;

};



&csys1_funnel_in_port0 {

	remote-endpoint = <&stm_out_port>;

};



&stm_out_port {

	remote-endpoint = <&csys1_funnel_in_port0>;

};

arch/arm64/boot/dts/arm/juno.dts

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ 
		};

	};



	pmu_a57 {

	pmu-a57 {

		compatible = "arm,cortex-a57-pmu";

		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
@@ -208,7 +208,7 @@ 
				     <&A57_1>;

	};



	pmu_a53 {

	pmu-a53 {

		compatible = "arm,cortex-a53-pmu";

		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,