github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 09:04:39 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Amlogic ARM64 DT changes for v5.20:

Browse Source 
- adjust whitespace around '='
 - add reset controller node for Meson-S4 SoC
 - correct gpio-keys properties
 - align gpio-key node names with dtschema
 - add gpio-fan control to GS-King-X
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmK+qnUACgkQd9zb2sjI
 SdFm8hAAy8IT111BKYwvzrSJtwgC7cYrPZAtsG6WFpHtKDY6qCO769dPFEhFzngU
 X29zVL08jrpMfyof/X64/pIrTRVXw9erHYiQg7CDwkPnJxQTcXt6OfQJuOIBHQ+/
 BajM8ZW/SBu2ADb0HEhLBAbisveeIOOc/Rw/N42V+yF4CYwlvNGLRwF6yxotXl/j
 lWrBn0hVque4yODfg0XLTo+7fZ1XDiDDzAMwV0NP5DRAXfZtz3f4DaVu+clF1BvC
 evfuIk7O0zWL5WN9JWsUud9SO6nHPg8X36K0GL+KHLgxKfJcmAvHDhfAowDizIMR
 P+l7GYQ/UBTW1JpaU7bZBXDfR6eTd92pH1oYhHa2qxcUMQ2ftt8NQUbyiVsiHXjK
 HmBo+NIJqMWnW2ItyjxZ79IMMKALb1dmz1oEAxNgf1E+dwuIb7a4ieRsr31N3v6Y
 IkDjk99mNaLU885JX9jiN1FnwY4c56cbHG5osiDvz01pruTW1HWyvaWqTSKMmk6H
 qVUlesVtwCShrcs13RrZNgDwAURmbMW3UIkADxnjvbPjVLRNmFjupGwDZGCxreLk
 e4QC3QcSM3bqL9pQrnDtEYD8/baJ9eTrBFzS5AmZyXMBUqbM9REkKb17gl8bbRJE
 Q0EZWmQOcIYppm6B4Uh0SE2bmaniiLnLQMwrYEbBSUFAHBfq9Gk=
 =bCu3
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmK/AZoACgkQmmx57+YA
 GNmdDQ//QERUVR/lSLl8gLWOebyaHwjYscd9bpjEN+DTT+Upe1sUB0BQD4Hd7idz
 OZuG8W8H8NQ2LBGU5eGZtH0W3fPi8FkL1A7kR78fMmJlNTWr6lgUX8JG8W9nNbLZ
 QmAXtB8z6TAxKLO4AkS7uwjBzhXvc+ABEckJapvkmJ6JnETX1qSCRnrZyX/xPu6X
 6vCZ5nNxwx/WzGZ4D40jT+DietxF+kv8491/ZqWHnlWznYFslOwyYoCI+avh/swx
 OmgDLuk/iSZ3NJGjZ8+9YKFK3buSMAVUjVtarcJ3fCxn1jOcaP4PoQWyfQOrcfbT
 F4dZOd0JzKv96Zb31QBGYcJ+SuTgdqdBhM4Sy9p0o/Jato8+2gwRH/492qsWaIPh
 zPUTJR42+JvzTDyjzXgUILecGbM/8KyJ551f+V9mXfUUO/BoiPkvWBpXCrCOAL7T
 lViRpC2Uv3Ag+m7ZyWk9GAlai5gjvfdOpo0l/eGg4fV9Eb1Yl9rdOmiraBRy+WnN
 SsvLJhV1/NeXDi4Pin0VHoDJv88Op0OjOuYCkJp+jiyLVZDaJH9evO5ciTDFsjIz
 94tDDClyelNAXBL+N72zmKUPtvqpIKVWk5N2LREt3ZN/G3N4oHaxHmmsAT+Sfikq
 0hwbmVosX6Zt42WHmsKORdTpnKRWs/XLe9V1H1HVb30OrKFQQAI=
 =h4Ud
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-arm64-dt-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt

Amlogic ARM64 DT changes for v5.20:
- adjust whitespace around '='
- add reset controller node for Meson-S4 SoC
- correct gpio-keys properties
- align gpio-key node names with dtschema
- add gpio-fan control to GS-King-X

* tag 'amlogic-arm64-dt-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: meson: add gpio-fan control to GS-King-X
  arm64: dts: amlogic: align gpio-key node names with dtschema
  arm64: dts: amlogic: correct gpio-keys properties
  arm64: dts: meson: add reset controller for Meson-S4 SoC
  arm64: dts: amlogic: adjust whitespace around '='

Link: https://lore.kernel.org/r/9c8b8570-f20c-ce9a-8c6c-51fdadf7722c@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-07-01 16:15:53 +02:00
commit a57cbe02c0
17 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/amlogic/meson-axg.dtsi
View File

@ -1535,7 +1535,7 @@ aobus: bus@ff800000 {
sysctrl_AO: sys-ctrl@0 {
compatible = "amlogic,meson-axg-ao-sysctrl", "simple-mfd", "syscon";
reg = <0x0 0x0 0x0 0x100>;
reg = <0x0 0x0 0x0 0x100>;
clkc_AO: clock-controller {
compatible = "amlogic,meson-axg-aoclkc";

27
arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts
View File

@ -20,10 +20,16 @@ aliases {
rtc1 = &vrtc;
};
gpio_fan: gpio-fan {
compatible = "gpio-fan";
gpios = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
/* Using Dummy Speed */
gpio-fan,speed-map = <0 0>, <1 1>;
#cooling-cells = <2>;
};
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <100>;
power-button {
@ -96,6 +102,23 @@ &clkc_audio {
status = "okay";
};
&cpu_thermal {
trips {
cpu_active: cpu-active {
temperature = <70000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "active";
};
};
cooling-maps {
map {
trip = <&cpu_active>;
cooling-device = <&gpio_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
&frddr_a {
status = "okay";
};

2
arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts
View File

@ -21,8 +21,6 @@ aliases {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <100>;
power-button {

2
arch/arm64/boot/dts/amlogic/meson-gx.dtsi
View File

@ -450,7 +450,7 @@ aobus: bus@c8100000 {
sysctrl_AO: sys-ctrl@0 {
compatible = "amlogic,meson-gx-ao-sysctrl", "simple-mfd", "syscon";
reg = <0x0 0x0 0x0 0x100>;
reg = <0x0 0x0 0x0 0x100>;
clkc_AO: clock-controller {
compatible = "amlogic,meson-gx-aoclkc";

2
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
View File

@ -26,8 +26,6 @@ status {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <20>;
button-reset {

4
arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
View File

@ -42,11 +42,9 @@ led-blue {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <100>;
button@0 {
button {
label = "reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;

4
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
View File

@ -37,11 +37,9 @@ led-ethernet {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <100>;
button@0 {
button {
label = "reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;

4
arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts
View File

@ -30,11 +30,9 @@ button-function {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <100>;
button@0 {
button {
label = "power";
linux,code = <KEY_POWER>;
gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;

4
arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
View File

@ -30,11 +30,9 @@ button-function {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <100>;
button@0 {
button {
label = "power";
linux,code = <KEY_POWER>;
gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;

4
arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dts
View File

@ -16,11 +16,9 @@ / {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <20>;
button@0 {
button {
label = "power";
linux,code = <KEY_POWER>;
gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;

2
arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
View File

@ -216,7 +216,7 @@ &uart_A {
bluetooth {
compatible = "realtek,rtl8822cs-bt";
enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
host-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
};
};

4
arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts
View File

@ -35,11 +35,9 @@ button-function {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <100>;
button@0 {
button {
label = "power";
linux,code = <KEY_POWER>;
gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;

4
arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts
View File

@ -41,11 +41,9 @@ button-function {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <100>;
button@0 {
button {
label = "power";
linux,code = <KEY_POWER>;
gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;

4
arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
View File

@ -30,11 +30,9 @@ button-function {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <100>;
button@0 {
button {
label = "power";
linux,code = <KEY_POWER>;
gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;

2
arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dts
View File

@ -45,8 +45,6 @@ button-update {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <100>;
button-power {

6
arch/arm64/boot/dts/amlogic/meson-s4.dtsi
View File

@ -127,6 +127,12 @@ uart_B: serial@7a000 {
clocks = <&xtal>, <&xtal>, <&xtal>;
clock-names = "xtal", "pclk", "baud";
};
reset: reset-controller@2000 {
compatible = "amlogic,meson-s4-reset";
reg = <0x0 0x2000 0x0 0x98>;
#reset-cells = <1>;
};
};
};
};

10
arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
View File

@ -48,7 +48,7 @@ emmc_pwrseq: emmc-pwrseq {
gpio-keys {
compatible = "gpio-keys";
key1 {
key-1 {
label = "A";
linux,code = <BTN_0>;
gpios = <&gpio GPIOH_6 GPIO_ACTIVE_LOW>;
@ -56,7 +56,7 @@ key1 {
interrupts = <34 IRQ_TYPE_EDGE_BOTH>;
};
key2 {
key-2 {
label = "B";
linux,code = <BTN_1>;
gpios = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>;
@ -64,7 +64,7 @@ key2 {
interrupts = <35 IRQ_TYPE_EDGE_BOTH>;
};
key3 {
key-3 {
label = "C";
linux,code = <BTN_2>;
gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
@ -72,7 +72,7 @@ key3 {
interrupts = <2 IRQ_TYPE_EDGE_BOTH>;
};
mic_mute {
key-mic-mute {
label = "MicMute";
linux,code = <SW_MUTE_DEVICE>;
linux,input-type = <EV_SW>;
@ -81,7 +81,7 @@ mic_mute {
interrupts = <99 IRQ_TYPE_EDGE_BOTH>;
};
power_key {
key-power {
label = "PowerKey";
linux,code = <KEY_POWER>;
gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;