tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'omap-for-v3.19/fixes-not-urgent' into omap-for-v3.19/fixes

Tony Lindgren f577fc52 a0e44677

+4 -6
+1 -1
arch/arm/boot/dts/dra7.dtsi
··· 742 742 }; 743 743 744 744 wdt2: wdt@4ae14000 { 745 - compatible = "ti,omap4-wdt"; 745 + compatible = "ti,omap3-wdt"; 746 746 reg = <0x4ae14000 0x80>; 747 747 interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>; 748 748 ti,hwmods = "wd_timer2";
+3 -3
arch/arm/boot/dts/dra7xx-clocks.dtsi
··· 1042 1042 #clock-cells = <0>; 1043 1043 compatible = "ti,mux-clock"; 1044 1044 clocks = <&sys_clkin1>, <&sys_clkin2>; 1045 - reg = <0x01a4>; 1045 + reg = <0x0164>; 1046 1046 }; 1047 1047 1048 1048 mlb_clk: mlb_clk { ··· 1084 1084 #clock-cells = <0>; 1085 1085 compatible = "ti,mux-clock"; 1086 1086 clocks = <&sys_clkin1>, <&sys_clkin2>; 1087 - reg = <0x01d0>; 1087 + reg = <0x0168>; 1088 1088 }; 1089 1089 1090 1090 video2_dpll_clk_mux: video2_dpll_clk_mux { 1091 1091 #clock-cells = <0>; 1092 1092 compatible = "ti,mux-clock"; 1093 1093 clocks = <&sys_clkin1>, <&sys_clkin2>; 1094 - reg = <0x01d4>; 1094 + reg = <0x016c>; 1095 1095 }; 1096 1096 1097 1097 wkupaon_iclk_mux: wkupaon_iclk_mux {
-2
arch/arm/mach-omap2/clock.h
··· 270 270 271 271 extern void __iomem *clk_memmaps[]; 272 272 273 - extern int am33xx_clk_init(void); 274 - 275 273 extern int omap2_clkops_enable_clkdm(struct clk_hw *hw); 276 274 extern void omap2_clkops_disable_clkdm(struct clk_hw *hw); 277 275