diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-14 12:35:43 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-14 12:35:43 +0100 |
| commit | 42e952b38a764909e7c37a2abfc1f8642e03a910 (patch) | |
| tree | 4e822b9b1a57e02c4bc51c5eaf848c74b5afd2c3 /arch/arm/dts | |
| parent | d39a63184c7524f7329a8316228554c123903b29 (diff) | |
| parent | c3223f98c02ff6d90c11b62c914648d3025a944d (diff) | |
| download | barebox-42e952b38a764909e7c37a2abfc1f8642e03a910.tar.gz barebox-42e952b38a764909e7c37a2abfc1f8642e03a910.tar.xz | |
Merge branch 'for-next/arm'
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/am33xx-strip.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/dts/am33xx.dtsi | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/dts/am33xx-strip.dtsi b/arch/arm/dts/am33xx-strip.dtsi index 2943fd1cc3..83d23a88e8 100644 --- a/arch/arm/dts/am33xx-strip.dtsi +++ b/arch/arm/dts/am33xx-strip.dtsi @@ -14,6 +14,7 @@ /delete-property/ mmc2; /delete-property/ d_can0; /delete-property/ d_can1; + /delete-property/ spi1; }; }; diff --git a/arch/arm/dts/am33xx.dtsi b/arch/arm/dts/am33xx.dtsi index 7ba0a0b3d5..f1ee7b3c57 100644 --- a/arch/arm/dts/am33xx.dtsi +++ b/arch/arm/dts/am33xx.dtsi @@ -18,5 +18,7 @@ mmc0 = &mmc1; mmc1 = &mmc2; mmc2 = &mmc3; + spi0 = &spi0; + spi1 = &spi1; }; }; |