Commit f75ff2c7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v5.9-next-dts64' of... 

Merge tag 'v5.9-next-dts64' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt

mt8173:
- make nor flash work
- fix da9211 regulator modes

mt8183:
- add support for system companion processor

mt8516:
- set reset gpio for gpio expander in pumpkin board

* tag 'v5.9-next-dts64' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  arm64: dts: mt8183: update watchdog device node
  arm64: dts: mt8173: elm: Fix nor_flash node property
  arm64: dts: mediatek: fix tca6416 reset GPIOs in pumpkin
  arm64: dts: mt8183: add scp node
  arm64: dts: mt8173-elm: fix supported values for regulator-allowed-modes of da9211

Link: https://lore.kernel.org/r/1580bc76-b05a-ad29-1854-d2aca657c775@gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9289beb8 f866c471

arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi

+5 −4
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <dt-bindings/input/input.h>

#include <dt-bindings/input/linux-event-codes.h>

#include <dt-bindings/regulator/dlg,da9211-regulator.h>

#include <dt-bindings/gpio/gpio.h>

#include "mt8173.dtsi"
@@ -294,7 +295,8 @@ 
				regulator-max-microamp  = <4400000>;

				regulator-ramp-delay = <10000>;

				regulator-always-on;

				regulator-allowed-modes = <0 1>;

				regulator-allowed-modes = <DA9211_BUCK_MODE_SYNC

							   DA9211_BUCK_MODE_AUTO>;

			};



			da9211_vgpu_reg: BUCKB {
@@ -431,12 +433,11 @@ 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&nor_gpio1_pins>;

	bus-width = <8>;

	max-frequency = <50000000>;

	non-removable;



	flash@0 {

		compatible = "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <50000000>;

	};

};

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

+11 −0
Original line number Diff line number Diff line
@@ -25,6 +25,17 @@ 
	chosen {

		stdout-path = "serial0:921600n8";

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;

		scp_mem_reserved: scp_mem_region {

			compatible = "shared-dma-pool";

			reg = <0 0x50000000 0 0x2900000>;

			no-map;

		};

	};

};



&auxadc {

arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi

+30 −0
Original line number Diff line number Diff line
@@ -90,6 +90,18 @@ 
		regulator-max-microvolt = <3300000>;

	};



	reserved_memory: reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		scp_mem_reserved: scp_mem_region {

			compatible = "shared-dma-pool";

			reg = <0 0x50000000 0 0x2900000>;

			no-map;

		};

	};



	max98357a: codec0 {

		compatible = "maxim,max98357a";

		sdmode-gpios = <&pio 175 0>;
@@ -524,6 +536,13 @@ 
		};

	};



	scp_pins: scp {

		pins_scp_uart {

			pinmux = <PINMUX_GPIO110__FUNC_TP_URXD1_AO>,

				 <PINMUX_GPIO112__FUNC_TP_UTXD1_AO>;

		};

	};



	spi0_pins: spi0 {

		pins_spi{

			pinmux = <PINMUX_GPIO85__FUNC_SPI0_MI>,
@@ -651,6 +670,17 @@ 
	};

};



&scp {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&scp_pins>;



	cros_ec {

		compatible = "google,cros-ec-rpmsg";

		mtk,rpmsg-name = "cros-ec-rpmsg";

	};

};



&soc_data {

	status = "okay";

};

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

+13 −2
Original line number Diff line number Diff line
@@ -317,8 +317,7 @@ 
		};



		watchdog: watchdog@10007000 {

			compatible = "mediatek,mt8183-wdt",

				     "mediatek,mt6589-wdt";

			compatible = "mediatek,mt8183-wdt";

			reg = <0 0x10007000 0 0x100>;

			#reset-cells = <1>;

		};
@@ -339,6 +338,18 @@ 
			clock-names = "spi", "wrap";

		};



		scp: scp@10500000 {

			compatible = "mediatek,mt8183-scp";

			reg = <0 0x10500000 0 0x80000>,

			      <0 0x105c0000 0 0x19080>;

			reg-names = "sram", "cfg";

			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&infracfg CLK_INFRA_SCPSYS>;

			clock-names = "main";

			memory-region = <&scp_mem_reserved>;

			status = "disabled";

		};



		systimer: timer@10017000 {

			compatible = "mediatek,mt8183-timer",

				     "mediatek,mt6765-timer";

arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
	tca6416: gpio@20 {

		compatible = "ti,tca6416";

		reg = <0x20>;

		rst-gpio = <&pio 65 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&pio 65 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&tca6416_pins>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE