diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-11-28 16:02:10 +0100 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2017-12-26 09:15:44 +0100 |
commit | 771942dd936d8e4637abc10790eacef232ac5525 (patch) | |
tree | 0fc3e796feb7424b0ebf622168078b4d066303f2 /arch/arm/boot | |
parent | ARM: dts: imx6qdl: SolidRun: move AR8035 into microsom (diff) | |
download | linux-771942dd936d8e4637abc10790eacef232ac5525.tar.xz linux-771942dd936d8e4637abc10790eacef232ac5525.zip |
ARM: dts: imx6qdl-microsom: rename to imx6qdl-sr-som
Jon and myself feel that "imx6qdl-microsom" is too generic a name for
SolidRun's microsom - some other manufacturer could have their own
microsom. Change the name to the shorter "imx6qdl-sr-som".
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/imx6q-h100.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-sr-som.dtsi (renamed from arch/arm/boot/dts/imx6qdl-microsom.dtsi) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6q-h100.dts b/arch/arm/boot/dts/imx6q-h100.dts index bf5dfc9c8127..815e9437e3f0 100644 --- a/arch/arm/boot/dts/imx6q-h100.dts +++ b/arch/arm/boot/dts/imx6q-h100.dts @@ -42,7 +42,7 @@ /dts-v1/; #include "imx6q.dtsi" -#include "imx6qdl-microsom.dtsi" +#include "imx6qdl-sr-som.dtsi" / { model = "Auvidea H100"; diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi index 57ce2dbb6ad9..0bc1734d8bdf 100644 --- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi @@ -38,7 +38,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ -#include "imx6qdl-microsom.dtsi" +#include "imx6qdl-sr-som.dtsi" #include <dt-bindings/input/input.h> #include <dt-bindings/gpio/gpio.h> diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi index afd981e9b5e3..246984992ad0 100644 --- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi +++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi @@ -38,7 +38,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ -#include "imx6qdl-microsom.dtsi" +#include "imx6qdl-sr-som.dtsi" / { chosen { diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi index c1541f2ecf3a..c1541f2ecf3a 100644 --- a/arch/arm/boot/dts/imx6qdl-microsom.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi |