aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pc100
diff options
context:
space:
mode:
authorJassi Brar <jassi.brar@samsung.com>2010-10-20 03:37:28 -0400
committerKukjin Kim <kgene.kim@samsung.com>2010-10-25 03:07:06 -0400
commit05daf079259c7e5393f204503284ee90072cb348 (patch)
tree8709d612c20deb11fee3ddfe77997d5c6eef4688 /arch/arm/mach-s5pc100
parent8084979800972c6e374635e6d6bacd35a55b9e4e (diff)
ARM: S5PC100: Fix Audio, Keypad and ADC clock sources
Audio, Keypad and ADC inherit PCLKD1 clock source. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> [kgene.kim@samsung.com: minor title fix] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pc100')
-rw-r--r--arch/arm/mach-s5pc100/clock.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c
index 9e192a0ad4f9..2d4a761a5163 100644
--- a/arch/arm/mach-s5pc100/clock.c
+++ b/arch/arm/mach-s5pc100/clock.c
@@ -676,55 +676,55 @@ static struct clk init_clocks_disable[] = {
676 }, { 676 }, {
677 .name = "iis", 677 .name = "iis",
678 .id = 0, 678 .id = 0,
679 .parent = &clk_div_d1_bus.clk, 679 .parent = &clk_div_pclkd1.clk,
680 .enable = s5pc100_d1_5_ctrl, 680 .enable = s5pc100_d1_5_ctrl,
681 .ctrlbit = (1 << 0), 681 .ctrlbit = (1 << 0),
682 }, { 682 }, {
683 .name = "iis", 683 .name = "iis",
684 .id = 1, 684 .id = 1,
685 .parent = &clk_div_d1_bus.clk, 685 .parent = &clk_div_pclkd1.clk,
686 .enable = s5pc100_d1_5_ctrl, 686 .enable = s5pc100_d1_5_ctrl,
687 .ctrlbit = (1 << 1), 687 .ctrlbit = (1 << 1),
688 }, { 688 }, {
689 .name = "iis", 689 .name = "iis",
690 .id = 2, 690 .id = 2,
691 .parent = &clk_div_d1_bus.clk, 691 .parent = &clk_div_pclkd1.clk,
692 .enable = s5pc100_d1_5_ctrl, 692 .enable = s5pc100_d1_5_ctrl,
693 .ctrlbit = (1 << 2), 693 .ctrlbit = (1 << 2),
694 }, { 694 }, {
695 .name = "ac97", 695 .name = "ac97",
696 .id = -1, 696 .id = -1,
697 .parent = &clk_div_d1_bus.clk, 697 .parent = &clk_div_pclkd1.clk,
698 .enable = s5pc100_d1_5_ctrl, 698 .enable = s5pc100_d1_5_ctrl,
699 .ctrlbit = (1 << 3), 699 .ctrlbit = (1 << 3),
700 }, { 700 }, {
701 .name = "pcm", 701 .name = "pcm",
702 .id = 0, 702 .id = 0,
703 .parent = &clk_div_d1_bus.clk, 703 .parent = &clk_div_pclkd1.clk,
704 .enable = s5pc100_d1_5_ctrl, 704 .enable = s5pc100_d1_5_ctrl,
705 .ctrlbit = (1 << 4), 705 .ctrlbit = (1 << 4),
706 }, { 706 }, {
707 .name = "pcm", 707 .name = "pcm",
708 .id = 1, 708 .id = 1,
709 .parent = &clk_div_d1_bus.clk, 709 .parent = &clk_div_pclkd1.clk,
710 .enable = s5pc100_d1_5_ctrl, 710 .enable = s5pc100_d1_5_ctrl,
711 .ctrlbit = (1 << 5), 711 .ctrlbit = (1 << 5),
712 }, { 712 }, {
713 .name = "spdif", 713 .name = "spdif",
714 .id = -1, 714 .id = -1,
715 .parent = &clk_div_d1_bus.clk, 715 .parent = &clk_div_pclkd1.clk,
716 .enable = s5pc100_d1_5_ctrl, 716 .enable = s5pc100_d1_5_ctrl,
717 .ctrlbit = (1 << 6), 717 .ctrlbit = (1 << 6),
718 }, { 718 }, {
719 .name = "adc", 719 .name = "adc",
720 .id = -1, 720 .id = -1,
721 .parent = &clk_div_d1_bus.clk, 721 .parent = &clk_div_pclkd1.clk,
722 .enable = s5pc100_d1_5_ctrl, 722 .enable = s5pc100_d1_5_ctrl,
723 .ctrlbit = (1 << 7), 723 .ctrlbit = (1 << 7),
724 }, { 724 }, {
725 .name = "keypad", 725 .name = "keypad",
726 .id = -1, 726 .id = -1,
727 .parent = &clk_div_d1_bus.clk, 727 .parent = &clk_div_pclkd1.clk,
728 .enable = s5pc100_d1_5_ctrl, 728 .enable = s5pc100_d1_5_ctrl,
729 .ctrlbit = (1 << 8), 729 .ctrlbit = (1 << 8),
730 }, { 730 }, {