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

arm64: dts: amlogic: misc DT schema fixups

Browse Source 
Take a pass at cleaning up a bunch of warnings
from 'make dtbs_check' that have crept in.

Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210421204833.18523-1-khilman@baylibre.com'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Kevin Hilman 2021-04-21 13:48:32 -07:00 committed by Arnd Bergmann
parent d028b508c1
commit d9421d6c52
16 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/media/rc.yaml
View File

@ -90,9 +90,12 @@ properties:
- rc-leadtek-y04g0051
- rc-lme2510
- rc-manli
- rc-mecool-kii-pro
- rc-mecool-kiii-pro
- rc-medion-x10
- rc-medion-x10-digitainer
- rc-medion-x10-or2x
- rc-minix-neo
- rc-msi-digivox-ii
- rc-msi-digivox-iii
- rc-msi-tvanywhere
@ -145,6 +148,7 @@ properties:
- rc-videomate-s350
- rc-videomate-tv-pvr
- rc-videostrong-kii-pro
- rc-vega-s9x
- rc-wetek-hub
- rc-wetek-play2
- rc-winfast

4
arch/arm64/boot/dts/amlogic/meson-a1.dtsi
View File

@ -88,13 +88,13 @@ reset: reset-controller@0 {
#reset-cells = <1>;
};
periphs_pinctrl: pinctrl@0400 {
periphs_pinctrl: pinctrl@400 {
compatible = "amlogic,meson-a1-periphs-pinctrl";
#address-cells = <2>;
#size-cells = <2>;
ranges;
gpio: bank@0400 {
gpio: bank@400 {
reg = <0x0 0x0400 0x0 0x003c>,
<0x0 0x0480 0x0 0x0118>;
reg-names = "mux", "gpio";

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

@ -1731,7 +1731,6 @@ ge2d: ge2d@ff940000 {
interrupts = <GIC_SPI 150 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkc CLKID_VAPB>;
resets = <&reset RESET_GE2D>;
reset-names = "core";
};
gic: interrupt-controller@ffc01000 {

14
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
View File

@ -128,9 +128,9 @@ soc {
pcie: pcie@fc000000 {
compatible = "amlogic,g12a-pcie", "snps,dw-pcie";
reg = <0x0 0xfc000000 0x0 0x400000
0x0 0xff648000 0x0 0x2000
0x0 0xfc400000 0x0 0x200000>;
reg = <0x0 0xfc000000 0x0 0x400000>,
<0x0 0xff648000 0x0 0x2000>,
<0x0 0xfc400000 0x0 0x200000>;
reg-names = "elbi", "cfg", "config";
interrupts = <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <1>;
@ -140,8 +140,8 @@ pcie: pcie@fc000000 {
#address-cells = <3>;
#size-cells = <2>;
device_type = "pci";
ranges = <0x81000000 0 0 0x0 0xfc600000 0 0x00100000
0x82000000 0 0xfc700000 0x0 0xfc700000 0 0x1900000>;
ranges = <0x81000000 0 0 0x0 0xfc600000 0 0x00100000>,
<0x82000000 0 0xfc700000 0x0 0xfc700000 0 0x1900000>;
clocks = <&clkc CLKID_PCIE_PHY
&clkc CLKID_PCIE_COMB
@ -2009,7 +2009,7 @@ mux {
};
};
vrtc: rtc@0a8 {
vrtc: rtc@a8 {
compatible = "amlogic,meson-vrtc";
reg = <0x0 0x000a8 0x0 0x4>;
};
@ -2187,7 +2187,7 @@ gpio_intc: interrupt-controller@f080 {
amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
};
watchdog: wdt@f0d0 {
watchdog: watchdog@f0d0 {
compatible = "amlogic,meson-gxbb-wdt";
reg = <0x0 0xf0d0 0x0 0x10>;
clocks = <&xtal>;

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

@ -12,7 +12,7 @@
#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
/ {
compatible = "azw,gsking-x", "amlogic,g12b";
compatible = "azw,gsking-x", "amlogic,s922x", "amlogic,g12b";
model = "Beelink GS-King X";
aliases {

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

@ -11,7 +11,7 @@
#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
/ {
compatible = "azw,gtking", "amlogic,g12b";
compatible = "azw,gtking", "amlogic,s922x", "amlogic,g12b";
model = "Beelink GT-King Pro";
aliases {
@ -35,7 +35,7 @@ power-button {
leds {
compatible = "gpio-leds";
white {
led-white {
label = "power:white";
gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
default-state = "on";

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

@ -11,7 +11,7 @@
#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
/ {
compatible = "azw,gtking", "amlogic,g12b";
compatible = "azw,gtking", "amlogic,s922x", "amlogic,g12b";
model = "Beelink GT-King";
aliases {

4
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
View File

@ -42,7 +42,7 @@ emmc_pwrseq: emmc-pwrseq {
leds {
compatible = "gpio-leds";
blue {
led-blue {
label = "n2:blue";
gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
@ -497,7 +497,7 @@ &gpio {
* This signal should be handled by a USB specific power sequence
* in order to reset the Hub when USB bus is powered down.
*/
usb-hub {
hog-0 {
gpio-hog;
gpios = <GPIOH_4 GPIO_ACTIVE_HIGH>;
output-high;

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

@ -257,7 +257,7 @@ &gpio_ao {
* This signal should be handled by a USB specific power sequence
* in order to reset the Hub when USB bus is powered down.
*/
usb-hub {
hog-0 {
gpio-hog;
gpios = <GPIOAO_4 GPIO_ACTIVE_HIGH>;
output-high;

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

@ -44,7 +44,7 @@ button@0 {
leds {
compatible = "gpio-leds";
blue {
led-blue {
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_POWER;
gpios = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;

8
arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts
View File

@ -16,28 +16,28 @@ / {
leds {
compatible = "gpio-leds";
yellow {
led-yellow {
color = <LED_COLOR_ID_YELLOW>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio_ao GPIOAO_6 GPIO_ACTIVE_HIGH>;
default-state = "off";
};
blue {
led-blue {
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio GPIODV_28 GPIO_ACTIVE_HIGH>;
default-state = "off";
};
green {
led-green {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>;
default-state = "on";
};
red {
led-red {
color = <LED_COLOR_ID_RED>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio GPIODV_27 GPIO_ACTIVE_HIGH>;

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

@ -49,7 +49,7 @@ button@0 {
leds {
compatible = "gpio-leds";
blue {
led-blue {
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_POWER;
gpios = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;

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

@ -17,7 +17,7 @@ / {
leds {
compatible = "gpio-leds";
white {
led-white {
color = <LED_COLOR_ID_WHITE>;
function = LED_FUNCTION_POWER;
gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>;

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

@ -22,7 +22,7 @@ memory@0 {
leds {
compatible = "gpio-leds";
blue {
led-blue {
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;

4
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
View File

@ -43,14 +43,14 @@ button-function {
leds {
compatible = "gpio-leds";
white {
led-white {
color = <LED_COLOR_ID_WHITE>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
red {
led-red {
color = <LED_COLOR_ID_RED>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio_expander 5 GPIO_ACTIVE_HIGH>;

2
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
View File

@ -47,7 +47,7 @@ &gpio {
* This signal should be handled by a USB specific power sequence
* in order to reset the Hub when USB bus is powered down.
*/
usb-hub {
hog-0 {
gpio-hog;
gpios = <GPIOH_4 GPIO_ACTIVE_HIGH>;
output-high;