diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-09-11 08:26:30 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-09-11 17:23:13 +0200 |
| commit | 35f607bc7da71b302fd6bf3d6d48d7ea66df1195 (patch) | |
| tree | dd2cf14c56430d21079c794fa6e03d7f5d91070e /arch | |
| parent | 625eea2765d94aee016cf25d9cabecde8eae0775 (diff) | |
| download | barebox-35f607bc7da71b302fd6bf3d6d48d7ea66df1195.tar.gz barebox-35f607bc7da71b302fd6bf3d6d48d7ea66df1195.tar.xz | |
dts: update to v4.19-rc1
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/am33xx-strip.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/dts/tegra20-colibri.dtsi | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/dts/am33xx-strip.dtsi b/arch/arm/dts/am33xx-strip.dtsi index 83d23a88e8..0c9d852630 100644 --- a/arch/arm/dts/am33xx-strip.dtsi +++ b/arch/arm/dts/am33xx-strip.dtsi @@ -12,8 +12,8 @@ /delete-property/ i2c1; /delete-property/ i2c2; /delete-property/ mmc2; - /delete-property/ d_can0; - /delete-property/ d_can1; + /delete-property/ d-can0; + /delete-property/ d-can1; /delete-property/ spi1; }; }; diff --git a/arch/arm/dts/tegra20-colibri.dtsi b/arch/arm/dts/tegra20-colibri.dtsi index e931c07406..4f6dc9daf2 100644 --- a/arch/arm/dts/tegra20-colibri.dtsi +++ b/arch/arm/dts/tegra20-colibri.dtsi @@ -1,2 +1,2 @@ -#include <arm/tegra20-colibri-512.dtsi> +#include <arm/tegra20-colibri.dtsi> #include "tegra20.dtsi" |