ARM: shmobile: r8a7740: add MMCIF and SDHI to DT
Subsystems (5)
cover ARM: shmobile: r8a7740: add MMCIF and SDHI to DT
These patches add DT support for MMCIF and SDHI including DMA on armadillo800eva-reference r8a7740 board. They require my previous SHDMA DT and SDHI and MMCIF DMA patches.
Guennadi Liakhovetski (6):
ARM: shmobile: armadillo800eva: remove left-overs
ARM: shmobile: add SDHI and MMCIF interfaces to
armadillo800eva-reference
ARM: shmobile: sh73a0: remove "0x" prefix from DT node names
ARM: shmobile: r8a7740: add MMCIF DMA definitions
ARM: shmobile: r8a7740: add DT node for one DMAC instance
ARM: shmobile: armadillo800eva-reference: add DMA support for MMCIF
and SDHI
.../boot/dts/r8a7740-armadillo800eva-reference.dts | 30 +++++++++++- arch/arm/boot/dts/r8a7740.dtsi | 53 ++++++++++++++++++++ arch/arm/boot/dts/sh73a0.dtsi | 18 +++--- .../board-armadillo800eva-reference.c | 36 +++++++++++++- arch/arm/mach-shmobile/board-armadillo800eva.c | 9 --- arch/arm/mach-shmobile/include/mach/r8a7740.h | 2 + arch/arm/mach-shmobile/setup-r8a7740.c | 12 +++++ 7 files changed, 140 insertions(+), 20 deletions(-)
Signature · 8 lines
1.7.2.5 Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/
PATCH 1/6 ARM: shmobile: armadillo800eva: remove left-overs
A comment and a #define in board-armadillo800eva.c have been left over after recent changes and are no longer relevant or needed, remove them.
--- arch/arm/mach-shmobile/board-armadillo800eva.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-)
arch/arm/mach-shmobile/board-armadillo800eva.c +0 -9
@@ -673,15 +673,6 @@ static struct platform_device vcc_sdhi1 = { };/* SDHI0 */ -/* -* FIXME -* -* It use polling mode here, since -* CD (= Card Detect) pin is not connected to SDHI0_CD. -* We can use IRQ31 as card detect irq, -* but it needs chattering removal operation -*/ -#define IRQ31 irq_pin(31)static struct sh_mobile_sdhi_info sdhi0_info = { .dma_slave_tx =SHDMA_SLAVE_SDHI0_TX , .dma_slave_rx =SHDMA_SLAVE_SDHI0_RX ,
Signature · 1 line
1.7.2.5
PATCH 2/6 ARM: shmobile: add SDHI and MMCIF interfaces to armadillo800eva-reference
In reply to Guennadi LiakhovetskiAdd SDHI0, SDHI1 and MMCIF interfaces to armadillo800eva-reference. With no pinctrl DT support we cannot use GPIO card-detection and regulator switching.
--- .../boot/dts/r8a7740-armadillo800eva-reference.dts | 21 +++++++++++- arch/arm/boot/dts/r8a7740.dtsi | 33 ++++++++++++++++++ .../board-armadillo800eva-reference.c | 36 +++++++++++++++++++- 3 files changed, 88 insertions(+), 2 deletions(-)
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +20 -1
@@ -32,7 +32,6 @@ regulator-always-on; regulator-boot-on; }; - }; &i2c0 {
@@ -43,3 +42,23 @@ interrupts = <2 0>; /* IRQ10: hwirq 2 on irqpin1 */ }; }; + +&mmcif0 { + vmmc-supply = <®_3p3v>; + bus-width = <8>; + non-removable; + status = "okay"; +}; + +&sdhi0 { + vmmc-supply = <®_3p3v>; + bus-width = <4>; + broken-cd; + status = "okay"; +}; + +&sdhi1 { + vmmc-supply = <®_3p3v>; + bus-width = <4>; + status = "okay"; +};
arch/arm/boot/dts/r8a7740.dtsi +33 -0
@@ -135,4 +135,37 @@ 0 72 0x4 0 73 0x4>; }; + + mmcif0: mmcif at e6bd0000 { + compatible = "renesas,sh-mmcif", "renesas,sh7372-mmcif"; + reg = <0xe6bd0000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 56 4 + 0 57 4>; + status = "disabled"; + }; + + sdhi0: sdhi at e6850000 { + compatible = "renesas,r8a7740-sdhi"; + reg = <0xe6850000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 117 4 + 0 118 4 + 0 119 4>; + cap-sd-highspeed; + cap-sdio-irq; + status = "disabled"; + }; + + sdhi1: sdhi at e6860000 { + compatible = "renesas,r8a7740-sdhi"; + reg = <0xe6860000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 121 4 + 0 122 4 + 0 123 4>; + cap-sd-highspeed; + cap-sdio-irq; + status = "disabled"; + }; };
arch/arm/mach-shmobile/board-armadillo800eva-reference.c +35 -1
@@ -123,6 +123,27 @@ static const struct pinctrl_map eva_pinctrl_map[] = {/* SCIFA1 */ PIN_MAP_MUX_GROUP_DEFAULT ("sh-sci.1" ,"pfc-r8a7740" ,"scifa1_data" ,"scifa1" ), +/* MMCIF */ +PIN_MAP_MUX_GROUP_DEFAULT ("e6bd0000.sh-mmcif" ,"pfc-r8a7740" , +"mmc0_data8_1" ,"mmc0" ), +PIN_MAP_MUX_GROUP_DEFAULT ("e6bd0000.sh-mmcif" ,"pfc-r8a7740" , +"mmc0_ctrl_1" ,"mmc0" ), +/* SDHI0 */ +PIN_MAP_MUX_GROUP_DEFAULT ("e6850000.sdhi" ,"pfc-r8a7740" , +"sdhi0_data4" ,"sdhi0" ), +PIN_MAP_MUX_GROUP_DEFAULT ("e6850000.sdhi" ,"pfc-r8a7740" , +"sdhi0_ctrl" ,"sdhi0" ), +PIN_MAP_MUX_GROUP_DEFAULT ("e6850000.sdhi" ,"pfc-r8a7740" , +"sdhi0_wp" ,"sdhi0" ), +/* SDHI1 */ +PIN_MAP_MUX_GROUP_DEFAULT ("e6860000.sdhi" ,"pfc-r8a7740" , +"sdhi1_data4" ,"sdhi1" ), +PIN_MAP_MUX_GROUP_DEFAULT ("e6860000.sdhi" ,"pfc-r8a7740" , +"sdhi1_ctrl" ,"sdhi1" ), +PIN_MAP_MUX_GROUP_DEFAULT ("e6860000.sdhi" ,"pfc-r8a7740" , +"sdhi1_cd" ,"sdhi1" ), +PIN_MAP_MUX_GROUP_DEFAULT ("e6860000.sdhi" ,"pfc-r8a7740" , + "sdhi1_wp", "sdhi1"), };static void __init eva_clock_init (void )
@@ -165,7 +186,6 @@ clock_error:*/ static void __init eva_init (void ) { -r8a7740_clock_init (MD_CK0 |MD_CK2 );eva_clock_init ();
@@ -180,6 +200,20 @@ static void __init eva_init(void)*/ gpio_request_one (166 ,GPIOF_OUT_INIT_HIGH ,NULL );/* TP_RST_B */ +/* SDHI0 */ +gpio_request_one (17 ,GPIOF_OUT_INIT_LOW ,NULL );/* SDHI0_18/33_B */ +gpio_request_one (74 ,GPIOF_OUT_INIT_HIGH ,NULL );/* SDHI0_PON */ +gpio_request_one (75 ,GPIOF_OUT_INIT_HIGH ,NULL );/* SDSLOT1_PON */ + +/* We can switch CON8/CON14 by SW1.5, but only after DBGMD_SELECT_B */ +gpio_request_one (6 ,GPIOF_IN ,NULL ); +if (!gpio_get_value (6 )) { +/* CON14 disabled, CON8 (SDHI1) enabled */ + +/* SDSLOT2_PON */ +gpio_request_one (16 ,GPIOF_OUT_INIT_HIGH ,NULL ); + } +#ifdef CONFIG_CACHE_L2X0 /* Early BRESP enable, Shared attribute override enable, 32K*8way */ l2x0_init (IOMEM (0xf0002000 ),0x40440000 ,0x82000fff );
Signature · 1 line
1.7.2.5
PATCH 2/6 ARM: shmobile: add SDHI and MMCIF interfaces to armadillo800eva-reference
Hi Simon
Quoted 5 lines · Guennadi Liakhovetski
Add SDHI0, SDHI1 and MMCIF interfaces to armadillo800eva-reference. With no pinctrl DT support we cannot use GPIO card-detection and regulator switching.
Signed-off-by Guennadi Liakhovetski <[email protected]>
It should have been
actually, just like in all other patches in this series.
Thanks
Guennadi
Quoted 153 lines
--- .../boot/dts/r8a7740-armadillo800eva-reference.dts | 21 +++++++++++- arch/arm/boot/dts/r8a7740.dtsi | 33 ++++++++++++++++++ .../board-armadillo800eva-reference.c | 36 +++++++++++++++++++- 3 files changed, 88 insertions(+), 2 deletions(-)arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +20
-1@@ -32,7 +32,6 @@ regulator-always-on; regulator-boot-on; }; - }; &i2c0 {@@ -43,3 +42,23 @@ interrupts = <2 0>; /* IRQ10: hwirq 2 on irqpin1 */ }; }; + +&mmcif0 { + vmmc-supply = <®_3p3v>; + bus-width = <8>; + non-removable; + status = "okay"; +}; + +&sdhi0 { + vmmc-supply = <®_3p3v>; + bus-width = <4>; + broken-cd; + status = "okay"; +}; + +&sdhi1 { + vmmc-supply = <®_3p3v>; + bus-width = <4>; + status = "okay"; +};arch/arm/boot/dts/r8a7740.dtsi +33
-0@@ -135,4 +135,37 @@ 0 72 0x4 0 73 0x4>; }; + + mmcif0: mmcif at e6bd0000 { + compatible = "renesas,sh-mmcif", "renesas,sh7372-mmcif"; + reg = <0xe6bd0000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 56 4 + 0 57 4>; + status = "disabled"; + }; + + sdhi0: sdhi at e6850000 { + compatible = "renesas,r8a7740-sdhi"; + reg = <0xe6850000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 117 4 + 0 118 4 + 0 119 4>; + cap-sd-highspeed; + cap-sdio-irq; + status = "disabled"; + }; + + sdhi1: sdhi at e6860000 { + compatible = "renesas,r8a7740-sdhi"; + reg = <0xe6860000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 121 4 + 0 122 4 + 0 123 4>; + cap-sd-highspeed; + cap-sdio-irq; + status = "disabled"; + }; };arch/arm/mach-shmobile/board-armadillo800eva-reference.c +35
-1@@ -123,6 +123,27 @@ static const struct pinctrl_map eva_pinctrl_map[] = {/* SCIFA1 */ PIN_MAP_MUX_GROUP_DEFAULT ("sh-sci.1" ,"pfc-r8a7740" ,"scifa1_data" ,"scifa1" ), +/* MMCIF */ +PIN_MAP_MUX_GROUP_DEFAULT ("e6bd0000.sh-mmcif" ,"pfc-r8a7740" , +"mmc0_data8_1" ,"mmc0" ), +PIN_MAP_MUX_GROUP_DEFAULT ("e6bd0000.sh-mmcif" ,"pfc-r8a7740" , +"mmc0_ctrl_1" ,"mmc0" ), +/* SDHI0 */ +PIN_MAP_MUX_GROUP_DEFAULT ("e6850000.sdhi" ,"pfc-r8a7740" , +"sdhi0_data4" ,"sdhi0" ), +PIN_MAP_MUX_GROUP_DEFAULT ("e6850000.sdhi" ,"pfc-r8a7740" , +"sdhi0_ctrl" ,"sdhi0" ), +PIN_MAP_MUX_GROUP_DEFAULT ("e6850000.sdhi" ,"pfc-r8a7740" , +"sdhi0_wp" ,"sdhi0" ), +/* SDHI1 */ +PIN_MAP_MUX_GROUP_DEFAULT ("e6860000.sdhi" ,"pfc-r8a7740" , +"sdhi1_data4" ,"sdhi1" ), +PIN_MAP_MUX_GROUP_DEFAULT ("e6860000.sdhi" ,"pfc-r8a7740" , +"sdhi1_ctrl" ,"sdhi1" ), +PIN_MAP_MUX_GROUP_DEFAULT ("e6860000.sdhi" ,"pfc-r8a7740" , +"sdhi1_cd" ,"sdhi1" ), +PIN_MAP_MUX_GROUP_DEFAULT ("e6860000.sdhi" ,"pfc-r8a7740" , + "sdhi1_wp", "sdhi1"), };static void __init eva_clock_init (void )@@ -165,7 +186,6 @@ clock_error:*/ static void __init eva_init (void ) { -r8a7740_clock_init (MD_CK0 |MD_CK2 );eva_clock_init ();@@ -180,6 +200,20 @@ static void __init eva_init(void)*/ gpio_request_one (166 ,GPIOF_OUT_INIT_HIGH ,NULL );/* TP_RST_B */ +/* SDHI0 */ +gpio_request_one (17 ,GPIOF_OUT_INIT_LOW ,NULL );/* SDHI0_18/33_B */ +gpio_request_one (74 ,GPIOF_OUT_INIT_HIGH ,NULL );/* SDHI0_PON */ +gpio_request_one (75 ,GPIOF_OUT_INIT_HIGH ,NULL );/* SDSLOT1_PON */ + +/* We can switch CON8/CON14 by SW1.5, but only after DBGMD_SELECT_B */ +gpio_request_one (6 ,GPIOF_IN ,NULL ); +if (!gpio_get_value (6 )) { +/* CON14 disabled, CON8 (SDHI1) enabled */ + +/* SDSLOT2_PON */ +gpio_request_one (16 ,GPIOF_OUT_INIT_HIGH ,NULL ); + } +#ifdef CONFIG_CACHE_L2X0 /* Early BRESP enable, Shared attribute override enable, 32K*8way */ l2x0_init (IOMEM (0xf0002000 ),0x40440000 ,0x82000fff );Signature · 6 lines
1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
PATCH 3/6 ARM: shmobile: sh73a0: remove "0x" prefix from DT node names
In reply to Guennadi LiakhovetskiThe convention for Device Tree node names is <device>@<hex-address>, where the part after '@' shouldn't contain the "0x" prefix. Fix the sh73a0.dtsi DT names.
--- arch/arm/boot/dts/sh73a0.dtsi | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/boot/dts/sh73a0.dtsi +9 -9
@@ -155,7 +155,7 @@ dma-requests = <256>; }; - i2c0: i2c at 0xe6820000 { + i2c0: i2c at e6820000 { #address-cells = <1>; #size-cells = <0>; compatible = "renesas,rmobile-iic";
@@ -167,7 +167,7 @@ 0 170 0x4>; }; - i2c1: i2c at 0xe6822000 { + i2c1: i2c at e6822000 { #address-cells = <1>; #size-cells = <0>; compatible = "renesas,rmobile-iic";
@@ -179,7 +179,7 @@ 0 54 0x4>; }; - i2c2: i2c at 0xe6824000 { + i2c2: i2c at e6824000 { #address-cells = <1>; #size-cells = <0>; compatible = "renesas,rmobile-iic";
@@ -191,7 +191,7 @@ 0 174 0x4>; }; - i2c3: i2c at 0xe6826000 { + i2c3: i2c at e6826000 { #address-cells = <1>; #size-cells = <0>; compatible = "renesas,rmobile-iic";
@@ -203,7 +203,7 @@ 0 186 0x4>; }; - i2c4: i2c at 0xe6828000 { + i2c4: i2c at e6828000 { #address-cells = <1>; #size-cells = <0>; compatible = "renesas,rmobile-iic";
@@ -226,7 +226,7 @@ renesas,event-quality = <3>; }; - mmcif: mmcif at 0x10010000 { + mmcif: mmcif at e6bd0000 { compatible = "renesas,sh-mmcif"; reg = <0xe6bd0000 0x100>; interrupt-parent = <&gic>;
@@ -236,7 +236,7 @@ status = "disabled"; }; - sdhi0: sdhi at 0xee100000 { + sdhi0: sdhi at ee100000 { compatible = "renesas,r8a7740-sdhi"; reg = <0xee100000 0x100>; interrupt-parent = <&gic>;
@@ -248,7 +248,7 @@ }; /* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */ - sdhi1: sdhi at 0xee120000 { + sdhi1: sdhi at ee120000 { compatible = "renesas,r8a7740-sdhi"; reg = <0xee120000 0x100>; interrupt-parent = <&gic>;
@@ -259,7 +259,7 @@ status = "disabled"; }; - sdhi2: sdhi at 0xee140000 { + sdhi2: sdhi at ee140000 { compatible = "renesas,r8a7740-sdhi"; reg = <0xee140000 0x100>; interrupt-parent = <&gic>;
Signature · 1 line
1.7.2.5
PATCH 4/6 ARM: shmobile: r8a7740: add MMCIF DMA definitions
In reply to Guennadi LiakhovetskiAdd DMA channel slave IDs and configuration entries for the r8a7740 MMCIF controller.
--- arch/arm/mach-shmobile/include/mach/r8a7740.h | 2 ++ arch/arm/mach-shmobile/setup-r8a7740.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-)
arch/arm/mach-shmobile/include/mach/r8a7740.h +2 -0
@@ -42,6 +42,8 @@ enum {SHDMA_SLAVE_FSIB_TX ,SHDMA_SLAVE_USBHS_TX ,SHDMA_SLAVE_USBHS_RX , +SHDMA_SLAVE_MMCIF_TX , + SHDMA_SLAVE_MMCIF_RX, };extern void r8a7740_meram_workaround (void );
arch/arm/mach-shmobile/setup-r8a7740.c +10 -0
@@ -588,6 +588,16 @@ static const struct sh_dmae_slave_config r8a7740_dmae_slaves[] = { .addr = 0xfe1f0064, .chcr = CHCR_TX(XMIT_SZ_32BIT), .mid_rid = 0xb5, + }, { + .slave_id = SHDMA_SLAVE_MMCIF_TX, + .addr = 0xe6bd0034, + .chcr = CHCR_TX(XMIT_SZ_32BIT), + .mid_rid = 0xd1, + }, { + .slave_id = SHDMA_SLAVE_MMCIF_RX, + .addr = 0xe6bd0034, + .chcr = CHCR_RX(XMIT_SZ_32BIT), + .mid_rid = 0xd2, }, };
Signature · 1 line
1.7.2.5
PATCH 5/6 ARM: shmobile: r8a7740: add DT node for one DMAC instance
In reply to Guennadi LiakhovetskiThis patch adds Device Tree support for the first (#0) DMA controller instance on r8a7740. We want to add further DMA controller DT nodes in a DMA multiplexer node, which isn't implemented yet. Further DMAC instances will be added after the DMA multiplexer support is done.
--- arch/arm/boot/dts/r8a7740.dtsi | 20 ++++++++++++++++++++ arch/arm/mach-shmobile/setup-r8a7740.c | 2 ++ 2 files changed, 22 insertions(+), 0 deletions(-)
arch/arm/boot/dts/r8a7740.dtsi +20 -0
@@ -112,6 +112,26 @@ 0 149 0x4>; }; + dma0: shdma at fe008020 { + compatible = "renesas,shdma"; + reg = <0xfe008020 0x270 + 0xfe009000 0xc>; + interrupt-parent = <&gic>; + interrupts = <0 34 4 + 0 28 4 + 0 29 4 + 0 30 4 + 0 31 4 + 0 32 4 + 0 33 4>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5"; + #dma-cells = <1>; + dma-channels = <6>; + dma-requests = <256>; + }; + i2c0: i2c at fff20000 { #address-cells = <1>; #size-cells = <0>;
arch/arm/mach-shmobile/setup-r8a7740.c +2 -0
@@ -997,6 +997,8 @@ void __init r8a7740_add_early_devices(void)#ifdef CONFIG_USE_OF static const struct of_dev_auxdata r8a7740_auxdata_lookup[]__initconst = { +OF_DEV_AUXDATA ("renesas,shdma" ,0xfe008020 ,"sh-dma-engine.0" , + &r8a7740_dma_platform_data), { } };
Signature · 1 line
1.7.2.5
PATCH 6/6 ARM: shmobile: armadillo800eva-reference: add DMA support for MMCIF and SDHI
In reply to Guennadi LiakhovetskiAdd DMA bindings to SDHI and MMCIF DT nodes on armadillo800eva-reference.
--- .../boot/dts/r8a7740-armadillo800eva-reference.dts | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +9 -0
@@ -47,6 +47,9 @@ vmmc-supply = <®_3p3v>; bus-width = <8>; non-removable; + dmas = <&dma0 0xd1 + &dma0 0xd2>; + dma-names = "tx", "rx"; status = "okay"; };
@@ -54,11 +57,17 @@ vmmc-supply = <®_3p3v>; bus-width = <4>; broken-cd; + dmas = <&dma0 0xc1 + &dma0 0xc2>; + dma-names = "tx", "rx"; status = "okay"; }; &sdhi1 { vmmc-supply = <®_3p3v>; bus-width = <4>; + dmas = <&dma0 0xc9 + &dma0 0xca>; + dma-names = "tx", "rx"; status = "okay"; };
Signature · 1 line
1.7.2.5
cover ARM: shmobile: r8a7740: add MMCIF and SDHI to DT
In reply to Guennadi LiakhovetskiQuoted 3 lines · Guennadi Liakhovetski
These patches add DT support for MMCIF and SDHI including DMA on armadillo800eva-reference r8a7740 board. They require my previous SHDMA DT and SDHI and MMCIF DMA patches.
Please repost once there is a branch or rc release that those patches have been merged into which I can base a branch on.