diff options
| author | Tom Rini <trini@konsulko.com> | 2018-08-07 21:36:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-07 21:36:20 -0400 |
| commit | fc82e7684ba31a1a6ef721e7d750f37117906a70 (patch) | |
| tree | b8ebeb9450162362a4f93194d44d3219f1b99a58 /arch | |
| parent | b1aad8dbe28415695b290726199681ced969c118 (diff) | |
| parent | 972d8576d225c5fa8187ba09306fd439967ca7d8 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/exynos4210-pinctrl-uboot.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/exynos4210-universal_c210.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/exynos5.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/exynos5250-pinctrl-uboot.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/exynos5250-spring.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi | 8 |
7 files changed, 1 insertions, 25 deletions
diff --git a/arch/arm/dts/exynos4210-pinctrl-uboot.dtsi b/arch/arm/dts/exynos4210-pinctrl-uboot.dtsi index ba0fd4d2cd..aeeecd6283 100644 --- a/arch/arm/dts/exynos4210-pinctrl-uboot.dtsi +++ b/arch/arm/dts/exynos4210-pinctrl-uboot.dtsi @@ -7,8 +7,6 @@ /{ pinctrl_0: pinctrl@11400000 { - #address-cells = <1>; - #size-cells = <1>; compatible = "samsung,exynos4210-pinctrl"; }; @@ -21,8 +19,6 @@ }; pinctrl_2: pinctrl@03860000 { - #address-cells = <1>; - #size-cells = <1>; }; }; diff --git a/arch/arm/dts/exynos4210-universal_c210.dts b/arch/arm/dts/exynos4210-universal_c210.dts index 59ea5a633e..610a8ad2e7 100644 --- a/arch/arm/dts/exynos4210-universal_c210.dts +++ b/arch/arm/dts/exynos4210-universal_c210.dts @@ -25,8 +25,6 @@ gpio-mosi = <&gpy3 3 0>; gpio-miso = <&gpy3 0 0>; spi-delay-us = <1>; - #address-cells = <1>; - #size-cells = <0>; cs@0 { }; }; diff --git a/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi b/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi index 7409e76a59..955e14ef8f 100644 --- a/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi +++ b/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi @@ -32,13 +32,9 @@ }; pinctrl_2: pinctrl@03860000 { - #address-cells = <1>; - #size-cells = <1>; }; pinctrl_3: pinctrl@106E0000 { - #address-cells = <1>; - #size-cells = <1>; }; }; diff --git a/arch/arm/dts/exynos5.dtsi b/arch/arm/dts/exynos5.dtsi index 6102978aa4..cdc965d90d 100644 --- a/arch/arm/dts/exynos5.dtsi +++ b/arch/arm/dts/exynos5.dtsi @@ -147,8 +147,6 @@ dp: dp@145b0000 { compatible = "samsung,exynos5-dp"; reg = <0x145b0000 0x1000>; - #address-cells = <1>; - #size-cells = <1>; }; xhci0: xhci@12000000 { diff --git a/arch/arm/dts/exynos5250-pinctrl-uboot.dtsi b/arch/arm/dts/exynos5250-pinctrl-uboot.dtsi index f19ce47b41..b414805319 100644 --- a/arch/arm/dts/exynos5250-pinctrl-uboot.dtsi +++ b/arch/arm/dts/exynos5250-pinctrl-uboot.dtsi @@ -18,8 +18,6 @@ }; pinctrl_1: pinctrl@13400000 { - #address-cells = <1>; - #size-cells = <1>; }; pinctrl_2: pinctrl@10d10000 { @@ -34,8 +32,6 @@ }; pinctrl_3: pinctrl@03860000 { - #address-cells = <1>; - #size-cells = <1>; }; }; diff --git a/arch/arm/dts/exynos5250-spring.dts b/arch/arm/dts/exynos5250-spring.dts index b73b572e62..7633d36874 100644 --- a/arch/arm/dts/exynos5250-spring.dts +++ b/arch/arm/dts/exynos5250-spring.dts @@ -31,7 +31,7 @@ spi2 = "/spi@12d40000"; spi3 = "/spi@131a0000"; spi4 = "/spi@131b0000"; - mmc0 = "/mmc@12000000"; + mmc0 = "/mmc@12200000"; serial0 = "/serial@12C30000"; console = "/serial@12C30000"; i2s = "/sound@3830000"; diff --git a/arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi b/arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi index 7265387639..4fcbe71fe5 100644 --- a/arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi +++ b/arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi @@ -12,8 +12,6 @@ * numbers are not needed in U-Boot for exynos. */ pinctrl@14010000 { - #address-cells = <1>; - #size-cells = <1>; }; pinctrl@13400000 { #address-cells = <1>; @@ -26,16 +24,10 @@ }; }; pinctrl@13410000 { - #address-cells = <1>; - #size-cells = <1>; }; pinctrl@14000000 { - #address-cells = <1>; - #size-cells = <1>; }; pinctrl@03860000 { - #address-cells = <1>; - #size-cells = <1>; }; }; |