Skip to content

L
linux
Commit ec20d468 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files
Options

ARM: dts: imx: Remove regulators from simple-bus 

Regulators should not be placed under simple-bus.

Move it outside simple-bus to fix the following schema warnings:

regulators: $nodename:0: 'regulators' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$'
From schema: site-packages/dtschema/schemas/simple-bus.yaml
Signed-off-by: default avatarFabio Estevam <festevam@denx.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent f75adaf6
Hide whitespace changes
Inline Side-by-side
Showing with 510 additions and 715 deletions
arch/arm/boot/dts/nxp/imx/imx51-babbage.dts
View file @ ec20d468
...@@ -173,22 +173,15 @@ led-diagnostic { ...@@ -173,22 +173,15 @@ led-diagnostic {
}; };
}; };
regulators { reg_hub_reset: regulator-hub-reset {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; pinctrl-names = "default";
#size-cells = <0>; pinctrl-0 = <&pinctrl_usbotgreg>;
regulator-name = "hub_reset";
reg_hub_reset: regulator@0 { regulator-min-microvolt = <5000000>;
compatible = "regulator-fixed"; regulator-max-microvolt = <5000000>;
pinctrl-names = "default"; gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&pinctrl_usbotgreg>; enable-active-high;
reg = <0>;
regulator-name = "hub_reset";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
}; };
sound { sound {
......
arch/arm/boot/dts/nxp/imx/imx51-eukrea-mbimxsd51-baseboard.dts
View file @ ec20d468
...@@ -45,21 +45,14 @@ led1 { ...@@ -45,21 +45,14 @@ led1 {
}; };
}; };
regulators { reg_can: regulator-can {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "CAN_RST";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
reg_can: regulator@0 { gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
compatible = "regulator-fixed"; startup-delay-us = <20000>;
reg = <0>; enable-active-high;
regulator-name = "CAN_RST";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
startup-delay-us = <20000>;
enable-active-high;
};
}; };
sound { sound {
......
arch/arm/boot/dts/nxp/imx/imx53-ard.dts
View file @ ec20d468
...@@ -43,19 +43,12 @@ ethernet@f4000000 { ...@@ -43,19 +43,12 @@ ethernet@f4000000 {
}; };
}; };
regulators { reg_3p3v: regulator-3p3v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3P3V";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
reg_3p3v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
}; };
gpio-keys { gpio-keys {
......
arch/arm/boot/dts/nxp/imx/imx53-m53.dtsi
View file @ ec20d468
...@@ -15,28 +15,20 @@ memory@70000000 { ...@@ -15,28 +15,20 @@ memory@70000000 {
<0xb0000000 0x20000000>; <0xb0000000 0x20000000>;
}; };
regulators { reg_3p2v: regulator-3p2v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3P2V";
#size-cells = <0>; regulator-min-microvolt = <3200000>;
regulator-max-microvolt = <3200000>;
reg_3p2v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "3P2V";
regulator-min-microvolt = <3200000>;
regulator-max-microvolt = <3200000>;
regulator-always-on;
};
reg_backlight: regulator@1 { reg_backlight: regulator-backlight {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "lcd-supply";
regulator-name = "lcd-supply"; regulator-min-microvolt = <3200000>;
regulator-min-microvolt = <3200000>; regulator-max-microvolt = <3200000>;
regulator-max-microvolt = <3200000>; regulator-always-on;
regulator-always-on;
};
}; };
}; };
......
arch/arm/boot/dts/nxp/imx/imx53-m53evk.dts
View file @ ec20d468
...@@ -65,28 +65,20 @@ led-user2 { ...@@ -65,28 +65,20 @@ led-user2 {
}; };
}; };
regulators { reg_usbh1_vbus: regulator-usbh1-vbus {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "vbus";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
reg_usbh1_vbus: regulator@3 { gpio = <&gpio1 2 0>;
compatible = "regulator-fixed"; };
reg = <3>;
regulator-name = "vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 2 0>;
};
reg_usb_otg_vbus: regulator@4 { reg_usb_otg_vbus: regulator-usb-otg-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; regulator-name = "usb_otg_vbus";
regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio1 4 0>;
gpio = <&gpio1 4 0>;
};
}; };
sound { sound {
......
arch/arm/boot/dts/nxp/imx/imx53-mba53.dts
View file @ ec20d468
...@@ -38,27 +38,19 @@ display1_in: endpoint { ...@@ -38,27 +38,19 @@ display1_in: endpoint {
}; };
}; };
regulators { reg_backlight: regulator-backlight {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "lcd-supply";
#size-cells = <0>; gpio = <&gpio2 5 0>;
startup-delay-us = <5000>;
reg_backlight: regulator@0 { };
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "lcd-supply";
gpio = <&gpio2 5 0>;
startup-delay-us = <5000>;
};
reg_3p2v: regulator@1 { reg_3p2v: regulator-3p2v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "3P2V";
regulator-name = "3P2V"; regulator-min-microvolt = <3200000>;
regulator-min-microvolt = <3200000>; regulator-max-microvolt = <3200000>;
regulator-max-microvolt = <3200000>; regulator-always-on;
regulator-always-on;
};
}; };
sound { sound {
......
arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi
View file @ ec20d468
...@@ -88,29 +88,21 @@ panel_in: endpoint { ...@@ -88,29 +88,21 @@ panel_in: endpoint {
}; };
}; };
regulators { reg_3p2v: regulator-3p2v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3P2V";
#size-cells = <0>; regulator-min-microvolt = <3200000>;
regulator-max-microvolt = <3200000>;
reg_3p2v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "3P2V";
regulator-min-microvolt = <3200000>;
regulator-max-microvolt = <3200000>;
regulator-always-on;
};
reg_usb_vbus: regulator@1 { reg_usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "usb_vbus";
regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio7 8 0>;
gpio = <&gpio7 8 0>; enable-active-high;
enable-active-high;
};
}; };
sound { sound {
......
arch/arm/boot/dts/nxp/imx/imx53-tqma53.dtsi
View file @ ec20d468
...@@ -15,19 +15,12 @@ memory@70000000 { ...@@ -15,19 +15,12 @@ memory@70000000 {
reg = <0x70000000 0x40000000>; /* Up to 1GiB */ reg = <0x70000000 0x40000000>; /* Up to 1GiB */
}; };
regulators { reg_3p3v: regulator-3p3v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3P3V";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
reg_3p3v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
}; };
}; };
......
arch/arm/boot/dts/nxp/imx/imx53-voipac-dmm-668.dtsi
View file @ ec20d468
...@@ -15,29 +15,21 @@ memory@70000000 { ...@@ -15,29 +15,21 @@ memory@70000000 {
<0xb0000000 0x20000000>; <0xb0000000 0x20000000>;
}; };
regulators { reg_3p3v: regulator-3p3v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3P3V";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
reg_3p3v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_usb_vbus: regulator@1 { reg_usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "usb_vbus";
regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio3 31 0>; /* PEN */
gpio = <&gpio3 31 0>; /* PEN */ enable-active-high;
enable-active-high;
};
}; };
}; };
......
arch/arm/boot/dts/nxp/imx/imx6q-arm2.dts
View file @ ec20d468
...@@ -17,29 +17,21 @@ memory@10000000 { ...@@ -17,29 +17,21 @@ memory@10000000 {
reg = <0x10000000 0x80000000>; reg = <0x10000000 0x80000000>;
}; };
regulators { reg_3p3v: regulator-3p3v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3P3V";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
reg_3p3v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_usb_otg_vbus: regulator@1 { reg_usb_otg_vbus: regulator-usb-otg-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "usb_otg_vbus";
regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio3 22 0>;
gpio = <&gpio3 22 0>; enable-active-high;
enable-active-high;
};
}; };
leds { leds {
......
arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dts
View file @ ec20d468
...@@ -28,40 +28,31 @@ memory@10000000 { ...@@ -28,40 +28,31 @@ memory@10000000 {
reg = <0x10000000 0x80000000>; reg = <0x10000000 0x80000000>;
}; };
regulators { reg_3p3v: regulator-3p3v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3P3V";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
reg_3p3v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_usb_otg_switch: regulator@1 { reg_usb_otg_switch: regulator-usb-otg-switch {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "usb_otg_switch";
regulator-name = "usb_otg_switch"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio7 12 0>;
gpio = <&gpio7 12 0>; regulator-boot-on;
regulator-boot-on; regulator-always-on;
regulator-always-on; };
};
reg_usb_host1: regulator@2 { reg_usb_host1: regulator-usb-host1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "usb_host1_en";
regulator-name = "usb_host1_en"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio3 31 0>;
gpio = <&gpio3 31 0>; enable-active-high;
enable-active-high;
};
}; };
gpio-leds { gpio-leds {
......
arch/arm/boot/dts/nxp/imx/imx6q-gk802.dts
View file @ ec20d468
...@@ -19,19 +19,12 @@ memory@10000000 { ...@@ -19,19 +19,12 @@ memory@10000000 {
reg = <0x10000000 0x40000000>; reg = <0x10000000 0x40000000>;
}; };
regulators { reg_3p3v: regulator-3p3v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3P3V";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
reg_3p3v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
}; };
gpio-keys { gpio-keys {
......
arch/arm/boot/dts/nxp/imx/imx6q-gw5400-a.dts
View file @ ec20d468
...@@ -67,47 +67,37 @@ pps { ...@@ -67,47 +67,37 @@ pps {
status = "okay"; status = "okay";
}; };
regulators { reg_1p0v: regulator-1p0v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "1P0V";
#size-cells = <0>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
reg_1p0v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "1P0V"; reg_3p3v: regulator-3p3v {
regulator-min-microvolt = <1000000>; compatible = "regulator-fixed";
regulator-max-microvolt = <1000000>; regulator-name = "3P3V";
regulator-always-on; regulator-min-microvolt = <3300000>;
}; regulator-max-microvolt = <3300000>;
regulator-always-on;
reg_3p3v: regulator@1 { };
compatible = "regulator-fixed";
reg = <1>; reg_usb_h1_vbus: regulator-usb-h1-vbus {
regulator-name = "3P3V"; compatible = "regulator-fixed";
regulator-min-microvolt = <3300000>; regulator-name = "usb_h1_vbus";
regulator-max-microvolt = <3300000>; regulator-min-microvolt = <5000000>;
regulator-always-on; regulator-max-microvolt = <5000000>;
}; regulator-always-on;
};
reg_usb_h1_vbus: regulator@2 {
compatible = "regulator-fixed"; reg_usb_otg_vbus: regulator-usb-otg-vbus {
reg = <2>; compatible = "regulator-fixed";
regulator-name = "usb_h1_vbus"; regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-always-on; gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
}; enable-active-high;
reg_usb_otg_vbus: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
}; };
sound { sound {
......
arch/arm/boot/dts/nxp/imx/imx6qdl-dfi-fs700-m60.dtsi
View file @ ec20d468
...@@ -2,26 +2,18 @@ ...@@ -2,26 +2,18 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
/ { / {
regulators { dummy_reg: regulator-dummy {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "dummy-supply";
#size-cells = <0>; };
dummy_reg: regulator@0 {
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "dummy-supply";
};
reg_usb_otg_vbus: regulator@1 { reg_usb_otg_vbus: regulator-usb-otg-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "usb_otg_vbus";
regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio3 22 0>;
gpio = <&gpio3 22 0>; enable-active-high;
enable-active-high;
};
}; };
chosen { chosen {
......
arch/arm/boot/dts/nxp/imx/imx6qdl-gw54xx.dtsi
View file @ ec20d468
...@@ -114,57 +114,47 @@ pps { ...@@ -114,57 +114,47 @@ pps {
status = "okay"; status = "okay";
}; };
regulators { reg_1p0v: regulator-1p0v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "1P0V";
#size-cells = <0>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
reg_1p0v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "1P0V";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-always-on;
};
reg_3p3v: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_can1_stby: regulator-can1-stby {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_reg_can1>;
regulator-name = "can1_stby";
gpio = <&gpio1 2 GPIO_ACTIVE_LOW>;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
reg_usb_h1_vbus: regulator@2 { reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "3P3V";
regulator-name = "usb_h1_vbus"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <5000000>; regulator-always-on;
regulator-always-on; };
};
reg_usb_otg_vbus: regulator@3 { reg_can1_stby: regulator-can1-stby {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; pinctrl-names = "default";
regulator-name = "usb_otg_vbus"; pinctrl-0 = <&pinctrl_reg_can1>;
regulator-min-microvolt = <5000000>; regulator-name = "can1_stby";
regulator-max-microvolt = <5000000>; gpio = <&gpio1 2 GPIO_ACTIVE_LOW>;
gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; regulator-min-microvolt = <3300000>;
enable-active-high; regulator-max-microvolt = <3300000>;
}; };
reg_usb_h1_vbus: regulator-usb-h1-vbus {
compatible = "regulator-fixed";
regulator-name = "usb_h1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
};
reg_usb_otg_vbus: regulator-usb-otg-vbus {
compatible = "regulator-fixed";
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
enable-active-high;
}; };
sound-analog { sound-analog {
......
arch/arm/boot/dts/nxp/imx/imx6qdl-nit6xlite.dtsi
View file @ ec20d468
...@@ -15,51 +15,41 @@ memory@10000000 { ...@@ -15,51 +15,41 @@ memory@10000000 {
reg = <0x10000000 0x20000000>; reg = <0x10000000 0x20000000>;
}; };
regulators { reg_2p5v: regulator-2p5v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "2P5V";
#size-cells = <0>; regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
regulator-always-on;
};
reg_2p5v: regulator@0 { reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>; regulator-name = "3P3V";
regulator-name = "2P5V"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <2500000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <2500000>; regulator-always-on;
regulator-always-on; };
};
reg_usb_otg_vbus: regulator-usb-otg-vbus {
reg_3p3v: regulator@1 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "usb_otg_vbus";
reg = <1>; regulator-min-microvolt = <5000000>;
regulator-name = "3P3V"; regulator-max-microvolt = <5000000>;
regulator-min-microvolt = <3300000>; gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
regulator-max-microvolt = <3300000>; enable-active-high;
regulator-always-on; };
};
reg_wlan_vmmc: regulator-wlan-vmmc {
reg_usb_otg_vbus: regulator@2 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; pinctrl-names = "default";
reg = <2>; pinctrl-0 = <&pinctrl_wlan_vmmc>;
regulator-name = "usb_otg_vbus"; regulator-name = "reg_wlan_vmmc";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <1800000>;
gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; gpio = <&gpio6 7 GPIO_ACTIVE_HIGH>;
enable-active-high; startup-delay-us = <70000>;
}; enable-active-high;
reg_wlan_vmmc: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wlan_vmmc>;
regulator-name = "reg_wlan_vmmc";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
gpio = <&gpio6 7 GPIO_ACTIVE_HIGH>;
startup-delay-us = <70000>;
enable-active-high;
};
}; };
gpio-keys { gpio-keys {
......
arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6_max.dtsi
View file @ ec20d468
...@@ -15,83 +15,70 @@ memory@10000000 { ...@@ -15,83 +15,70 @@ memory@10000000 {
reg = <0x10000000 0xF0000000>; reg = <0x10000000 0xF0000000>;
}; };
regulators { reg_1p8v: regulator@0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "1P8V";
#size-cells = <0>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
reg_1p8v: regulator@0 { reg_2p5v: regulator-2p5v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>; regulator-name = "2P5V";
regulator-name = "1P8V"; regulator-min-microvolt = <2500000>;
regulator-min-microvolt = <1800000>; regulator-max-microvolt = <2500000>;
regulator-max-microvolt = <1800000>; regulator-always-on;
regulator-always-on; };
};
reg_2p5v: regulator@1 { reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "3P3V";
regulator-name = "2P5V"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <2500000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <2500000>; regulator-always-on;
regulator-always-on; };
};
reg_3p3v: regulator@2 { reg_usb_otg_vbus: regulator-usb-otg {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "usb_otg_vbus";
regulator-name = "3P3V"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
regulator-always-on; enable-active-high;
}; };
reg_usb_otg_vbus: regulator@3 { reg_usb_h1_vbus: regulator-usb-h1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; pinctrl-names = "default";
regulator-name = "usb_otg_vbus"; pinctrl-0 = <&pinctrl_usbh1>;
regulator-min-microvolt = <5000000>; regulator-name = "usb_h1_vbus";
regulator-max-microvolt = <5000000>; regulator-min-microvolt = <3300000>;
gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; regulator-max-microvolt = <3300000>;
enable-active-high; gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
}; enable-active-high;
};
reg_usb_h1_vbus: regulator@4 { reg_wlan_vmmc: regulator-wlan-vmmc {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wlan_vmmc>;
pinctrl-0 = <&pinctrl_usbh1>; regulator-name = "reg_wlan_vmmc";
regulator-name = "usb_h1_vbus"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio6 15 GPIO_ACTIVE_HIGH>;
gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; startup-delay-us = <70000>;
enable-active-high; enable-active-high;
}; };
reg_wlan_vmmc: regulator@5 { reg_can_xcvr: regulator-can-xcvr {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <5>; regulator-name = "CAN XCVR";
pinctrl-names = "default"; regulator-min-microvolt = <3300000>;
pinctrl-0 = <&pinctrl_wlan_vmmc>; regulator-max-microvolt = <3300000>;
regulator-name = "reg_wlan_vmmc"; pinctrl-names = "default";
regulator-min-microvolt = <3300000>; pinctrl-0 = <&pinctrl_can_xcvr>;
regulator-max-microvolt = <3300000>; gpio = <&gpio1 2 GPIO_ACTIVE_LOW>;
gpio = <&gpio6 15 GPIO_ACTIVE_HIGH>;
startup-delay-us = <70000>;
enable-active-high;
};
reg_can_xcvr: regulator@6 {
compatible = "regulator-fixed";
reg = <6>;
regulator-name = "CAN XCVR";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_can_xcvr>;
gpio = <&gpio1 2 GPIO_ACTIVE_LOW>;
};
}; };
gpio-keys { gpio-keys {
......
arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6x.dtsi
View file @ ec20d468
...@@ -17,74 +17,62 @@ memory@10000000 { ...@@ -17,74 +17,62 @@ memory@10000000 {
reg = <0x10000000 0x40000000>; reg = <0x10000000 0x40000000>;
}; };
regulators { reg_2p5v: regulator-2p5v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "2P5V";
#size-cells = <0>; regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
regulator-always-on;
};
reg_2p5v: regulator@0 { reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>; regulator-name = "3P3V";
regulator-name = "2P5V"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <2500000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <2500000>; regulator-always-on;
regulator-always-on; };
};
reg_3p3v: regulator@1 { reg_usb_otg_vbus: regulator-usb-otg-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "usb_otg_vbus";
regulator-name = "3P3V"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio3 22 0>;
regulator-always-on; enable-active-high;
}; };
reg_usb_otg_vbus: regulator@2 { reg_can_xcvr: regulator-can-xcvr {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "CAN XCVR";
regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <5000000>; pinctrl-names = "default";
gpio = <&gpio3 22 0>; pinctrl-0 = <&pinctrl_can_xcvr>;
enable-active-high; gpio = <&gpio1 2 GPIO_ACTIVE_LOW>;
}; };
reg_can_xcvr: regulator@3 { reg_wlan_vmmc: regulator-wlan-vmmc {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; pinctrl-names = "default";
regulator-name = "CAN XCVR"; pinctrl-0 = <&pinctrl_wlan_vmmc>;
regulator-min-microvolt = <3300000>; regulator-name = "reg_wlan_vmmc";
regulator-max-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
pinctrl-names = "default"; regulator-max-microvolt = <3300000>;
pinctrl-0 = <&pinctrl_can_xcvr>; gpio = <&gpio6 15 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 2 GPIO_ACTIVE_LOW>; startup-delay-us = <70000>;
}; enable-active-high;
};
reg_wlan_vmmc: regulator@4 {
compatible = "regulator-fixed"; reg_usb_h1_vbus: regulator-usb-h1-vbus {
reg = <4>; compatible = "regulator-fixed";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wlan_vmmc>; pinctrl-0 = <&pinctrl_usbh1>;
regulator-name = "reg_wlan_vmmc"; regulator-name = "usb_h1_vbus";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
gpio = <&gpio6 15 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
startup-delay-us = <70000>; enable-active-high;
enable-active-high;
};
reg_usb_h1_vbus: regulator@5 {
compatible = "regulator-fixed";
reg = <5>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbh1>;
regulator-name = "usb_h1_vbus";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
}; };
gpio-keys { gpio-keys {
......
arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pbab01.dtsi
View file @ ec20d468
...@@ -10,22 +10,18 @@ chosen { ...@@ -10,22 +10,18 @@ chosen {
stdout-path = &uart4; stdout-path = &uart4;
}; };
regulators { sound_1v8: regulator-sound-1v8 {
sound_1v8: regulator@2 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "i2s-audio-1v8";
reg = <2>; regulator-min-microvolt = <1800000>;
regulator-name = "i2s-audio-1v8"; regulator-max-microvolt = <1800000>;
regulator-min-microvolt = <1800000>; };
regulator-max-microvolt = <1800000>;
};
sound_3v3: regulator@3 { sound_3v3: regulator-sound-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "i2s-audio-3v3";
regulator-name = "i2s-audio-3v3"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
}; };
tlv320_mclk: oscillator { tlv320_mclk: oscillator {
......
arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi
View file @ ec20d468
...@@ -14,32 +14,24 @@ memory@10000000 { ...@@ -14,32 +14,24 @@ memory@10000000 {
reg = <0x10000000 0x80000000>; reg = <0x10000000 0x80000000>;
}; };
regulators { reg_usb_otg_vbus: regulator-usb-otg-vbus {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "usb_otg_vbus";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
reg_usb_otg_vbus: regulator@0 { gpio = <&gpio4 15 0>;
compatible = "regulator-fixed"; enable-active-high;
reg = <0>; };
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio4 15 0>;
enable-active-high;
};
reg_usb_h1_vbus: regulator@1 { reg_usb_h1_vbus: regulator-usb-h1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbh1_vbus>; pinctrl-0 = <&pinctrl_usbh1_vbus>;
reg = <1>; regulator-name = "usb_h1_vbus";
regulator-name = "usb_h1_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio1 0 0>;
gpio = <&gpio1 0 0>; enable-active-high;
enable-active-high;
};
}; };
gpio_leds: leds { gpio_leds: leds {
......
arch/arm/boot/dts/nxp/imx/imx6qdl-rex.dtsi
View file @ ec20d468
...@@ -13,41 +13,32 @@ chosen { ...@@ -13,41 +13,32 @@ chosen {
stdout-path = &uart1; stdout-path = &uart1;
}; };
regulators { reg_3p3v: regulator-3p3v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3P3V";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
reg_3p3v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_usbh1_vbus: regulator@1 { reg_usbh1_vbus: regulator-usbh1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; pinctrl-names = "default";
pinctrl-names = "default"; regulator-name = "usbh1_vbus";
regulator-name = "usbh1_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>;
gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
reg_usb_otg_vbus: regulator@2 { reg_usb_otg_vbus: regulator-otg-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; pinctrl-names = "default";
pinctrl-names = "default"; regulator-name = "usb_otg_vbus";
regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high;
};
}; };
leds { leds {
......
arch/arm/boot/dts/nxp/imx/imx6qdl-sabrelite.dtsi
View file @ ec20d468
...@@ -24,88 +24,74 @@ memory@10000000 { ...@@ -24,88 +24,74 @@ memory@10000000 {
reg = <0x10000000 0x40000000>; reg = <0x10000000 0x40000000>;
}; };
regulators { reg_2p5v: regulator-2p5v {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "2P5V";
#size-cells = <0>; regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
regulator-always-on;
};
reg_2p5v: regulator@0 { reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>; regulator-name = "3P3V";
regulator-name = "2P5V"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <2500000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <2500000>; regulator-always-on;
regulator-always-on; };
};
reg_3p3v: regulator@1 { reg_usb_otg_vbus: regulator-usb-otg-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "usb_otg_vbus";
regulator-name = "3P3V"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio3 22 0>;
regulator-always-on; enable-active-high;
}; };
reg_usb_otg_vbus: regulator@2 { reg_can_xcvr: regulator-can-xcvr {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "CAN XCVR";
regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <5000000>; pinctrl-names = "default";
gpio = <&gpio3 22 0>; pinctrl-0 = <&pinctrl_can_xcvr>;
enable-active-high; gpio = <&gpio1 2 GPIO_ACTIVE_LOW>;
}; };
reg_can_xcvr: regulator@3 { reg_1p5v: regulator-1p5v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "1P5V";
regulator-name = "CAN XCVR"; regulator-min-microvolt = <1500000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <1500000>;
regulator-max-microvolt = <3300000>; regulator-always-on;
pinctrl-names = "default"; };
pinctrl-0 = <&pinctrl_can_xcvr>;
gpio = <&gpio1 2 GPIO_ACTIVE_LOW>; reg_1p8v: regulator-1p8v {
}; compatible = "regulator-fixed";
regulator-name = "1P8V";
reg_1p5v: regulator@4 { regulator-min-microvolt = <1800000>;
compatible = "regulator-fixed"; regulator-max-microvolt = <1800000>;
reg = <4>; regulator-always-on;
regulator-name = "1P5V"; };
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>; reg_2p8v: regulator-2p8v {
regulator-always-on; compatible = "regulator-fixed";
}; regulator-name = "2P8V";
regulator-min-microvolt = <2800000>;
reg_1p8v: regulator@5 { regulator-max-microvolt = <2800000>;
compatible = "regulator-fixed"; regulator-always-on;
reg = <5>; };
regulator-name = "1P8V";
regulator-min-microvolt = <1800000>; reg_usb_h1_vbus: regulator-usb-h1-vbus {
regulator-max-microvolt = <1800000>; compatible = "regulator-fixed";
regulator-always-on; pinctrl-names = "default";
}; pinctrl-0 = <&pinctrl_usbh1>;
regulator-name = "usb_h1_vbus";
reg_2p8v: regulator@6 { regulator-min-microvolt = <3300000>;
compatible = "regulator-fixed"; regulator-max-microvolt = <3300000>;
reg = <6>; gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
regulator-name = "2P8V"; enable-active-high;
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
regulator-always-on;
};
reg_usb_h1_vbus: regulator@7 {
compatible = "regulator-fixed";
reg = <7>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbh1>;
regulator-name = "usb_h1_vbus";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
}; };
mipi_xclk: mipi_xclk { mipi_xclk: mipi_xclk {
......
arch/arm/boot/dts/nxp/imx/imx6qdl-udoo.dtsi
View file @ ec20d468
...@@ -59,29 +59,21 @@ panel_in: endpoint { ...@@ -59,29 +59,21 @@ panel_in: endpoint {
}; };
}; };
regulators { reg_usb_h1_vbus: regulator-usb-h1-vbus {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "usb_h1_vbus";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
reg_usb_h1_vbus: regulator@0 { enable-active-high;
compatible = "regulator-fixed"; startup-delay-us = <2>; /* USB2415 requires a POR of 1 us minimum */
reg = <0>; gpio = <&gpio7 12 0>;
regulator-name = "usb_h1_vbus"; };
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
startup-delay-us = <2>; /* USB2415 requires a POR of 1 us minimum */
gpio = <&gpio7 12 0>;
};
reg_panel: regulator@1 { reg_panel: regulator-panel {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "lcd_panel";
regulator-name = "lcd_panel"; enable-active-high;
enable-active-high; gpio = <&gpio1 2 0>;
gpio = <&gpio1 2 0>;
};
}; };
sound { sound {
......
arch/arm/boot/dts/nxp/vf/vf610-twr.dts
View file @ ec20d468
...@@ -30,27 +30,20 @@ enet_ext: eth_osc { ...@@ -30,27 +30,20 @@ enet_ext: eth_osc {
clock-frequency = <50000000>; clock-frequency = <50000000>;
}; };
regulators {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_3p3v: regulator@0 { reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>; regulator-name = "3P3V";
regulator-name = "3P3V"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-always-on;
regulator-always-on; };
};
reg_vcc_3v3_mcu: regulator@1 { reg_vcc_3v3_mcu: regulator-vcc-3v3-mcu {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "vcc_3v3_mcu";
regulator-name = "vcc_3v3_mcu"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
}; };
sound { sound {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7