p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Tony Lindgren 2014-12-10 08:25:50 -08:00
parent a0e4467726 e671538d51
commit f577fc52a6
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/dra7.dtsi
View File

@ -742,7 +742,7 @@ timer16: timer@4882e000 {
};
wdt2: wdt@4ae14000 {
compatible = "ti,omap4-wdt";
compatible = "ti,omap3-wdt";
reg = <0x4ae14000 0x80>;
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
ti,hwmods = "wd_timer2";

6
arch/arm/boot/dts/dra7xx-clocks.dtsi
View File

@ -1042,7 +1042,7 @@ hdmi_dpll_clk_mux: hdmi_dpll_clk_mux {
#clock-cells = <0>;
compatible = "ti,mux-clock";
clocks = <&sys_clkin1>, <&sys_clkin2>;
reg = <0x01a4>;
reg = <0x0164>;
};
mlb_clk: mlb_clk {
@ -1084,14 +1084,14 @@ video1_dpll_clk_mux: video1_dpll_clk_mux {
#clock-cells = <0>;
compatible = "ti,mux-clock";
clocks = <&sys_clkin1>, <&sys_clkin2>;
reg = <0x01d0>;
reg = <0x0168>;
};
video2_dpll_clk_mux: video2_dpll_clk_mux {
#clock-cells = <0>;
compatible = "ti,mux-clock";
clocks = <&sys_clkin1>, <&sys_clkin2>;
reg = <0x01d4>;
reg = <0x016c>;
};
wkupaon_iclk_mux: wkupaon_iclk_mux {

2
arch/arm/mach-omap2/clock.h
View File

@ -270,8 +270,6 @@ extern const struct clksel_rate div31_1to31_rates[];
extern void __iomem *clk_memmaps[];
extern int am33xx_clk_init(void);
extern int omap2_clkops_enable_clkdm(struct clk_hw *hw);
extern void omap2_clkops_disable_clkdm(struct clk_hw *hw);