]> Git Repo - linux.git/commitdiff
Merge tag 'vexpress-for-v4.6/dt-updates' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <[email protected]>
Wed, 24 Feb 2016 21:40:18 +0000 (13:40 -0800)
committerOlof Johansson <[email protected]>
Wed, 24 Feb 2016 21:40:18 +0000 (13:40 -0800)
Few updates for ARM VExpress/Juno platforms

1. GICv3 support on Foundation models

2. Support for Juno R2 board

3. Support for ARM HDLCD on all Juno platforms

* tag 'vexpress-for-v4.6/dt-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  arm64: dts: Add HDLCD support on Juno platforms
  Documentation: drm: Add DT bindings for ARM HDLCD
  arm64: dts: Add support for Juno r2 board
  arm64: dts: move juno pcie-controller to base file
  arm64: dts: add .dts for GICv3 Foundation model
  arm64: dts: split Foundation model dts to put the GIC separately
  arm64: dts: Foundation model: increase GICC region to allow EOImode=1
  arm64: dts: prepare foundation-v8.dts to cope with GICv3

Signed-off-by: Olof Johansson <[email protected]>
1  2 
arch/arm64/boot/dts/arm/juno-base.dtsi

index e5b59ca9debb1916764746bb168d969572e17771,31d5d44db233691ffc4a13737cb78be00de46e06..4b6172b0f2cb5ed9fbe9bf361f6209d662a36177
                };
        };
  
+       pcie_ctlr: pcie-controller@40000000 {
+               compatible = "arm,juno-r1-pcie", "plda,xpressrich3-axi", "pci-host-ecam-generic";
+               device_type = "pci";
+               reg = <0 0x40000000 0 0x10000000>;      /* ECAM config space */
+               bus-range = <0 255>;
+               linux,pci-domain = <0>;
+               #address-cells = <3>;
+               #size-cells = <2>;
+               dma-coherent;
+               ranges = <0x01000000 0x00 0x5f800000 0x00 0x5f800000 0x0 0x00800000>,
+                        <0x02000000 0x00 0x50000000 0x00 0x50000000 0x0 0x08000000>,
+                        <0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>;
+               #interrupt-cells = <1>;
+               interrupt-map-mask = <0 0 0 7>;
+               interrupt-map = <0 0 0 1 &gic 0 0 0 136 4>,
+                               <0 0 0 2 &gic 0 0 0 137 4>,
+                               <0 0 0 3 &gic 0 0 0 138 4>,
+                               <0 0 0 4 &gic 0 0 0 139 4>;
+               msi-parent = <&v2m_0>;
+               status = "disabled";
+       };
        scpi {
                compatible = "arm,scpi";
                mboxes = <&mailbox 1>;
                        scpi_clk: scpi_clocks@3 {
                                compatible = "arm,scpi-variable-clocks";
                                #clock-cells = <1>;
-                               clock-indices = <3>, <4>;
-                               clock-output-names = "pxlclk0", "pxlclk1";
+                               clock-indices = <3>;
+                               clock-output-names = "pxlclk";
                        };
                };
  
                             <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>,
 +                           <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
                clock-names = "apb_pclk";
        };
  
+       hdlcd@7ff50000 {
+               compatible = "arm,hdlcd";
+               reg = <0 0x7ff50000 0 0x1000>;
+               interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&scpi_clk 3>;
+               clock-names = "pxlclk";
+               port {
+                       hdlcd1_output: endpoint@0 {
+                               remote-endpoint = <&tda998x_1_input>;
+                       };
+               };
+       };
+       hdlcd@7ff60000 {
+               compatible = "arm,hdlcd";
+               reg = <0 0x7ff60000 0 0x1000>;
+               interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&scpi_clk 3>;
+               clock-names = "pxlclk";
+               port {
+                       hdlcd0_output: endpoint@0 {
+                               remote-endpoint = <&tda998x_0_input>;
+                       };
+               };
+       };
        soc_uart0: uart@7ff80000 {
                compatible = "arm,pl011", "arm,primecell";
                reg = <0x0 0x7ff80000 0x0 0x1000>;
                i2c-sda-hold-time-ns = <500>;
                clocks = <&soc_smc50mhz>;
  
-               dvi0: dvi-transmitter@70 {
+               hdmi-transmitter@70 {
                        compatible = "nxp,tda998x";
                        reg = <0x70>;
+                       port {
+                               tda998x_0_input: endpoint@0 {
+                                       remote-endpoint = <&hdlcd0_output>;
+                               };
+                       };
                };
  
-               dvi1: dvi-transmitter@71 {
+               hdmi-transmitter@71 {
                        compatible = "nxp,tda998x";
                        reg = <0x71>;
+                       port {
+                               tda998x_1_input: endpoint@0 {
+                                       remote-endpoint = <&hdlcd1_output>;
+                               };
+                       };
                };
        };
  
This page took 0.072077 seconds and 4 git commands to generate.