From patchwork Mon Aug 24 09:28:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varadarajan Narayanan X-Patchwork-Id: 7062591 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6DF0E9F305 for ; Mon, 24 Aug 2015 09:28:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 641682073C for ; Mon, 24 Aug 2015 09:28:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E81C2046F for ; Mon, 24 Aug 2015 09:28:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933080AbbHXJ22 (ORCPT ); Mon, 24 Aug 2015 05:28:28 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:32867 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932658AbbHXJ20 (ORCPT ); Mon, 24 Aug 2015 05:28:26 -0400 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 7ACB4140D4E; Mon, 24 Aug 2015 09:28:25 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 67F2F140D53; Mon, 24 Aug 2015 09:28:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from codeaurora.org (unknown [202.46.23.62]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: varada@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 34CEA140D66; Mon, 24 Aug 2015 09:28:17 +0000 (UTC) Date: Mon, 24 Aug 2015 14:58:13 +0530 From: Varadarajan Narayanan To: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , Andy Gross , David Brown , Varadarajan Narayanan , Stephen Boyd , Lina Iyer , Georgi Djakov , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org Subject: [PATCH v3] qcom: ipq40xx: Add basic board/dts support for IPQ40XX SoC Message-ID: <20150824092813.GA15581@codeaurora.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add initial dts files and SoC support for IPQ40XX Signed-off-by: Varadarajan Narayanan --- Changes in v2: - Added devicetree bindings documentation Changes in v3: - Split 'gcnt' into a separate patch - Added the new entries to Makefiles, Kconfig & board.c in sorted order - Used "qcom,ipq40xx" instead of "qcom,ipq40xx-r3pc" in board.c Documentation/devicetree/bindings/qcom.txt | 16 ++++++ arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/qcom-ipq40xx-r3pc.dts | 33 ++++++++++++ arch/arm/boot/dts/qcom-ipq40xx.dtsi | 81 ++++++++++++++++++++++++++++++ arch/arm/configs/ipq_defconfig | 1 + arch/arm/mach-qcom/Kconfig | 4 ++ arch/arm/mach-qcom/board.c | 1 + 7 files changed, 137 insertions(+) create mode 100644 Documentation/devicetree/bindings/qcom.txt create mode 100644 arch/arm/boot/dts/qcom-ipq40xx-r3pc.dts create mode 100644 arch/arm/boot/dts/qcom-ipq40xx.dtsi diff --git a/Documentation/devicetree/bindings/qcom.txt b/Documentation/devicetree/bindings/qcom.txt new file mode 100644 index 0000000..7d56bd0 --- /dev/null +++ b/Documentation/devicetree/bindings/qcom.txt @@ -0,0 +1,16 @@ +Qualcomm IPQ device tree bindings +--------------------------------- + +System on Chip + +Device tree must specify which SoC it uses, with one of the +following compatible strings + + "qcom,ipq40xx" + +Platform + +Device tree must specify which Platform it uses, with one of the +following compatible strings + + "qcom,ipq40xx-r3pc" diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 246473a..d20d49c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -474,6 +474,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-apq8074-dragonboard.dtb \ qcom-apq8084-ifc6540.dtb \ qcom-apq8084-mtp.dtb \ + qcom-ipq40xx-r3pc.dtb \ qcom-ipq8064-ap148.dtb \ qcom-msm8660-surf.dtb \ qcom-msm8960-cdp.dtb \ diff --git a/arch/arm/boot/dts/qcom-ipq40xx-r3pc.dts b/arch/arm/boot/dts/qcom-ipq40xx-r3pc.dts new file mode 100644 index 0000000..7e4e629 --- /dev/null +++ b/arch/arm/boot/dts/qcom-ipq40xx-r3pc.dts @@ -0,0 +1,33 @@ +/* Copyright (c) 2014, 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 "qcom-ipq40xx.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. IPQ40XX R3PC"; + compatible = "qcom,ipq40xx-r3pc", "qcom,ipq40xx"; + + memory { + device_type = "memory"; + reg = <0x80000000 0x20000000>; /* 512MB */ + }; + + chosen { + bootargs = "root=/dev/ram rw init=/init console=ttyMSM0,115200n8 initrd=0x82000000,0x000E2246"; + }; + + soc { + serial@78b0000 { + status = "ok"; + }; + }; +}; diff --git a/arch/arm/boot/dts/qcom-ipq40xx.dtsi b/arch/arm/boot/dts/qcom-ipq40xx.dtsi new file mode 100644 index 0000000..f572f38 --- /dev/null +++ b/arch/arm/boot/dts/qcom-ipq40xx.dtsi @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2014, 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. + */ + +/dts-v1/; + +#include "skeleton.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. IPQ40XX"; + compatible = "qcom,ipq40xx"; + interrupt-parent = <&intc>; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + cpu@0 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x0>; + }; + + cpu@1 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x1>; + }; + + cpu@2 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x2>; + }; + + cpu@3 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x3>; + }; + }; + + soc { + #address-cells = <1>; + #size-cells = <1>; + ranges; + compatible = "simple-bus"; + + intc: interrupt-controller@b000000 { + compatible = "qcom,msm-qgic2"; + interrupt-controller; + #interrupt-cells = <3>; + reg = <0x0b000000 0x1000>, + <0x0b002000 0x1000>; + }; + + timer { + compatible = "arm,armv7-timer"; + interrupts = <1 2 0xf08>, + <1 3 0xf08>, + <1 4 0xf08>, + <1 1 0xf08>; + clock-frequency = <20833333>; + }; + + serial@78b0000 { + compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; + reg = <0x78b0000 0x200>; + interrupts = <0 108 0>; + status = "disabled"; + }; + }; +}; diff --git a/arch/arm/configs/ipq_defconfig b/arch/arm/configs/ipq_defconfig index 1cabd8b..89bf8ad 100644 --- a/arch/arm/configs/ipq_defconfig +++ b/arch/arm/configs/ipq_defconfig @@ -21,6 +21,7 @@ CONFIG_ARCH_QCOM=y CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y CONFIG_ARCH_MSM8974=y +CONFIG_ARCH_IPQ40XX=y CONFIG_ARCH_IPQ8064=y CONFIG_SMP=y CONFIG_PREEMPT=y diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index fab49a2..70812aa 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -22,6 +22,10 @@ config ARCH_MSM8974 bool "Enable support for MSM8974" select HAVE_ARM_ARCH_TIMER +config ARCH_IPQ40XX + bool "Enable support for IPQ40XX" + select HAVE_ARM_ARCH_TIMER + config ARCH_IPQ8064 bool "Enable support for IPQ806x" select CLKSRC_QCOM diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c index 6d8bbf7..af9e247 100644 --- a/arch/arm/mach-qcom/board.c +++ b/arch/arm/mach-qcom/board.c @@ -18,6 +18,7 @@ static const char * const qcom_dt_match[] __initconst = { "qcom,apq8064", "qcom,apq8074-dragonboard", "qcom,apq8084", + "qcom,ipq40xx", "qcom,ipq8062", "qcom,ipq8064", "qcom,msm8660-surf",