Unverified Commit 1133ae11 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mtk-dts64-fixes-for-6.7' of... 

Merge tag 'mtk-dts64-fixes-for-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into arm/fixes

MediaTek ARM64 DeviceTree fixes for v6.7

Fixes for various MediaTek SoCs, including

MT7986: - eMMC HS400 mode failures
        - Cooling trips for emergency system shutdown
        - BPI-R3 machine SFP power limit and active cooling

MT8173: - EVB device tree unit_address_vs_reg warning

MT8183: - unit_address_vs_reg and simple_bus_reg warnings
        - Kukui device tree nodes naming consistency and
          adhering to bindings
        - Jacuzzi device tree unnecessary cells removed as
          those were producing avoid_unnecessary_addr_size

MT8186: - Power domains faults due to incorrect clocks
        - GPU speed bin nvmem cell name was wrong, producing
          issues with interpreting the speedbin with GPU OPPs

MT8195: - Local Arbiter (and whole system) ability to suspend
        - Cherry device tree interrupts_property warning

...and another unit_address_vs_reg warning on MT7622.

* tag 'mtk-dts64-fixes-for-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux:
  arm64: dts: mediatek: cherry: Fix interrupt cells for MT6360 on I2C7
  arm64: dts: mediatek: mt8183-kukui-jacuzzi: fix dsi unnecessary cells properties
  arm64: dts: mediatek: mt7622: fix memory node warning check
  arm64: dts: mediatek: mt8186: fix clock names for power domains
  arm64: dts: mediatek: mt8186: Change gpu speedbin nvmem cell name
  arm64: dts: mt7986: change cooling trips
  arm64: dts: mt7986: define 3W max power to both SFP on BPI-R3
  arm64: dts: mt7986: fix emmc hs400 mode without uboot initialization
  arm64: dts: mt8183: kukui: Fix underscores in node names
  arm64: dts: mediatek: mt8183: Move thermal-zones to the root node
  arm64: dts: mediatek: mt8173-evb: Fix regulator-fixed node names
  arm64: dts: mediatek: mt8183-evb: Fix unit_address_vs_reg warning on ntc
  arm64: dts: mediatek: mt8183: Fix unit address for scp reserved memory
  arm64: dts: mediatek: mt8195: Fix PM suspend/resume with venc clocks

Link: https://lore.kernel.org/r/20231129113905.134732-1-angelogioacchino.delregno@collabora.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9c7f01d5 5943b8f7

arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ led-1 { 
		};

	};



	memory {

	memory@40000000 {

		reg = <0 0x40000000 0 0x40000000>;

	};

arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ key-wps { 
		};

	};



	memory {

	memory@40000000 {

		reg = <0 0x40000000 0 0x20000000>;

	};

arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts

+7 −5
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ sfp1: sfp-1 { 
		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp1>;

		los-gpios = <&pio 46 GPIO_ACTIVE_HIGH>;

		maximum-power-milliwatt = <3000>;

		mod-def0-gpios = <&pio 49 GPIO_ACTIVE_LOW>;

		tx-disable-gpios = <&pio 20 GPIO_ACTIVE_HIGH>;

		tx-fault-gpios = <&pio 7 GPIO_ACTIVE_HIGH>;
@@ -137,6 +138,7 @@ sfp2: sfp-2 { 
		i2c-bus = <&i2c_sfp2>;

		los-gpios = <&pio 31 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&pio 47 GPIO_ACTIVE_LOW>;

		maximum-power-milliwatt = <3000>;

		tx-disable-gpios = <&pio 15 GPIO_ACTIVE_HIGH>;

		tx-fault-gpios = <&pio 48 GPIO_ACTIVE_HIGH>;

	};
@@ -150,16 +152,16 @@ cpu-active-high { 
			trip = <&cpu_trip_active_high>;

		};



		cpu-active-low {

		cpu-active-med {

			/* active: set fan to cooling level 1 */

			cooling-device = <&fan 1 1>;

			trip = <&cpu_trip_active_low>;

			trip = <&cpu_trip_active_med>;

		};



		cpu-passive {

			/* passive: set fan to cooling level 0 */

		cpu-active-low {

			/* active: set fan to cooling level 0 */

			cooling-device = <&fan 0 0>;

			trip = <&cpu_trip_passive>;

			trip = <&cpu_trip_active_low>;

		};

	};

};

arch/arm64/boot/dts/mediatek/mt7986a.dtsi

+20 −4
Original line number Diff line number Diff line
@@ -374,6 +374,10 @@ mmc0: mmc@11230000 { 
			reg = <0 0x11230000 0 0x1000>,

			      <0 0x11c20000 0 0x1000>;

			interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;

			assigned-clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,

					  <&topckgen CLK_TOP_EMMC_250M_SEL>;

			assigned-clock-parents = <&apmixedsys CLK_APMIXED_MPLL>,

						 <&topckgen CLK_TOP_NET1PLL_D5_D2>;

			clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,

				 <&infracfg CLK_INFRA_MSDC_HCK_CK>,

				 <&infracfg CLK_INFRA_MSDC_CK>,
@@ -610,22 +614,34 @@ cpu_thermal: cpu-thermal { 
			thermal-sensors = <&thermal 0>;



			trips {

				cpu_trip_crit: crit {

					temperature = <125000>;

					hysteresis = <2000>;

					type = "critical";

				};



				cpu_trip_hot: hot {

					temperature = <120000>;

					hysteresis = <2000>;

					type = "hot";

				};



				cpu_trip_active_high: active-high {

					temperature = <115000>;

					hysteresis = <2000>;

					type = "active";

				};



				cpu_trip_active_low: active-low {

				cpu_trip_active_med: active-med {

					temperature = <85000>;

					hysteresis = <2000>;

					type = "active";

				};



				cpu_trip_passive: passive {

					temperature = <40000>;

				cpu_trip_active_low: active-low {

					temperature = <60000>;

					hysteresis = <2000>;

					type = "passive";

					type = "active";

				};

			};

		};

arch/arm64/boot/dts/mediatek/mt8173-evb.dts

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ extcon_usb: extcon_iddig { 
		id-gpio = <&pio 16 GPIO_ACTIVE_HIGH>;

	};



	usb_p1_vbus: regulator@0 {

	usb_p1_vbus: regulator-usb-p1 {

		compatible = "regulator-fixed";

		regulator-name = "usb_vbus";

		regulator-min-microvolt = <5000000>;
@@ -53,7 +53,7 @@ usb_p1_vbus: regulator@0 { 
		enable-active-high;

	};



	usb_p0_vbus: regulator@1 {

	usb_p0_vbus: regulator-usb-p0 {

		compatible = "regulator-fixed";

		regulator-name = "vbus";

		regulator-min-microvolt = <5000000>;