diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 19:23:58 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 19:23:58 +0300 |
commit | d34dc4f9e88e4b6beefb819e4e743fd6160a9b75 (patch) | |
tree | 81c6938c282161cc3eb037e101a28f36d154d02c /arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | |
parent | 2144de826e1eeac0c2e30a22029b3330d8bb813c (diff) | |
parent | bb1518f39bec1b3061425ad378793cf9c4bdb3d2 (diff) | |
download | linux-d34dc4f9e88e4b6beefb819e4e743fd6160a9b75.tar.xz |
Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC 64-bit changes from Olof Johansson:
"Mostly DT updates for arm64, but also a couple of Kconfig additions.
Main contents:
- Qualcomm MSM8916/APQ8016
- Spreadtrum SC9836
- Xilinx ZynqMP
- pincontrol entries for MediaTek MT8173"
* tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
arm64: dts: add interrupt-affinity property to pmu node for juno
arm64: dts: Add Qualcomm APQ8016 SBC evaluation board dts
arm64: dts: Add Qualcomm MSM8916 SoC and evaluation board dts
arm64: dts: sprd: adding coresight entries to Spreadtrum SC9836
arm64: Add support for Spreadtrum's Sharkl64 Platform in Kconfig and defconfig
arm64: dts: Add support for Spreadtrum SC9836 SoC in dts and Makefile
ARM64: Add new Xilinx ZynqMP SoC
arm64: qcom: Add support for Qualcomm MSM8916 SoC
arm64: dts: mt8173: Add pinctrl/GPIO/EINT node for mt8173.
arm64: mediatek: Select PINCTRL for Mediatek platform
Diffstat (limited to 'arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi new file mode 100644 index 000000000000..703a4f16e711 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2015, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "msm8916.dtsi" + +/ { + aliases { + serial0 = &blsp1_uart2; + }; + + chosen { + stdout-path = "serial0"; + }; + + soc { + serial@78b0000 { + status = "okay"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&blsp1_uart2_default>; + pinctrl-1 = <&blsp1_uart2_sleep>; + }; + }; +}; |