Merge tag 'arm-soc/for-4.1/devicetree-part-2' of http://github.com/broadcom/stblinux...

Pull "This pull request contains the following changes from Ray for Cygnus SoCs: from Florian Fainelli:

- enable IOMUX, required for pinmux/pinctrl
- enable GPIO, required for the GPIO driver
- enable GPIO hook detection for BCM911360-based phone designs
- enable PCIe controller for the bcm958300k designs

* tag 'arm-soc/for-4.1/devicetree-part-2' of http://github.com/broadcom/stblinux:
  ARM: dts: enable PCIe support for Cygnus
  ARM: dts: cygnus: enable GPIO based hook detection
  ARM: dts: enable GPIO for Broadcom Cygnus
  ARM: dts: enable IOMUX for Broadcom Cygnus

diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
index ff5fb6ab0b9748dbecd27fd7432c4f8306f5221d..7b52c33ea69aedefa667a9a96460a6d5cb4fefc4 100644 (file)
--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -54,6 +54,42 @@
 
        /include/ "bcm-cygnus-clock.dtsi"
 
+       pinctrl: pinctrl@0x0301d0c8 {
+               compatible = "brcm,cygnus-pinmux";
+               reg = <0x0301d0c8 0x30>,
+                     <0x0301d24c 0x2c>;
+       };
+
+       gpio_crmu: gpio@03024800 {
+               compatible = "brcm,cygnus-crmu-gpio";
+               reg = <0x03024800 0x50>,
+                     <0x03024008 0x18>;
+               #gpio-cells = <2>;
+               gpio-controller;
+       };
+
+       gpio_ccm: gpio@1800a000 {
+               compatible = "brcm,cygnus-ccm-gpio";
+               reg = <0x1800a000 0x50>,
+                     <0x0301d164 0x20>;
+               #gpio-cells = <2>;
+               gpio-controller;
+               interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-controller;
+       };
+
+       gpio_asiu: gpio@180a5000 {
+               compatible = "brcm,cygnus-asiu-gpio";
+               reg = <0x180a5000 0x668>;
+               #gpio-cells = <2>;
+               gpio-controller;
+
+               pinmux = <&pinctrl>;
+
+               interrupt-controller;
+               interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+       };
+
        amba {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -90,6 +126,48 @@
                status = "disabled";
        };
 
+       pcie0: pcie@18012000 {
+               compatible = "brcm,iproc-pcie";
+               reg = <0x18012000 0x1000>;
+
+               #interrupt-cells = <1>;
+               interrupt-map-mask = <0 0 0 0>;
+               interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>;
+
+               linux,pci-domain = <0>;
+
+               bus-range = <0x00 0xff>;
+
+               #address-cells = <3>;
+               #size-cells = <2>;
+               device_type = "pci";
+               ranges = <0x81000000 0 0          0x28000000 0 0x00010000
+                         0x82000000 0 0x20000000 0x20000000 0 0x04000000>;
+
+               status = "disabled";
+       };
+
+       pcie1: pcie@18013000 {
+               compatible = "brcm,iproc-pcie";
+               reg = <0x18013000 0x1000>;
+
+               #interrupt-cells = <1>;
+               interrupt-map-mask = <0 0 0 0>;
+               interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>;
+
+               linux,pci-domain = <1>;
+
+               bus-range = <0x00 0xff>;
+
+               #address-cells = <3>;
+               #size-cells = <2>;
+               device_type = "pci";
+               ranges = <0x81000000 0 0          0x48000000 0 0x00010000
+                         0x82000000 0 0x40000000 0x40000000 0 0x04000000>;
+
+               status = "disabled";
+       };
+
        uart0: serial@18020000 {
                compatible = "snps,dw-apb-uart";
                reg = <0x18020000 0x100>;

diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts
index d2ee952805488df5c410fad41ccbf2d66d4d45e7..7db484323fd62dc7ed9a988e6a3008597f59467f 100644 (file)
--- a/arch/arm/boot/dts/bcm911360_entphn.dts
+++ b/arch/arm/boot/dts/bcm911360_entphn.dts
@@ -33,6 +33,7 @@
 /dts-v1/;
 
 #include "bcm-cygnus.dtsi"
+#include "dt-bindings/input/input.h"
 
 / {
        model = "Cygnus Enterprise Phone (BCM911360_ENTPHN)";
@@ -50,4 +51,16 @@
        uart3: serial@18023000 {
                status = "okay";
        };
+
+       gpio_keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               hook {
+                       label = "HOOK";
+                       linux,code = <KEY_O>;
+                       gpios = <&gpio_asiu 48 0>;
+               };
+       };
 };

diff --git a/arch/arm/boot/dts/bcm958300k.dts b/arch/arm/boot/dts/bcm958300k.dts
index f1bb36f3975ca3c356639d3c58424a613eab5257..c9eb8565eac5be2b3d0299218919b4a8a918bd94 100644 (file)
--- a/arch/arm/boot/dts/bcm958300k.dts
+++ b/arch/arm/boot/dts/bcm958300k.dts
@@ -47,6 +47,14 @@
                bootargs = "console=ttyS0,115200";
        };
 
+       pcie0: pcie@18012000 {
+               status = "okay";
+       };
+
+       pcie1: pcie@18013000 {
+               status = "okay";
+       };
+
        uart3: serial@18023000 {
                status = "okay";
        };