diff options
| author | Tom Rini <trini@konsulko.com> | 2018-08-30 10:06:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-30 10:06:19 -0400 |
| commit | 4b69e870e94c8db9915e218037529289c27625b3 (patch) | |
| tree | ff1dcacd16e587c386dbe6dba75121eb6da4a311 | |
| parent | 284d201b4d9c17bc92044f825ce44550d66841cd (diff) | |
| parent | feb64f9d51f3f2813aca905abe189c162fbf09b1 (diff) | |
| download | u-boot-4b69e870e94c8db9915e218037529289c27625b3.zip u-boot-4b69e870e94c8db9915e218037529289c27625b3.tar.gz u-boot-4b69e870e94c8db9915e218037529289c27625b3.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-rockchip
| -rw-r--r-- | arch/arm/dts/rk3288-evb.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/rk3288-firefly.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/rk3288-tinker.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/rk3288-veyron.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/rk3288.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/rk3328.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/rk3399-puma.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/rk3399.dtsi | 4 |
8 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/dts/rk3288-evb.dtsi b/arch/arm/dts/rk3288-evb.dtsi index 17c79d3..ce75bd5 100644 --- a/arch/arm/dts/rk3288-evb.dtsi +++ b/arch/arm/dts/rk3288-evb.dtsi @@ -19,8 +19,6 @@ keys: gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; button@0 { gpio-key,wakeup = <1>; diff --git a/arch/arm/dts/rk3288-firefly.dtsi b/arch/arm/dts/rk3288-firefly.dtsi index de5e8f2..2239ab9 100644 --- a/arch/arm/dts/rk3288-firefly.dtsi +++ b/arch/arm/dts/rk3288-firefly.dtsi @@ -25,8 +25,6 @@ keys: gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; button@0 { gpio-key,wakeup = <1>; diff --git a/arch/arm/dts/rk3288-tinker.dtsi b/arch/arm/dts/rk3288-tinker.dtsi index a752458..2f816af 100644 --- a/arch/arm/dts/rk3288-tinker.dtsi +++ b/arch/arm/dts/rk3288-tinker.dtsi @@ -55,8 +55,6 @@ gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; pinctrl-names = "default"; diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi index 4b66f6b..92b6887 100644 --- a/arch/arm/dts/rk3288-veyron.dtsi +++ b/arch/arm/dts/rk3288-veyron.dtsi @@ -83,8 +83,6 @@ gpio_keys: gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&pwr_key_h>; diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi index 9f3f6f5..273d38c 100644 --- a/arch/arm/dts/rk3288.dtsi +++ b/arch/arm/dts/rk3288.dtsi @@ -841,8 +841,6 @@ #size-cells = <0>; status = "disabled"; ports { - #address-cells = <1>; - #size-cells = <0>; reg = <1>; mipi_in: port { #address-cells = <1>; diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi index 6095a12..2d80add 100644 --- a/arch/arm/dts/rk3328.dtsi +++ b/arch/arm/dts/rk3328.dtsi @@ -189,8 +189,6 @@ u-boot,dm-pre-reloc; compatible = "rockchip,rk3328-grf", "syscon", "simple-mfd"; reg = <0x0 0xff100000 0x0 0x1000>; - #address-cells = <1>; - #size-cells = <1>; io_domains: io-domains { compatible = "rockchip,rk3328-io-voltage-domain"; diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi index 3584031..6e7e1e3 100644 --- a/arch/arm/dts/rk3399-puma.dtsi +++ b/arch/arm/dts/rk3399-puma.dtsi @@ -208,8 +208,6 @@ }; &hdmi { - #address-cells = <1>; - #size-cells = <0>; #sound-dai-cells = <0>; status = "okay"; }; diff --git a/arch/arm/dts/rk3399.dtsi b/arch/arm/dts/rk3399.dtsi index 83c257b..a55a6c6 100644 --- a/arch/arm/dts/rk3399.dtsi +++ b/arch/arm/dts/rk3399.dtsi @@ -1015,8 +1015,6 @@ u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd"; reg = <0x0 0xff320000 0x0 0x1000>; - #address-cells = <1>; - #size-cells = <1>; pmu_io_domains: io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; @@ -1493,8 +1491,6 @@ #size-cells = <0>; status = "disabled"; ports { - #address-cells = <1>; - #size-cells = <0>; reg = <1>; mipi_in: port { #address-cells = <1>; |