| Message ID | 143401cd639e$474af610$d5e0e230$%kim@samsung.com |
|---|---|
| State | New |
| Headers | show |
Arnd Bergmann wrote: > > On Monday 16 July 2012, Kukjin Kim wrote: > > Please pull support samsung spi device tree for v3.6 from: > > git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git > > next/dt-samsung > > > > It is for supporting spi dt for exynos4210 and exynos5250, and got the > ack > > from Grant Likely for spi driver. > > > > Note: Since this is including spi driver changes, so it was made based > on > > next/devel-dma-ops which touches same file, Samsung spi driver for > avoiding > > bad conflicts. > > > > If any problems, please kindly let me know. > > Applied to next/dt branch. I'm not so happy about new dma channel > properties getting added to additional bindings. I guess I should > have complained earlier about these, so I'm keeping the changes > but I've added the patch below to make it clear that they will > have to change after we have agreed with Vinod and Jon on how > they should be represented. > Yeah, I agree. > Arnd > > Subject: [PATCH] ARM: EXYNOS: mark the DMA channel binding for SPI as > preliminary > > Bindings for DMA channels are still under discussion and will > change once this has been resolved. Therefore we mark them > the newly added ones as preliminary. Let's hope nobody starts > relying on them... > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. > > diff --git a/Documentation/devicetree/bindings/spi/spi-samsung.txt > b/Documentation/devicetree/bindings/spi/spi-samsung.txt > index 59bfc4f..a15ffed 100644 > --- a/Documentation/devicetree/bindings/spi/spi-samsung.txt > +++ b/Documentation/devicetree/bindings/spi/spi-samsung.txt > @@ -18,6 +18,9 @@ Required SoC Specific Properties: > - interrupts: The interrupt number to the cpu. The interrupt specifier > format > depends on the interrupt controller. > > +[PRELIMINARY: the dma channel allocation will change once there are > +official DMA bindings] > + > - tx-dma-channel: The dma channel specifier for tx operations. The format > of > the dma specifier depends on the dma controller. > > diff --git a/arch/arm/boot/dts/exynos4210.dtsi > b/arch/arm/boot/dts/exynos4210.dtsi > index 6904d9d..02891fe 100644 > --- a/arch/arm/boot/dts/exynos4210.dtsi > +++ b/arch/arm/boot/dts/exynos4210.dtsi > @@ -168,8 +168,8 @@ > compatible = "samsung,exynos4210-spi"; > reg = <0x13920000 0x100>; > interrupts = <0 66 0>; > - tx-dma-channel = <&pdma0 7>; > - rx-dma-channel = <&pdma0 6>; > + tx-dma-channel = <&pdma0 7>; /* preliminary */ > + rx-dma-channel = <&pdma0 6>; /* preliminary */ > #address-cells = <1>; > #size-cells = <0>; > }; > @@ -178,8 +178,8 @@ > compatible = "samsung,exynos4210-spi"; > reg = <0x13930000 0x100>; > interrupts = <0 67 0>; > - tx-dma-channel = <&pdma1 7>; > - rx-dma-channel = <&pdma1 6>; > + tx-dma-channel = <&pdma1 7>; /* preliminary */ > + rx-dma-channel = <&pdma1 6>; /* preliminary */ > #address-cells = <1>; > #size-cells = <0>; > }; > @@ -188,8 +188,8 @@ > compatible = "samsung,exynos4210-spi"; > reg = <0x13940000 0x100>; > interrupts = <0 68 0>; > - tx-dma-channel = <&pdma0 9>; > - rx-dma-channel = <&pdma0 8>; > + tx-dma-channel = <&pdma0 9>; /* preliminary */ > + rx-dma-channel = <&pdma0 8>; /* preliminary */ > #address-cells = <1>; > #size-cells = <0>; > }; > diff --git a/arch/arm/boot/dts/exynos5250.dtsi > b/arch/arm/boot/dts/exynos5250.dtsi > index a3a2eb2..004aaa8 100644 > --- a/arch/arm/boot/dts/exynos5250.dtsi > +++ b/arch/arm/boot/dts/exynos5250.dtsi > @@ -156,8 +156,8 @@ > compatible = "samsung,exynos4210-spi"; > reg = <0x12d20000 0x100>; > interrupts = <0 66 0>; > - tx-dma-channel = <&pdma0 5>; > - rx-dma-channel = <&pdma0 4>; > + tx-dma-channel = <&pdma0 5>; /* preliminary */ > + rx-dma-channel = <&pdma0 4>; /* preliminary */ > #address-cells = <1>; > #size-cells = <0>; > }; > @@ -166,8 +166,8 @@ > compatible = "samsung,exynos4210-spi"; > reg = <0x12d30000 0x100>; > interrupts = <0 67 0>; > - tx-dma-channel = <&pdma1 5>; > - rx-dma-channel = <&pdma1 4>; > + tx-dma-channel = <&pdma1 5>; /* preliminary */ > + rx-dma-channel = <&pdma1 4>; /* preliminary */ > #address-cells = <1>; > #size-cells = <0>; > }; > @@ -176,8 +176,8 @@ > compatible = "samsung,exynos4210-spi"; > reg = <0x12d40000 0x100>; > interrupts = <0 68 0>; > - tx-dma-channel = <&pdma0 7>; > - rx-dma-channel = <&pdma0 6>; > + tx-dma-channel = <&pdma0 7>; /* preliminary */ > + rx-dma-channel = <&pdma0 6>; /* preliminary */ > #address-cells = <1>; > #size-cells = <0>; > };
Hi Arnd, Olof Please pull support samsung spi device tree for v3.6 from: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/dt-samsung It is for supporting spi dt for exynos4210 and exynos5250, and got the ack from Grant Likely for spi driver. Note: Since this is including spi driver changes, so it was made based on next/devel-dma-ops which touches same file, Samsung spi driver for avoiding bad conflicts. If any problems, please kindly let me know. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit 4d3c463634ba5d0c0f053013cd947721e5e42393: Merge branch 'next/devel-dma-ops' into next/dt-samsung (2012-07-13 07:15:08 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/dt-samsung Thomas Abraham (14): ARM: S3C64XX: Add a new dma request id for device tree based dma channel lookup spi: s3c64xx: remove unused S3C64XX_SPI_ST_TRLCNTZ macro spi: s3c64xx: move controller information into driver data ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions ARM: SAMSUNG: Modify s3c64xx_spi{0|1|2}_set_platdata function spi: s3c64xx: Remove the 'set_level' callback from controller data spi: s3c64xx: add device tree support ARM: EXYNOS: Add device tree node for EXYNOS4 interrupt combiner controller ARM: EXYNOS: Fix the incorrect hierarchy of spi controller bus clock ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOX4 ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS4 platforms ARM: EXYNOS: Add spi clock support for EXYNOS5 ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOS5 ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS5 platforms .../devicetree/bindings/spi/spi-samsung.txt | 113 +++++ arch/arm/boot/dts/exynos4210-origen.dts | 12 + arch/arm/boot/dts/exynos4210-smdkv310.dts | 38 ++ arch/arm/boot/dts/exynos4210.dtsi | 47 ++ arch/arm/boot/dts/exynos5250-smdk5250.dts | 38 ++ arch/arm/boot/dts/exynos5250.dtsi | 36 ++ arch/arm/mach-exynos/clock-exynos4.c | 67 ++- arch/arm/mach-exynos/clock-exynos5.c | 95 ++++ arch/arm/mach-exynos/include/mach/irqs.h | 4 + arch/arm/mach-exynos/include/mach/map.h | 3 + arch/arm/mach-exynos/mach-exynos4-dt.c | 6 + arch/arm/mach-exynos/mach-exynos5-dt.c | 6 + arch/arm/mach-exynos/setup-spi.c | 33 +-- arch/arm/mach-s3c24xx/clock-s3c2416.c | 3 +- arch/arm/mach-s3c24xx/clock-s3c2443.c | 2 +- arch/arm/mach-s3c24xx/common-s3c2443.c | 4 +- arch/arm/mach-s3c24xx/setup-spi.c | 10 +- arch/arm/mach-s3c64xx/clock.c | 20 +- arch/arm/mach-s3c64xx/include/mach/dma.h | 1 + arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- arch/arm/mach-s3c64xx/setup-spi.c | 19 +- arch/arm/mach-s5p64x0/clock-s5p6440.c | 12 +- arch/arm/mach-s5p64x0/clock-s5p6450.c | 12 +- arch/arm/mach-s5p64x0/setup-spi.c | 21 +- arch/arm/mach-s5pc100/clock.c | 30 +- arch/arm/mach-s5pc100/setup-spi.c | 30 +-- arch/arm/mach-s5pv210/clock.c | 14 +- arch/arm/mach-s5pv210/setup-spi.c | 21 +- arch/arm/plat-samsung/devs.c | 60 +-- arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 39 +-- drivers/spi/spi-s3c64xx.c | 481 +++++++++++++++++--- 31 files changed, 953 insertions(+), 326 deletions(-) create mode 100644 Documentation/devicetree/bindings/spi/spi-samsung.txt