mirror of
https://github.com/torvalds/linux.git
synced 2024-12-02 09:01:34 +00:00
Merge branch 'pci/ctrl/rcar-gen2'
- Convert DT binding to json-schema (Herve Codina)
- Add Renesas RZ/N1D (R9A06G032) to rcar-gen2 DT binding (Herve Codina)
- Add Renesas RZ/N1D compatible string ("renesas,pci-rzn1") to rcar-gen2
driver (Herve Codina)
* pci/ctrl/rcar-gen2:
PCI: rcar-gen2: Add RZ/N1 SOC family compatible string
dt-bindings: PCI: renesas,pci-rcar-gen2: Add device tree support for R9A06G032
dt-bindings: PCI: pci-rcar-gen2: Convert bindings to json-schema
This commit is contained in:
Bjorn Helgaas
commit
3aa321dc0a
@ -1,84 +0,0 @@
|
|||||||
Renesas AHB to PCI bridge
|
|
||||||
-------------------------
|
|
||||||
|
|
||||||
This is the bridge used internally to connect the USB controllers to the
|
|
||||||
AHB. There is one bridge instance per USB port connected to the internal
|
|
||||||
OHCI and EHCI controllers.
|
|
||||||
|
|
||||||
Required properties:
|
|
||||||
- compatible: "renesas,pci-r8a7742" for the R8A7742 SoC;
|
|
||||||
"renesas,pci-r8a7743" for the R8A7743 SoC;
|
|
||||||
"renesas,pci-r8a7744" for the R8A7744 SoC;
|
|
||||||
"renesas,pci-r8a7745" for the R8A7745 SoC;
|
|
||||||
"renesas,pci-r8a7790" for the R8A7790 SoC;
|
|
||||||
"renesas,pci-r8a7791" for the R8A7791 SoC;
|
|
||||||
"renesas,pci-r8a7793" for the R8A7793 SoC;
|
|
||||||
"renesas,pci-r8a7794" for the R8A7794 SoC;
|
|
||||||
"renesas,pci-rcar-gen2" for a generic R-Car Gen2 or
|
|
||||||
RZ/G1 compatible device.
|
|
||||||
|
|
||||||
|
|
||||||
When compatible with the generic version, nodes must list the
|
|
||||||
SoC-specific version corresponding to the platform first
|
|
||||||
followed by the generic version.
|
|
||||||
|
|
||||||
- reg: A list of physical regions to access the device: the first is
|
|
||||||
the operational registers for the OHCI/EHCI controllers and the
|
|
||||||
second is for the bridge configuration and control registers.
|
|
||||||
- interrupts: interrupt for the device.
|
|
||||||
- clocks: The reference to the device clock.
|
|
||||||
- bus-range: The PCI bus number range; as this is a single bus, the range
|
|
||||||
should be specified as the same value twice.
|
|
||||||
- #address-cells: must be 3.
|
|
||||||
- #size-cells: must be 2.
|
|
||||||
- #interrupt-cells: must be 1.
|
|
||||||
- interrupt-map: standard property used to define the mapping of the PCI
|
|
||||||
interrupts to the GIC interrupts.
|
|
||||||
- interrupt-map-mask: standard property that helps to define the interrupt
|
|
||||||
mapping.
|
|
||||||
|
|
||||||
Optional properties:
|
|
||||||
- dma-ranges: a single range for the inbound memory region. If not supplied,
|
|
||||||
defaults to 1GiB at 0x40000000. Note there are hardware restrictions on the
|
|
||||||
allowed combinations of address and size.
|
|
||||||
|
|
||||||
Example SoC configuration:
|
|
||||||
|
|
||||||
pci0: pci@ee090000 {
|
|
||||||
compatible = "renesas,pci-r8a7790", "renesas,pci-rcar-gen2";
|
|
||||||
clocks = <&mstp7_clks R8A7790_CLK_EHCI>;
|
|
||||||
reg = <0x0 0xee090000 0x0 0xc00>,
|
|
||||||
<0x0 0xee080000 0x0 0x1100>;
|
|
||||||
interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
status = "disabled";
|
|
||||||
|
|
||||||
bus-range = <0 0>;
|
|
||||||
#address-cells = <3>;
|
|
||||||
#size-cells = <2>;
|
|
||||||
#interrupt-cells = <1>;
|
|
||||||
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
|
|
||||||
interrupt-map-mask = <0xff00 0 0 0x7>;
|
|
||||||
interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
|
|
||||||
0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
|
|
||||||
0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
|
|
||||||
usb@1,0 {
|
|
||||||
reg = <0x800 0 0 0 0>;
|
|
||||||
phys = <&usb0 0>;
|
|
||||||
phy-names = "usb";
|
|
||||||
};
|
|
||||||
|
|
||||||
usb@2,0 {
|
|
||||||
reg = <0x1000 0 0 0 0>;
|
|
||||||
phys = <&usb0 0>;
|
|
||||||
phy-names = "usb";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
Example board setup:
|
|
||||||
|
|
||||||
&pci0 {
|
|
||||||
status = "okay";
|
|
||||||
pinctrl-0 = <&usb0_pins>;
|
|
||||||
pinctrl-names = "default";
|
|
||||||
};
|
|
||||||
186
Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml
Normal file
186
Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml
Normal file
@ -0,0 +1,186 @@
|
|||||||
|
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
||||||
|
%YAML 1.2
|
||||||
|
---
|
||||||
|
$id: http://devicetree.org/schemas/pci/renesas,pci-rcar-gen2.yaml#
|
||||||
|
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||||
|
|
||||||
|
title: Renesas AHB to PCI bridge
|
||||||
|
|
||||||
|
maintainers:
|
||||||
|
- Marek Vasut <marek.vasut+renesas@gmail.com>
|
||||||
|
- Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
|
||||||
|
|
||||||
|
description: |
|
||||||
|
This is the bridge used internally to connect the USB controllers to the
|
||||||
|
AHB. There is one bridge instance per USB port connected to the internal
|
||||||
|
OHCI and EHCI controllers.
|
||||||
|
|
||||||
|
properties:
|
||||||
|
compatible:
|
||||||
|
oneOf:
|
||||||
|
- items:
|
||||||
|
- enum:
|
||||||
|
- renesas,pci-r8a7742 # RZ/G1H
|
||||||
|
- renesas,pci-r8a7743 # RZ/G1M
|
||||||
|
- renesas,pci-r8a7744 # RZ/G1N
|
||||||
|
- renesas,pci-r8a7745 # RZ/G1E
|
||||||
|
- renesas,pci-r8a7790 # R-Car H2
|
||||||
|
- renesas,pci-r8a7791 # R-Car M2-W
|
||||||
|
- renesas,pci-r8a7793 # R-Car M2-N
|
||||||
|
- renesas,pci-r8a7794 # R-Car E2
|
||||||
|
- const: renesas,pci-rcar-gen2 # R-Car Gen2 and RZ/G1
|
||||||
|
- items:
|
||||||
|
- enum:
|
||||||
|
- renesas,pci-r9a06g032 # RZ/N1D
|
||||||
|
- const: renesas,pci-rzn1 # RZ/N1
|
||||||
|
|
||||||
|
reg:
|
||||||
|
items:
|
||||||
|
- description: Operational registers for the OHCI/EHCI controllers.
|
||||||
|
- description: Bridge configuration and control registers.
|
||||||
|
|
||||||
|
interrupts:
|
||||||
|
maxItems: 1
|
||||||
|
|
||||||
|
clocks: true
|
||||||
|
|
||||||
|
clock-names: true
|
||||||
|
|
||||||
|
resets:
|
||||||
|
maxItems: 1
|
||||||
|
|
||||||
|
power-domains:
|
||||||
|
maxItems: 1
|
||||||
|
|
||||||
|
bus-range:
|
||||||
|
description: |
|
||||||
|
The PCI bus number range; as this is a single bus, the range
|
||||||
|
should be specified as the same value twice.
|
||||||
|
|
||||||
|
dma-ranges:
|
||||||
|
description: |
|
||||||
|
A single range for the inbound memory region. If not supplied,
|
||||||
|
defaults to 1GiB at 0x40000000. Note there are hardware restrictions on
|
||||||
|
the allowed combinations of address and size.
|
||||||
|
maxItems: 1
|
||||||
|
|
||||||
|
patternProperties:
|
||||||
|
'usb@[0-1],0':
|
||||||
|
type: object
|
||||||
|
|
||||||
|
description:
|
||||||
|
This a USB controller PCI device
|
||||||
|
|
||||||
|
properties:
|
||||||
|
reg:
|
||||||
|
description:
|
||||||
|
Identify the correct bus, device and function number in the
|
||||||
|
form <bdf 0 0 0 0>.
|
||||||
|
|
||||||
|
items:
|
||||||
|
minItems: 5
|
||||||
|
maxItems: 5
|
||||||
|
|
||||||
|
phys:
|
||||||
|
description:
|
||||||
|
Reference to the USB phy
|
||||||
|
maxItems: 1
|
||||||
|
|
||||||
|
phy-names:
|
||||||
|
maxItems: 1
|
||||||
|
|
||||||
|
required:
|
||||||
|
- reg
|
||||||
|
- phys
|
||||||
|
- phy-names
|
||||||
|
|
||||||
|
unevaluatedProperties: false
|
||||||
|
|
||||||
|
required:
|
||||||
|
- compatible
|
||||||
|
- reg
|
||||||
|
- interrupts
|
||||||
|
- interrupt-map
|
||||||
|
- interrupt-map-mask
|
||||||
|
- clocks
|
||||||
|
- power-domains
|
||||||
|
- bus-range
|
||||||
|
- "#address-cells"
|
||||||
|
- "#size-cells"
|
||||||
|
- "#interrupt-cells"
|
||||||
|
|
||||||
|
allOf:
|
||||||
|
- $ref: /schemas/pci/pci-bus.yaml#
|
||||||
|
|
||||||
|
- if:
|
||||||
|
properties:
|
||||||
|
compatible:
|
||||||
|
contains:
|
||||||
|
enum:
|
||||||
|
- renesas,pci-rzn1
|
||||||
|
then:
|
||||||
|
properties:
|
||||||
|
clocks:
|
||||||
|
items:
|
||||||
|
- description: Internal bus clock (AHB) for HOST
|
||||||
|
- description: Internal bus clock (AHB) Power Management
|
||||||
|
- description: PCI clock for USB subsystem
|
||||||
|
clock-names:
|
||||||
|
items:
|
||||||
|
- const: hclkh
|
||||||
|
- const: hclkpm
|
||||||
|
- const: pciclk
|
||||||
|
required:
|
||||||
|
- clock-names
|
||||||
|
else:
|
||||||
|
properties:
|
||||||
|
clocks:
|
||||||
|
items:
|
||||||
|
- description: Device clock
|
||||||
|
clock-names:
|
||||||
|
items:
|
||||||
|
- const: pclk
|
||||||
|
required:
|
||||||
|
- resets
|
||||||
|
|
||||||
|
unevaluatedProperties: false
|
||||||
|
|
||||||
|
examples:
|
||||||
|
- |
|
||||||
|
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||||
|
#include <dt-bindings/clock/r8a7790-cpg-mssr.h>
|
||||||
|
#include <dt-bindings/power/r8a7790-sysc.h>
|
||||||
|
|
||||||
|
pci@ee090000 {
|
||||||
|
compatible = "renesas,pci-r8a7790", "renesas,pci-rcar-gen2";
|
||||||
|
device_type = "pci";
|
||||||
|
reg = <0xee090000 0xc00>,
|
||||||
|
<0xee080000 0x1100>;
|
||||||
|
clocks = <&cpg CPG_MOD 703>;
|
||||||
|
power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
|
||||||
|
resets = <&cpg 703>;
|
||||||
|
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
|
||||||
|
bus-range = <0 0>;
|
||||||
|
#address-cells = <3>;
|
||||||
|
#size-cells = <2>;
|
||||||
|
#interrupt-cells = <1>;
|
||||||
|
ranges = <0x02000000 0 0xee080000 0xee080000 0 0x00010000>;
|
||||||
|
dma-ranges = <0x42000000 0 0x40000000 0x40000000 0 0x40000000>;
|
||||||
|
interrupt-map-mask = <0xf800 0 0 0x7>;
|
||||||
|
interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
|
||||||
|
usb@1,0 {
|
||||||
|
reg = <0x800 0 0 0 0>;
|
||||||
|
phys = <&usb0 0>;
|
||||||
|
phy-names = "usb";
|
||||||
|
};
|
||||||
|
|
||||||
|
usb@2,0 {
|
||||||
|
reg = <0x1000 0 0 0 0>;
|
||||||
|
phys = <&usb0 0>;
|
||||||
|
phy-names = "usb";
|
||||||
|
};
|
||||||
|
};
|
||||||
@ -328,6 +328,7 @@ static const struct of_device_id rcar_pci_of_match[] = {
|
|||||||
{ .compatible = "renesas,pci-r8a7791", },
|
{ .compatible = "renesas,pci-r8a7791", },
|
||||||
{ .compatible = "renesas,pci-r8a7794", },
|
{ .compatible = "renesas,pci-r8a7794", },
|
||||||
{ .compatible = "renesas,pci-rcar-gen2", },
|
{ .compatible = "renesas,pci-rcar-gen2", },
|
||||||
|
{ .compatible = "renesas,pci-rzn1", },
|
||||||
{ },
|
{ },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user