diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-02-27 09:40:19 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-01 14:29:51 +0100 |
| commit | a9c5f6b9ec883ee9dafd6d393600acc6fd263043 (patch) | |
| tree | 35621cff332a0c95509b04b2e4170f0eda1f0ecf /arch | |
| parent | 5ba0e42cb24afdf59d48930daf495c148312fc67 (diff) | |
| download | barebox-a9c5f6b9ec883ee9dafd6d393600acc6fd263043.tar.gz barebox-a9c5f6b9ec883ee9dafd6d393600acc6fd263043.tar.xz | |
dts: update to v4.16-rc1
Also includeded:
ARM: dts: am33xx: do not delete no longer existing clocks
Several clocks are removed from the am33xx dts files with v4.16-rc1.
Remove the corresponding /delete-node/ directives aswell to avoid
dtc breakage.
Also included:
ARM: dts: imx6qdl: SolidRun: Fix upstream include
Upstream dts file way renamed, so change include name accordingly.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/am33xx-clocks-strip.dtsi | 13 | ||||
| -rw-r--r-- | arch/arm/dts/imx6qdl-hummingboard2.dtsi | 3 |
2 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/dts/am33xx-clocks-strip.dtsi b/arch/arm/dts/am33xx-clocks-strip.dtsi index 831f1630f9..92906deafe 100644 --- a/arch/arm/dts/am33xx-clocks-strip.dtsi +++ b/arch/arm/dts/am33xx-clocks-strip.dtsi @@ -34,10 +34,8 @@ /delete-node/ &dpll_per_m2_ck; /delete-node/ &dpll_per_m2_div4_wkupdm_ck; /delete-node/ &dpll_per_m2_div4_ck; -/delete-node/ &cefuse_fck; /delete-node/ &clk_24mhz; /delete-node/ &clkdiv32k_ck; -/delete-node/ &clkdiv32k_ick; /delete-node/ &l3_gclk; /delete-node/ &pruss_ocp_gclk; /delete-node/ &mmu_fck; @@ -59,21 +57,10 @@ /delete-node/ &l4ls_gclk; /delete-node/ &sysclk_div_ck; /delete-node/ &gpio0_dbclk_mux_ck; -/delete-node/ &gpio0_dbclk; -/delete-node/ &gpio1_dbclk; -/delete-node/ &gpio2_dbclk; -/delete-node/ &gpio3_dbclk; /delete-node/ &lcd_gclk; /delete-node/ &mmc_clk; /delete-node/ &gfx_fclk_clksel_ck; /delete-node/ &gfx_fck_div_ck; /delete-node/ &sysclkout_pre_ck; /delete-node/ &clkout2_div_ck; -/delete-node/ &dbg_sysclk_ck; -/delete-node/ &dbg_clka_ck; -/delete-node/ &stm_pmd_clock_mux_ck; -/delete-node/ &trace_pmd_clk_mux_ck; -/delete-node/ &stm_clk_div_ck; -/delete-node/ &trace_clk_div_ck; /delete-node/ &clkout2_ck; -/delete-node/ &clk_24mhz_clkdm; diff --git a/arch/arm/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/dts/imx6qdl-hummingboard2.dtsi index 2a5f389378..20152246a0 100644 --- a/arch/arm/dts/imx6qdl-hummingboard2.dtsi +++ b/arch/arm/dts/imx6qdl-hummingboard2.dtsi @@ -40,8 +40,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ -#include <arm/imx6qdl-microsom.dtsi> -#include <arm/imx6qdl-microsom-ar8035.dtsi> +#include <arm/imx6qdl-sr-som.dtsi> / { chosen { |