diff --git a/[refs] b/[refs] index 305d11040443..ba8e3dd5a737 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a43c666129f67b5bcc79fa59edb48c39fea75a0 +refs/heads/master: 8b069b7709c6b5d1492342164976ebfa178de31f diff --git a/trunk/arch/arm/mach-s3c2443/clock.c b/trunk/arch/arm/mach-s3c2443/clock.c index 27549c4fc7b9..cd51d04e1de7 100644 --- a/trunk/arch/arm/mach-s3c2443/clock.c +++ b/trunk/arch/arm/mach-s3c2443/clock.c @@ -169,7 +169,7 @@ static struct clksrc_clk clk_arm = { static struct clksrc_clk clk_hsspi = { .clk = { - .name = "hsspi", + .name = "hsspi-if", .parent = &clk_esysclk.clk, .ctrlbit = S3C2443_SCLKCON_HSSPICLK, .enable = s3c2443_clkcon_enable_s, diff --git a/trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c b/trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c index f630adfaf5b2..07a4c81587ac 100644 --- a/trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c +++ b/trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c @@ -257,6 +257,11 @@ static struct clk init_clocks_off[] = { .parent = &clk_p, .enable = s3c2443_clkcon_enable_p, .ctrlbit = S3C2443_PCLKCON_IIS, + }, { + .name = "hsspi", + .parent = &clk_p, + .enable = s3c2443_clkcon_enable_p, + .ctrlbit = S3C2443_PCLKCON_HSSPI, }, { .name = "adc", .parent = &clk_p,