diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 21:45:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 21:45:24 +0100 |
| commit | caa445d808d27880f92d866902f6717f4d4cd3ca (patch) | |
| tree | c46a564ecbce58310436f0f30b8f3c6d5d93c19b /arch/arm/boot/dts/at91sam9263.dtsi | |
| parent | drivers/tty: serial: remove info message (diff) | |
| parent | Linux 4.0-rc5 (diff) | |
| download | linux-caa445d808d27880f92d866902f6717f4d4cd3ca.tar.xz linux-caa445d808d27880f92d866902f6717f4d4cd3ca.zip | |
Merge 4.0-rc5 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9263.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9263.dtsi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi index 1f67bb4c144e..fce301c4e9d6 100644 --- a/arch/arm/boot/dts/at91sam9263.dtsi +++ b/arch/arm/boot/dts/at91sam9263.dtsi @@ -69,7 +69,7 @@ sram1: sram@00500000 { compatible = "mmio-sram"; - reg = <0x00300000 0x4000>; + reg = <0x00500000 0x4000>; }; ahb { @@ -856,7 +856,7 @@ }; usb1: gadget@fff78000 { - compatible = "atmel,at91rm9200-udc"; + compatible = "atmel,at91sam9263-udc"; reg = <0xfff78000 0x4000>; interrupts = <24 IRQ_TYPE_LEVEL_HIGH 2>; clocks = <&udc_clk>, <&udpck>; @@ -905,7 +905,6 @@ atmel,watchdog-type = "hardware"; atmel,reset-type = "all"; atmel,dbg-halt; - atmel,idle-halt; status = "disabled"; }; |