From c981cb8dda0eb5bd182e8efc5f25a5e311212ba6 Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Sat, 29 Sep 2018 14:10:16 -0500 Subject: [PATCH] ARM: DTS: Remove unnecessary u-boot.dtsi options from omap3/36xx With the introduction of the omap serial driver, the need for some of these U-Boot specific modifications is gone. This cleans up this unnneeded stuff. Signed-off-by: Adam Ford --- .../logicpd-torpedo-37xx-devkit-u-boot.dtsi | 20 ------------------- arch/arm/dts/omap3-u-boot.dtsi | 18 ----------------- arch/arm/dts/omap36xx-u-boot.dtsi | 9 --------- 3 files changed, 47 deletions(-) delete mode 100644 arch/arm/dts/omap3-u-boot.dtsi delete mode 100644 arch/arm/dts/omap36xx-u-boot.dtsi diff --git a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi index d584b4a9ab..41ed5d7e17 100644 --- a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi +++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi @@ -4,14 +4,6 @@ * Logic PD - http://www.logicpd.com */ -/ { - model = "LogicPD Zoom OMAP3 Development Kit"; - - chosen { - stdout-path = &uart1; - }; -}; - &i2c1 { clock-frequency = <400000>; }; @@ -28,15 +20,3 @@ status = "disabled"; }; -&uart1 { - reg-shift = <2>; -}; - -&uart2 { - reg-shift = <2>; -}; - -&uart3 { - reg-shift = <2>; -}; - diff --git a/arch/arm/dts/omap3-u-boot.dtsi b/arch/arm/dts/omap3-u-boot.dtsi deleted file mode 100644 index 633153a41e..0000000000 --- a/arch/arm/dts/omap3-u-boot.dtsi +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017 - * Logic PD - http://www.logicpd.com - */ - -&uart1 { - reg-shift = <2>; -}; - -&uart2 { - reg-shift = <2>; -}; - -&uart3 { - reg-shift = <2>; -}; - diff --git a/arch/arm/dts/omap36xx-u-boot.dtsi b/arch/arm/dts/omap36xx-u-boot.dtsi deleted file mode 100644 index 374499dcb2..0000000000 --- a/arch/arm/dts/omap36xx-u-boot.dtsi +++ /dev/null @@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017 - * Logic PD - http://www.logicpd.com - */ - -&uart4 { - reg-shift = <2>; -}; -- 2.25.1