ARM: shmobile: r8a7790: add internal PCI clock
PATCH 7/9 ARM: shmobile: r8a7790: add internal PCI clock
Adds clock for internal PCI host controllers.
--- arch/arm/mach-shmobile/clock-r8a7790.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm/mach-shmobile/clock-r8a7790.c +4 -1
@@ -187,7 +187,7 @@ enum {MSTP813 ,MSTP726 ,MSTP725 ,MSTP724 ,MSTP723 ,MSTP722 ,MSTP721 ,MSTP720 ,MSTP717 ,MSTP716 , -MSTP704 , +MSTP704 ,MSTP703 ,MSTP522 ,MSTP315 ,MSTP314 ,MSTP313 ,MSTP312 ,MSTP311 ,MSTP305 ,MSTP304 , MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
@@ -212,6 +212,7 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP717] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 17, 0), /* HSCIF0 */ [MSTP716] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 16, 0), /* HSCIF1 */ [MSTP704] = SH_CLK_MSTP32(&mp_clk, SMSTPCR7, 4, 0), /* HSUSB */ + [MSTP703] = SH_CLK_MSTP32(&mp_clk, SMSTPCR7, 3, 0), /* EHCI */ [MSTP522] = SH_CLK_MSTP32(&extal_clk, SMSTPCR5, 22, 0), /* Thermal */ [MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, 0), /* MMC0 */ [MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_SD0], SMSTPCR3, 14, 0), /* SDHI0 */
@@ -303,6 +304,8 @@ static struct clk_lookup lookups[] = {CLKDEV_DEV_ID ("qspi.0" , &mstp_clks[MSTP917 ]),CLKDEV_DEV_ID ("renesas_usbhs" , &mstp_clks[MSTP704 ]),CLKDEV_ICK_ID ("usbhs" ,"usb_phy_rcar_gen2" , &mstp_clks[MSTP704 ]), +CLKDEV_ICK_ID ("usbpci" ,"pci-rcar-gen2.1" , &mstp_clks[MSTP703 ]), + CLKDEV_ICK_ID("usbpci", "pci-rcar-gen2.2", &mstp_clks[MSTP703]), };#define R8A7790_CLOCK_ROOT (e, m, p0, p1, p30, p31) \
Signature · 1 line
1.8.4
Quoted 21 lines · Ulrich Hecht
Adds clock for internal PCI host controllers.
Signed-off-by Ulrich Hecht <[email protected]>--- arch/arm/mach-shmobile/clock-r8a7790.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)arch/arm/mach-shmobile/clock-r8a7790.c +1
-1@@ -187,7 +187,7 @@ enum {MSTP813 ,MSTP726 ,MSTP725 ,MSTP724 ,MSTP723 ,MSTP722 ,MSTP721 ,MSTP720 ,MSTP717 ,MSTP716 , -MSTP704 , +MSTP704 ,MSTP703 ,MSTP522 ,MSTP315 ,MSTP314 ,MSTP313 ,MSTP312 ,MSTP311 ,MSTP305 ,MSTP304 , MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
arch/arm/mach-shmobile/clock-r8a7790.c static struct clk mstp_clks[MSTP_NR] = { · line 215
Quoted 4 lines
arch/arm/mach-shmobile/clock-r8a7790.c +1
-0@@ -212,6 +212,7 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP717] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 17, 0), /* HSCIF0 */ [MSTP716] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 16, 0), /* HSCIF1 */ [MSTP704] = SH_CLK_MSTP32(&mp_clk, SMSTPCR7, 4, 0), /* HSUSB */ + [MSTP703] = SH_CLK_MSTP32(&mp_clk, SMSTPCR7, 3, 0), /* EHCI */
The comment to the above line is a bit misleading.
arch/arm/mach-shmobile/clock-r8a7790.c static struct clk_lookup lookups[] = { · line 308
Quoted 9 lines
arch/arm/mach-shmobile/clock-r8a7790.c +2
-0[MSTP522] = SH_CLK_MSTP32(&extal_clk, SMSTPCR5, 22, 0), /* Thermal */ [MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, 0), /* MMC0 */ [MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_SD0], SMSTPCR3, 14, 0), /* SDHI0 */@@ -303,6 +304,8 @@ static struct clk_lookup lookups[] = {CLKDEV_DEV_ID ("qspi.0" , &mstp_clks[MSTP917 ]),CLKDEV_DEV_ID ("renesas_usbhs" , &mstp_clks[MSTP704 ]),CLKDEV_ICK_ID ("usbhs" ,"usb_phy_rcar_gen2" , &mstp_clks[MSTP704 ]), +CLKDEV_ICK_ID ("usbpci" ,"pci-rcar-gen2.1" , &mstp_clks[MSTP703 ]), + CLKDEV_ICK_ID("usbpci", "pci-rcar-gen2.2", &mstp_clks[MSTP703]),
The CLKDEV_DEV_ID should be used instead for both pci clocks.
arch/arm/mach-shmobile/clock-r8a7790.c static struct clk_lookup lookups[] = { · line 311
Quoted 4 lines
arch/arm/mach-shmobile/clock-r8a7790.c +0
-0};#define R8A7790_CLOCK_ROOT (e, m, p0, p1, p30, p31) \
Thanks,
Val.
Quoted 4 lines · Valentine
Quoted 1 line · Ulrich Hecht
+ [MSTP703] =
SH_CLK_MSTP32(&mp_clk, SMSTPCR7, 3, 0), /* EHCI */The comment to the above line is a bit misleading.
The comments reflect the labels given to the bits in the documentation. The documentation labels this bit "EHCI".
Quoted 5 lines
arch/arm/mach-shmobile/clock-r8a7790.c static struct clk_lookup lookups[] = { · line 308
Quoted 2 lines
arch/arm/mach-shmobile/clock-r8a7790.c +2
-0+CLKDEV_ICK_ID ("usbpci" ,"pci-rcar-gen2.1" , &mstp_clks[MSTP703 ]), + CLKDEV_ICK_ID("usbpci", "pci-rcar-gen2.2", &mstp_clks[MSTP703]),The
CLKDEV_DEV_IDshould be used instead for both pci clocks.
Will fix that.
CU
Uli