diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-12 15:26:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-12 15:26:39 -0800 |
| commit | 7dac7102afbeb99daa454f555f1ea1f42fad2f78 (patch) | |
| tree | 024bf6c2ed2fa46cab610e6012bd3dd5f45da182 /arch/h8300/boot/dts | |
| parent | 3370b69eb0c1f6a05f9051e8fc3e8768461a80f7 (diff) | |
| parent | f639eeb4a60ce39f154753e3a745bd755e0fe084 (diff) | |
Merge tag 'for-4.4' of git://git.osdn.jp/gitroot/uclinux-h8/linux
Pull h8300 updates from Yoshinori Sato:
"Some bug fixes"
* tag 'for-4.4' of git://git.osdn.jp/gitroot/uclinux-h8/linux:
h8300: enable CLKSRC_OF
h8300: Don't set CROSS_COMPILE unconditionally
asm-generic: {get,put}_user ptr argument evaluate only 1 time
h8300: bit io fix
h8300: zImage fix
h8300: register address fix
h8300: Fix alignment for .data
h8300: unaligned divcr register support.
Diffstat (limited to 'arch/h8300/boot/dts')
| -rw-r--r-- | arch/h8300/boot/dts/edosk2674.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/h8300/boot/dts/edosk2674.dts b/arch/h8300/boot/dts/edosk2674.dts index dfb5c102f8da..4ce9fa874a57 100644 --- a/arch/h8300/boot/dts/edosk2674.dts +++ b/arch/h8300/boot/dts/edosk2674.dts @@ -7,7 +7,7 @@ chosen { bootargs = "console=ttySC2,38400"; - stdout-path = <&sci2>; + stdout-path = &sci2; }; aliases { serial0 = &sci0; @@ -25,13 +25,13 @@ compatible = "renesas,h8s2678-pll-clock"; clocks = <&xclk>; #clock-cells = <0>; - reg = <0xfee03b 2>, <0xfee045 2>; + reg = <0xffff3b 1>, <0xffff45 1>; }; core_clk: core_clk { compatible = "renesas,h8300-div-clock"; clocks = <&pllclk>; #clock-cells = <0>; - reg = <0xfee03b 2>; + reg = <0xffff3b 1>; renesas,width = <3>; }; fclk: fclk { |