diff --git a/drivers/clk/davinci/psc-da850.c b/drivers/clk/davinci/psc-da850.c
index 3fd6b49..3375df6a1 100644
--- a/drivers/clk/davinci/psc-da850.c
+++ b/drivers/clk/davinci/psc-da850.c
@@ -17,38 +17,38 @@ static const struct davinci_psc_clk_info da850_psc0_info[] __initconst = {
  	LPSC(0, 0, tpcc0, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
  	LPSC(1, 0, tptc0, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
  	LPSC(2, 0, tptc1, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
-	LPSC(3, 0, aemif, pll0_sysclk3, 0),
-	LPSC(4, 0, spi0, pll0_sysclk2, 0),
-	LPSC(5, 0, mmcsd0, pll0_sysclk2, 0),
+	LPSC(3, 0, aemif, pll0_sysclk3, LPSC_ALWAYS_ENABLED),
+	LPSC(4, 0, spi0, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
+	LPSC(5, 0, mmcsd0, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
  	LPSC(6, 0, aintc, pll0_sysclk4, LPSC_ALWAYS_ENABLED),
  	LPSC(7, 0, arm_rom, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
-	LPSC(9, 0, uart0, pll0_sysclk2, 0),
-	LPSC(13, 0, pruss, pll0_sysclk2, 0),
+	LPSC(9, 0, uart0, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
+	LPSC(13, 0, pruss, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
  	LPSC(14, 0, arm, pll0_sysclk6, LPSC_ALWAYS_ENABLED),
-	LPSC(15, 1, dsp, pll0_sysclk1, LPSC_FORCE | LPSC_LOCAL_RESET),
+	LPSC(15, 1, dsp, pll0_sysclk1, LPSC_FORCE | LPSC_LOCAL_RESET | LPSC_ALWAYS_ENABLED),
  	{ }
  };
  
  static const struct davinci_psc_clk_info da850_psc1_info[] __initconst = {
  	LPSC(0, 0, tpcc1, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
-	LPSC(1, 0, usb0, pll0_sysclk2, 0),
-	LPSC(2, 0, usb1, pll0_sysclk4, 0),
-	LPSC(3, 0, gpio, pll0_sysclk4, 0),
-	LPSC(5, 0, emac, pll0_sysclk4, 0),
+	LPSC(1, 0, usb0, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
+	LPSC(2, 0, usb1, pll0_sysclk4, LPSC_ALWAYS_ENABLED),
+	LPSC(3, 0, gpio, pll0_sysclk4, LPSC_ALWAYS_ENABLED),
+	LPSC(5, 0, emac, pll0_sysclk4, LPSC_ALWAYS_ENABLED),
  	LPSC(6, 0, emif3, pll0_sysclk5, LPSC_ALWAYS_ENABLED),
-	LPSC(7, 0, mcasp0, async3, 0),
-	LPSC(8, 0, sata, pll0_sysclk2, LPSC_FORCE),
-	LPSC(9, 0, vpif, pll0_sysclk2, 0),
-	LPSC(10, 0, spi1, async3, 0),
-	LPSC(11, 0, i2c1, pll0_sysclk4, 0),
-	LPSC(12, 0, uart1, async3, 0),
-	LPSC(13, 0, uart2, async3, 0),
-	LPSC(14, 0, mcbsp0, async3, 0),
-	LPSC(15, 0, mcbsp1, async3, 0),
-	LPSC(16, 0, lcdc, pll0_sysclk2, 0),
-	LPSC(17, 0, ehrpwm, async3, 0),
-	LPSC(18, 0, mmcsd1, pll0_sysclk2, 0),
-	LPSC(20, 0, ecap, async3, 0),
+	LPSC(7, 0, mcasp0, async3, LPSC_ALWAYS_ENABLED),
+	LPSC(8, 0, sata, pll0_sysclk2, LPSC_FORCE | LPSC_ALWAYS_ENABLED),
+	LPSC(9, 0, vpif, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
+	LPSC(10, 0, spi1, async3, LPSC_ALWAYS_ENABLED),
+	LPSC(11, 0, i2c1, pll0_sysclk4, LPSC_ALWAYS_ENABLED),
+	LPSC(12, 0, uart1, async3, LPSC_ALWAYS_ENABLED),
+	LPSC(13, 0, uart2, async3, LPSC_ALWAYS_ENABLED),
+	LPSC(14, 0, mcbsp0, async3, LPSC_ALWAYS_ENABLED),
+	LPSC(15, 0, mcbsp1, async3, LPSC_ALWAYS_ENABLED),
+	LPSC(16, 0, lcdc, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
+	LPSC(17, 0, ehrpwm, async3, LPSC_ALWAYS_ENABLED),
+	LPSC(18, 0, mmcsd1, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
+	LPSC(20, 0, ecap, async3, LPSC_ALWAYS_ENABLED),
  	LPSC(21, 0, tptc2, pll0_sysclk2, LPSC_ALWAYS_ENABLED),
  	{ }
  };


diff --git a/drivers/clk/davinci/pll-da850.c b/drivers/clk/davinci/pll-da850.c
index 77a7223..f334e69 100644
--- a/drivers/clk/davinci/pll-da850.c
+++ b/drivers/clk/davinci/pll-da850.c
@@ -22,21 +22,21 @@
  
  static const struct davinci_pll_divclk_info
  da850_pll0_divclk_info[] __initconst = {
-	DIVCLK(1, pll0_sysclk1, pll0, DIVCLK_FIXED_DIV),
-	DIVCLK(2, pll0_sysclk2, pll0, DIVCLK_FIXED_DIV),
-	DIVCLK(3, pll0_sysclk3, pll0, 0),
-	DIVCLK(4, pll0_sysclk4, pll0, DIVCLK_FIXED_DIV),
-	DIVCLK(5, pll0_sysclk5, pll0, 0),
-	DIVCLK(6, pll0_sysclk6, pll0, DIVCLK_ARM_RATE | DIVCLK_FIXED_DIV),
-	DIVCLK(7, pll0_sysclk7, pll0, 0),
+	DIVCLK(1, pll0_sysclk1, pll0, DIVCLK_FIXED_DIV | DIVCLK_ALWAYS_ENABLED),
+	DIVCLK(2, pll0_sysclk2, pll0, DIVCLK_FIXED_DIV | DIVCLK_ALWAYS_ENABLED),
+	DIVCLK(3, pll0_sysclk3, pll0, DIVCLK_ALWAYS_ENABLED),
+	DIVCLK(4, pll0_sysclk4, pll0, DIVCLK_FIXED_DIV | DIVCLK_ALWAYS_ENABLED),
+	DIVCLK(5, pll0_sysclk5, pll0, DIVCLK_ALWAYS_ENABLED),
+	DIVCLK(6, pll0_sysclk6, pll0, DIVCLK_ARM_RATE | DIVCLK_FIXED_DIV| DIVCLK_ALWAYS_ENABLED),
+	DIVCLK(7, pll0_sysclk7, pll0, DIVCLK_ALWAYS_ENABLED),
  	{ }
  };
  
  static const struct davinci_pll_divclk_info
  da850_pll1_divclk_info[] __initconst = {
  	DIVCLK(1, pll1_sysclk1, pll1, DIVCLK_ALWAYS_ENABLED),
-	DIVCLK(2, pll1_sysclk2, pll1, 0),
-	DIVCLK(3, pll1_sysclk3, pll1, 0),
+	DIVCLK(2, pll1_sysclk2, pll1, DIVCLK_ALWAYS_ENABLED),
+	DIVCLK(3, pll1_sysclk3, pll1, DIVCLK_ALWAYS_ENABLED),
  	{ }
  };
  
