- 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
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCAA1FiEEUdvKHhzqrUYPB/u8L21+TfbCqH4FAl9uC+IXHG1hdHRoaWFz
 LmJnZ0BnbWFpbC5jb20ACgkQL21+TfbCqH7c3w/+L6fmP/VXGl89AN7JG3J+45yo
 WCyjT+JnQIOvI38o6ueGet/I5M6uFNC3wLM9VKa3/9Jj8fxJuSpQQzxBojwKwEHG
 hqBUVlhC12WdHLtf15fulwmkuXOi731NbnRW6/lBWZ2dW8ZNqxRu7T5kRGuWgokk
 Uoo38SI81xFBaOBkYZy4S+MEZIWFsvD4wxehJKkb+yT+IRXEYUA8zGbzznLKnojQ
 XUMuGaoB6uJiW2dme19pwj0AeG/maYuD6XkOEqY6YHaF7GCY9dk+xBiys581M5wn
 2/XpLoZu1jPQkPOlylwl5zc0TbVbZuqpESOVoCotSz+tO6OekNQQ8gouGzGjRU45
 fZtVKI9M8hl4NKldtnPoqykGLnfgveFNu0Kz0sQ8t47JWP4y/lKnusRxsWptWpe/
 RlKPHq/Hkg7yMEXsQoiOwGy4gOe5+2p29H4G/GcsRjY0fEaqs8s9mtwaYTzc4Wi6
 TsI0FTudmp9BenCKLmctt3Cbp5VASN+pXMfZm5mXudC1CloLxMqDw5Ny0duKvxJ0
 innCl38E4UpmTPBjsxdJ3UU7gJJjMwZas8oKsBkNBP7xbEKA1EqfX37Pg3TUBGJf
 sSY+UYWfhkYNtqSTXj/7uRvo1YRD3LZbt0QBNtDok3BxbExv695AWe3rRkKSkmiU
 tYYVlX0N76LXsJ3sCSk=
 =hAPZ
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2020-09-26 10:23:57 -07:00
Родитель 9289beb8eb f866c47154
Коммит f75ff2c7bc
5 изменённых файлов: 60 добавлений и 7 удалений

Просмотреть файл

@ -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>;
};
};

Просмотреть файл

@ -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 {

Просмотреть файл

@ -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";
};

Просмотреть файл

@ -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";

Просмотреть файл

@ -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>;