On 08/02/2013 03:01 PM, Sergei Shtylyov wrote: > On 08/02/2013 08:28 PM, Mark Langsdorf wrote: > >> The Calxeda sata_highbank driver has been adding its descriptions to the >> ahci driver. Separate them properly. > >> Signed-off-by: Mark Langsdorf <mark.langsdorf@xxxxxxxxxxx> >> Acked-by: Rob Herring <rob.herring@xxxxxxxxxxx> > [...] > >> diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt >> index 3ec0c5c..14d7b22 100644 >> --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt >> +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt >> @@ -4,27 +4,17 @@ SATA nodes are defined to describe on-chip Serial ATA controllers. > [...] >> Example: >> sata@ffe08000 { >> - compatible = "calxeda,hb-ahci"; >> + compatible = "snps,spear-ahci"; >> reg = <0xffe08000 0x1000>; >> interrupts = <115>; > > Indented these 2 props with spaces, would be good to fix... Thanks, I will fix. >> - calxeda,port-phys = <&combophy5 0 &combophy0 0 &combophy0 1 >> - &combophy0 2 &combophy0 3>; >> >> }; >> diff --git a/Documentation/devicetree/bindings/ata/sata_highbank.txt b/Documentation/devicetree/bindings/ata/sata_highbank.txt >> new file mode 100644 >> index 0000000..aa1b798 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/ata/sata_highbank.txt > Shouldn't the file be called calxeda,hb-ahci.txt? # ls Documentation/devicetree/bindings/ata/ ahci-platform.txt exynos-sata.txt pata-arasan.txt atmel-at91_cf.txt fsl-sata.txt sata_highbank.txt cavium-compact-flash.txt imx-pata.txt exynos-sata-phy.txt marvell.txt By comparison with the other files in the directory, no. Using _ instead of - is slightly unorthodox but not unknown within the devicetree/bindings subdirectories. >> @@ -0,0 +1,32 @@ >> +* Calxeda AHCI SATA Controller >> + >> +SATA nodes are defined to describe on-chip Serial ATA controllers. >> +The Calxeda SATA controller mostly conforms to the AHCI interface >> +with some special extensions to add functionality. >> +Each SATA controller should have its own node. >> + >> +Required properties: >> +- compatible : compatible list, contains "calxeda,hb-ahci" >> +- interrupts : <interrupt mapping for SATA IRQ> >> +- reg : <registers mapping> >> + >> +Optional properties: >> +- dma-coherent : Present if dma operations are coherent >> +- calxeda,port-phys: phandle-combophy and lane assignment, which maps each >> + SATA port to a combophy and a lane within that >> + combophy >> +- calxeda,sgpio-gpio: phandle-gpio bank, bit offset, and default on or off, >> + which indicates that the driver supports SGPIO >> + indicator lights using the indicated GPIOs >> +- calxeda,led-order : a u32 array that map port numbers to offsets within the >> + SGPIO bitstream. >> + >> +Example: >> + sata@ffe08000 { >> + compatible = "calxeda,hb-ahci"; >> + reg = <0xffe08000 0x1000>; >> + interrupts = <115>; >> + calxeda,port-phys = <&combophy5 0 &combophy0 0 &combophy0 1 > > Could you indent props uniformly here, with tabs? Yes. Thanks for the review. --Mark Langsdorf Calxeda, Inc. -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html