Merge branch 'master' of git://git.denx.de/u-boot-rockchip
This commit is contained in:
commit
4b69e870e9
@ -19,8 +19,6 @@
|
|||||||
|
|
||||||
keys: gpio-keys {
|
keys: gpio-keys {
|
||||||
compatible = "gpio-keys";
|
compatible = "gpio-keys";
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
|
|
||||||
button@0 {
|
button@0 {
|
||||||
gpio-key,wakeup = <1>;
|
gpio-key,wakeup = <1>;
|
||||||
|
@ -25,8 +25,6 @@
|
|||||||
|
|
||||||
keys: gpio-keys {
|
keys: gpio-keys {
|
||||||
compatible = "gpio-keys";
|
compatible = "gpio-keys";
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
|
|
||||||
button@0 {
|
button@0 {
|
||||||
gpio-key,wakeup = <1>;
|
gpio-key,wakeup = <1>;
|
||||||
|
@ -55,8 +55,6 @@
|
|||||||
|
|
||||||
gpio-keys {
|
gpio-keys {
|
||||||
compatible = "gpio-keys";
|
compatible = "gpio-keys";
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
autorepeat;
|
autorepeat;
|
||||||
|
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
|
@ -83,8 +83,6 @@
|
|||||||
|
|
||||||
gpio_keys: gpio-keys {
|
gpio_keys: gpio-keys {
|
||||||
compatible = "gpio-keys";
|
compatible = "gpio-keys";
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
|
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&pwr_key_h>;
|
pinctrl-0 = <&pwr_key_h>;
|
||||||
|
@ -841,8 +841,6 @@
|
|||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
ports {
|
ports {
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
reg = <1>;
|
reg = <1>;
|
||||||
mipi_in: port {
|
mipi_in: port {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
|
@ -189,8 +189,6 @@
|
|||||||
u-boot,dm-pre-reloc;
|
u-boot,dm-pre-reloc;
|
||||||
compatible = "rockchip,rk3328-grf", "syscon", "simple-mfd";
|
compatible = "rockchip,rk3328-grf", "syscon", "simple-mfd";
|
||||||
reg = <0x0 0xff100000 0x0 0x1000>;
|
reg = <0x0 0xff100000 0x0 0x1000>;
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <1>;
|
|
||||||
|
|
||||||
io_domains: io-domains {
|
io_domains: io-domains {
|
||||||
compatible = "rockchip,rk3328-io-voltage-domain";
|
compatible = "rockchip,rk3328-io-voltage-domain";
|
||||||
|
@ -208,8 +208,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
&hdmi {
|
&hdmi {
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
#sound-dai-cells = <0>;
|
#sound-dai-cells = <0>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
@ -1015,8 +1015,6 @@
|
|||||||
u-boot,dm-pre-reloc;
|
u-boot,dm-pre-reloc;
|
||||||
compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd";
|
compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd";
|
||||||
reg = <0x0 0xff320000 0x0 0x1000>;
|
reg = <0x0 0xff320000 0x0 0x1000>;
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <1>;
|
|
||||||
|
|
||||||
pmu_io_domains: io-domains {
|
pmu_io_domains: io-domains {
|
||||||
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
|
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
|
||||||
@ -1493,8 +1491,6 @@
|
|||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
ports {
|
ports {
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
reg = <1>;
|
reg = <1>;
|
||||||
mipi_in: port {
|
mipi_in: port {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
|
Loading…
Reference in New Issue
Block a user