Skip to content

L
linux
Commit f9d6fa5d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'at91-fixes' of... 

Merge tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes

Merge "First fixes for 4.4" from Nicolas Ferre:
- removal of a useless defconfig option
- removal of some legacy DT pieces
- use of the proper watchdog compatible string
- addition of some sama5d2 Xplained nodes now that the MFD include is in place
- update of the MAINTAINERS entries for some Atmel drivers

* tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  MAINTAINERS: Atmel drivers: change NAND and ISI entries
  ARM: at91/dt: sama5d2 Xplained: add several devices
  ARM: at91/dt: remove bootargs
  ARM: at91/dt: remove leftovers clock definition
  ARM: at91/dt: replace gpio-key,wakeup with wakeup-source property
  ARM: at91/dt: sama5d4: change watchdog compatible
  ARM: at91/defconfig: remove CONFIG_SSB from Atmel defconfigs
parents a203a2a9 50cb2efa
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 149 deletions
MAINTAINERS
View file @ f9d6fa5d
...@@ -1931,7 +1931,7 @@ S: Supported ...@@ -1931,7 +1931,7 @@ S: Supported
F: drivers/i2c/busses/i2c-at91.c F: drivers/i2c/busses/i2c-at91.c
ATMEL ISI DRIVER ATMEL ISI DRIVER
M: Josh Wu <josh.wu@atmel.com> M: Ludovic Desroches <ludovic.desroches@atmel.com>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
S: Supported S: Supported
F: drivers/media/platform/soc_camera/atmel-isi.c F: drivers/media/platform/soc_camera/atmel-isi.c
...@@ -1950,7 +1950,8 @@ S: Supported ...@@ -1950,7 +1950,8 @@ S: Supported
F: drivers/net/ethernet/cadence/ F: drivers/net/ethernet/cadence/
ATMEL NAND DRIVER ATMEL NAND DRIVER
M: Josh Wu <josh.wu@atmel.com> M: Wenyou Yang <wenyou.yang@atmel.com>
M: Josh Wu <rainyfeeling@outlook.com>
L: linux-mtd@lists.infradead.org L: linux-mtd@lists.infradead.org
S: Supported S: Supported
F: drivers/mtd/nand/atmel_nand* F: drivers/mtd/nand/atmel_nand*
......
arch/arm/boot/dts/animeo_ip.dts
View file @ f9d6fa5d
...@@ -155,21 +155,21 @@ keyswitch_in { ...@@ -155,21 +155,21 @@ keyswitch_in {
label = "keyswitch_in"; label = "keyswitch_in";
gpios = <&pioB 1 GPIO_ACTIVE_HIGH>; gpios = <&pioB 1 GPIO_ACTIVE_HIGH>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; wakeup-source;
}; };
error_in { error_in {
label = "error_in"; label = "error_in";
gpios = <&pioB 2 GPIO_ACTIVE_HIGH>; gpios = <&pioB 2 GPIO_ACTIVE_HIGH>;
linux,code = <29>; linux,code = <29>;
gpio-key,wakeup; wakeup-source;
}; };
btn { btn {
label = "btn"; label = "btn";
gpios = <&pioC 23 GPIO_ACTIVE_HIGH>; gpios = <&pioC 23 GPIO_ACTIVE_HIGH>;
linux,code = <31>; linux,code = <31>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
}; };
arch/arm/boot/dts/at91-foxg20.dts
View file @ f9d6fa5d
...@@ -159,7 +159,7 @@ btn { ...@@ -159,7 +159,7 @@ btn {
label = "Button"; label = "Button";
gpios = <&pioC 4 GPIO_ACTIVE_LOW>; gpios = <&pioC 4 GPIO_ACTIVE_LOW>;
linux,code = <0x103>; linux,code = <0x103>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
}; };
arch/arm/boot/dts/at91-kizbox.dts
View file @ f9d6fa5d
...@@ -24,15 +24,6 @@ memory { ...@@ -24,15 +24,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <18432000>;
};
main_xtal { main_xtal {
clock-frequency = <18432000>; clock-frequency = <18432000>;
}; };
...@@ -94,14 +85,14 @@ reset { ...@@ -94,14 +85,14 @@ reset {
label = "PB_RST"; label = "PB_RST";
gpios = <&pioB 30 GPIO_ACTIVE_HIGH>; gpios = <&pioB 30 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; wakeup-source;
}; };
user { user {
label = "PB_USER"; label = "PB_USER";
gpios = <&pioB 31 GPIO_ACTIVE_HIGH>; gpios = <&pioB 31 GPIO_ACTIVE_HIGH>;
linux,code = <0x101>; linux,code = <0x101>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/at91-kizbox2.dts
View file @ f9d6fa5d
...@@ -171,21 +171,21 @@ prog { ...@@ -171,21 +171,21 @@ prog {
label = "PB_PROG"; label = "PB_PROG";
gpios = <&pioE 27 GPIO_ACTIVE_LOW>; gpios = <&pioE 27 GPIO_ACTIVE_LOW>;
linux,code = <0x102>; linux,code = <0x102>;
gpio-key,wakeup; wakeup-source;
}; };
reset { reset {
label = "PB_RST"; label = "PB_RST";
gpios = <&pioE 29 GPIO_ACTIVE_LOW>; gpios = <&pioE 29 GPIO_ACTIVE_LOW>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; wakeup-source;
}; };
user { user {
label = "PB_USER"; label = "PB_USER";
gpios = <&pioE 31 GPIO_ACTIVE_HIGH>; gpios = <&pioE 31 GPIO_ACTIVE_HIGH>;
linux,code = <0x101>; linux,code = <0x101>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/at91-kizboxmini.dts
View file @ f9d6fa5d
...@@ -98,14 +98,14 @@ prog { ...@@ -98,14 +98,14 @@ prog {
label = "PB_PROG"; label = "PB_PROG";
gpios = <&pioC 17 GPIO_ACTIVE_LOW>; gpios = <&pioC 17 GPIO_ACTIVE_LOW>;
linux,code = <0x102>; linux,code = <0x102>;
gpio-key,wakeup; wakeup-source;
}; };
reset { reset {
label = "PB_RST"; label = "PB_RST";
gpios = <&pioC 16 GPIO_ACTIVE_LOW>; gpios = <&pioC 16 GPIO_ACTIVE_LOW>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/at91-qil_a9260.dts
View file @ f9d6fa5d
...@@ -183,7 +183,7 @@ user_pb { ...@@ -183,7 +183,7 @@ user_pb {
label = "user_pb"; label = "user_pb";
gpios = <&pioB 10 GPIO_ACTIVE_LOW>; gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/at91-sama5d2_xplained.dts
View file @ f9d6fa5d
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
/dts-v1/; /dts-v1/;
#include "sama5d2.dtsi" #include "sama5d2.dtsi"
#include "sama5d2-pinfunc.h" #include "sama5d2-pinfunc.h"
#include <dt-bindings/mfd/atmel-flexcom.h>
/ { / {
model = "Atmel SAMA5D2 Xplained"; model = "Atmel SAMA5D2 Xplained";
...@@ -59,15 +60,6 @@ memory { ...@@ -59,15 +60,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -91,6 +83,22 @@ usb2: ehci@00500000 { ...@@ -91,6 +83,22 @@ usb2: ehci@00500000 {
status = "okay"; status = "okay";
}; };
sdmmc0: sdio-host@a0000000 {
bus-width = <8>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc0_default>;
non-removable;
mmc-ddr-1_8v;
status = "okay";
};
sdmmc1: sdio-host@b0000000 {
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc1_default>;
status = "okay"; /* conflict with qspi0 */
};
apb { apb {
spi0: spi@f8000000 { spi0: spi@f8000000 {
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -181,12 +189,49 @@ vdd_sdhc_1v8_reg: LDO_REG4 { ...@@ -181,12 +189,49 @@ vdd_sdhc_1v8_reg: LDO_REG4 {
}; };
}; };
flx0: flexcom@f8034000 {
atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;
status = "disabled"; /* conflict with ISC_D2 & ISC_D3 data pins */
uart5: serial@200 {
compatible = "atmel,at91sam9260-usart";
reg = <0x200 0x200>;
interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&flx0_clk>;
clock-names = "usart";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flx0_default>;
atmel,fifo-size = <32>;
status = "okay";
};
};
uart3: serial@fc008000 { uart3: serial@fc008000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart3_default>; pinctrl-0 = <&pinctrl_uart3_default>;
status = "okay"; status = "okay";
}; };
flx4: flexcom@fc018000 {
atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
status = "okay";
i2c2: i2c@600 {
compatible = "atmel,sama5d2-i2c";
reg = <0x600 0x200>;
interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
dmas = <0>, <0>;
dma-names = "tx", "rx";
#address-cells = <1>;
#size-cells = <0>;
clocks = <&flx4_clk>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flx4_default>;
atmel,fifo-size = <16>;
status = "okay";
};
};
i2c1: i2c@fc028000 { i2c1: i2c@fc028000 {
dmas = <0>, <0>; dmas = <0>, <0>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -201,6 +246,18 @@ at24@54 { ...@@ -201,6 +246,18 @@ at24@54 {
}; };
pinctrl@fc038000 { pinctrl@fc038000 {
pinctrl_flx0_default: flx0_default {
pinmux = <PIN_PB28__FLEXCOM0_IO0>,
<PIN_PB29__FLEXCOM0_IO1>;
bias-disable;
};
pinctrl_flx4_default: flx4_default {
pinmux = <PIN_PD12__FLEXCOM4_IO0>,
<PIN_PD13__FLEXCOM4_IO1>;
bias-disable;
};
pinctrl_i2c0_default: i2c0_default { pinctrl_i2c0_default: i2c0_default {
pinmux = <PIN_PD21__TWD0>, pinmux = <PIN_PD21__TWD0>,
<PIN_PD22__TWCK0>; <PIN_PD22__TWCK0>;
...@@ -227,6 +284,46 @@ pinctrl_macb0_default: macb0_default { ...@@ -227,6 +284,46 @@ pinctrl_macb0_default: macb0_default {
bias-disable; bias-disable;
}; };
pinctrl_sdmmc0_default: sdmmc0_default {
cmd_data {
pinmux = <PIN_PA1__SDMMC0_CMD>,
<PIN_PA2__SDMMC0_DAT0>,
<PIN_PA3__SDMMC0_DAT1>,
<PIN_PA4__SDMMC0_DAT2>,
<PIN_PA5__SDMMC0_DAT3>,
<PIN_PA6__SDMMC0_DAT4>,
<PIN_PA7__SDMMC0_DAT5>,
<PIN_PA8__SDMMC0_DAT6>,
<PIN_PA9__SDMMC0_DAT7>;
bias-pull-up;
};
ck_cd_rstn_vddsel {
pinmux = <PIN_PA0__SDMMC0_CK>,
<PIN_PA10__SDMMC0_RSTN>,
<PIN_PA11__SDMMC0_VDDSEL>,
<PIN_PA13__SDMMC0_CD>;
bias-disable;
};
};
pinctrl_sdmmc1_default: sdmmc1_default {
cmd_data {
pinmux = <PIN_PA28__SDMMC1_CMD>,
<PIN_PA18__SDMMC1_DAT0>,
<PIN_PA19__SDMMC1_DAT1>,
<PIN_PA20__SDMMC1_DAT2>,
<PIN_PA21__SDMMC1_DAT3>;
bias-pull-up;
};
conf-ck_cd {
pinmux = <PIN_PA22__SDMMC1_CK>,
<PIN_PA30__SDMMC1_CD>;
bias-disable;
};
};
pinctrl_spi0_default: spi0_default { pinctrl_spi0_default: spi0_default {
pinmux = <PIN_PA14__SPI0_SPCK>, pinmux = <PIN_PA14__SPI0_SPCK>,
<PIN_PA15__SPI0_MOSI>, <PIN_PA15__SPI0_MOSI>,
......
arch/arm/boot/dts/at91-sama5d3_xplained.dts
View file @ f9d6fa5d
...@@ -315,7 +315,7 @@ bp3 { ...@@ -315,7 +315,7 @@ bp3 {
label = "PB_USER"; label = "PB_USER";
gpios = <&pioE 29 GPIO_ACTIVE_LOW>; gpios = <&pioE 29 GPIO_ACTIVE_LOW>;
linux,code = <0x104>; linux,code = <0x104>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/at91-sama5d4_xplained.dts
View file @ f9d6fa5d
...@@ -50,7 +50,6 @@ / { ...@@ -50,7 +50,6 @@ / {
compatible = "atmel,sama5d4-xplained", "atmel,sama5d4", "atmel,sama5"; compatible = "atmel,sama5d4-xplained", "atmel,sama5d4", "atmel,sama5";
chosen { chosen {
bootargs = "ignore_loglevel earlyprintk";
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
...@@ -59,15 +58,6 @@ memory { ...@@ -59,15 +58,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -235,7 +225,7 @@ pb_user1 { ...@@ -235,7 +225,7 @@ pb_user1 {
label = "pb_user1"; label = "pb_user1";
gpios = <&pioE 8 GPIO_ACTIVE_HIGH>; gpios = <&pioE 8 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/at91-sama5d4ek.dts
View file @ f9d6fa5d
...@@ -50,7 +50,6 @@ / { ...@@ -50,7 +50,6 @@ / {
compatible = "atmel,sama5d4ek", "atmel,sama5d4", "atmel,sama5"; compatible = "atmel,sama5d4ek", "atmel,sama5d4", "atmel,sama5";
chosen { chosen {
bootargs = "ignore_loglevel earlyprintk";
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
...@@ -59,15 +58,6 @@ memory { ...@@ -59,15 +58,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -304,7 +294,7 @@ pb_user1 { ...@@ -304,7 +294,7 @@ pb_user1 {
label = "pb_user1"; label = "pb_user1";
gpios = <&pioE 13 GPIO_ACTIVE_HIGH>; gpios = <&pioE 13 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/at91rm9200ek.dts
View file @ f9d6fa5d
...@@ -21,15 +21,6 @@ memory { ...@@ -21,15 +21,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <18432000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
......
arch/arm/boot/dts/at91sam9261ek.dts
View file @ f9d6fa5d
...@@ -22,15 +22,6 @@ memory { ...@@ -22,15 +22,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <18432000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -149,7 +140,7 @@ tsc2046@0 { ...@@ -149,7 +140,7 @@ tsc2046@0 {
ti,debounce-tol = /bits/ 16 <65535>; ti,debounce-tol = /bits/ 16 <65535>;
ti,debounce-max = /bits/ 16 <1>; ti,debounce-max = /bits/ 16 <1>;
linux,wakeup; wakeup-source;
}; };
}; };
...@@ -193,28 +184,28 @@ button_0 { ...@@ -193,28 +184,28 @@ button_0 {
label = "button_0"; label = "button_0";
gpios = <&pioA 27 GPIO_ACTIVE_LOW>; gpios = <&pioA 27 GPIO_ACTIVE_LOW>;
linux,code = <256>; linux,code = <256>;
gpio-key,wakeup; wakeup-source;
}; };
button_1 { button_1 {
label = "button_1"; label = "button_1";
gpios = <&pioA 26 GPIO_ACTIVE_LOW>; gpios = <&pioA 26 GPIO_ACTIVE_LOW>;
linux,code = <257>; linux,code = <257>;
gpio-key,wakeup; wakeup-source;
}; };
button_2 { button_2 {
label = "button_2"; label = "button_2";
gpios = <&pioA 25 GPIO_ACTIVE_LOW>; gpios = <&pioA 25 GPIO_ACTIVE_LOW>;
linux,code = <258>; linux,code = <258>;
gpio-key,wakeup; wakeup-source;
}; };
button_3 { button_3 {
label = "button_3"; label = "button_3";
gpios = <&pioA 24 GPIO_ACTIVE_LOW>; gpios = <&pioA 24 GPIO_ACTIVE_LOW>;
linux,code = <259>; linux,code = <259>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
}; };
arch/arm/boot/dts/at91sam9263ek.dts
View file @ f9d6fa5d
...@@ -22,15 +22,6 @@ memory { ...@@ -22,15 +22,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <16367660>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -213,14 +204,14 @@ left_click { ...@@ -213,14 +204,14 @@ left_click {
label = "left_click"; label = "left_click";
gpios = <&pioC 5 GPIO_ACTIVE_LOW>; gpios = <&pioC 5 GPIO_ACTIVE_LOW>;
linux,code = <272>; linux,code = <272>;
gpio-key,wakeup; wakeup-source;
}; };
right_click { right_click {
label = "right_click"; label = "right_click";
gpios = <&pioC 4 GPIO_ACTIVE_LOW>; gpios = <&pioC 4 GPIO_ACTIVE_LOW>;
linux,code = <273>; linux,code = <273>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/at91sam9g20ek_common.dtsi
View file @ f9d6fa5d
...@@ -19,15 +19,6 @@ memory { ...@@ -19,15 +19,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <18432000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -206,14 +197,14 @@ btn3 { ...@@ -206,14 +197,14 @@ btn3 {
label = "Button 3"; label = "Button 3";
gpios = <&pioA 30 GPIO_ACTIVE_LOW>; gpios = <&pioA 30 GPIO_ACTIVE_LOW>;
linux,code = <0x103>; linux,code = <0x103>;
gpio-key,wakeup; wakeup-source;
}; };
btn4 { btn4 {
label = "Button 4"; label = "Button 4";
gpios = <&pioA 31 GPIO_ACTIVE_LOW>; gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
linux,code = <0x104>; linux,code = <0x104>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/at91sam9m10g45ek.dts
View file @ f9d6fa5d
...@@ -24,15 +24,6 @@ memory { ...@@ -24,15 +24,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -323,14 +314,14 @@ left_click { ...@@ -323,14 +314,14 @@ left_click {
label = "left_click"; label = "left_click";
gpios = <&pioB 6 GPIO_ACTIVE_LOW>; gpios = <&pioB 6 GPIO_ACTIVE_LOW>;
linux,code = <272>; linux,code = <272>;
gpio-key,wakeup; wakeup-source;
}; };
right_click { right_click {
label = "right_click"; label = "right_click";
gpios = <&pioB 7 GPIO_ACTIVE_LOW>; gpios = <&pioB 7 GPIO_ACTIVE_LOW>;
linux,code = <273>; linux,code = <273>;
gpio-key,wakeup; wakeup-source;
}; };
left { left {
......
arch/arm/boot/dts/at91sam9n12ek.dts
View file @ f9d6fa5d
...@@ -23,15 +23,6 @@ memory { ...@@ -23,15 +23,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <16000000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -219,7 +210,7 @@ enter { ...@@ -219,7 +210,7 @@ enter {
label = "Enter"; label = "Enter";
gpios = <&pioB 3 GPIO_ACTIVE_LOW>; gpios = <&pioB 3 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/at91sam9rlek.dts
View file @ f9d6fa5d
...@@ -22,15 +22,6 @@ memory { ...@@ -22,15 +22,6 @@ memory {
}; };
clocks { clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
...@@ -225,14 +216,14 @@ right_click { ...@@ -225,14 +216,14 @@ right_click {
label = "right_click"; label = "right_click";
gpios = <&pioB 0 GPIO_ACTIVE_LOW>; gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
linux,code = <273>; linux,code = <273>;
gpio-key,wakeup; wakeup-source;
}; };
left_click { left_click {
label = "left_click"; label = "left_click";
gpios = <&pioB 1 GPIO_ACTIVE_LOW>; gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
linux,code = <272>; linux,code = <272>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/at91sam9x5cm.dtsi
View file @ f9d6fa5d
...@@ -12,17 +12,6 @@ memory { ...@@ -12,17 +12,6 @@ memory {
reg = <0x20000000 0x8000000>; reg = <0x20000000 0x8000000>;
}; };
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
};
clocks { clocks {
slow_xtal { slow_xtal {
clock-frequency = <32768>; clock-frequency = <32768>;
......
arch/arm/boot/dts/sama5d35ek.dts
View file @ f9d6fa5d
...@@ -49,7 +49,7 @@ pb_user1 { ...@@ -49,7 +49,7 @@ pb_user1 {
label = "pb_user1"; label = "pb_user1";
gpios = <&pioE 27 GPIO_ACTIVE_HIGH>; gpios = <&pioE 27 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
}; };
arch/arm/boot/dts/sama5d4.dtsi
View file @ f9d6fa5d
...@@ -1300,7 +1300,7 @@ pit: timer@fc068630 { ...@@ -1300,7 +1300,7 @@ pit: timer@fc068630 {
}; };
watchdog@fc068640 { watchdog@fc068640 {
compatible = "atmel,at91sam9260-wdt"; compatible = "atmel,sama5d4-wdt";
reg = <0xfc068640 0x10>; reg = <0xfc068640 0x10>;
clocks = <&clk32k>; clocks = <&clk32k>;
status = "disabled"; status = "disabled";
......
arch/arm/boot/dts/usb_a9260_common.dtsi
View file @ f9d6fa5d
...@@ -115,7 +115,7 @@ user_pb { ...@@ -115,7 +115,7 @@ user_pb {
label = "user_pb"; label = "user_pb";
gpios = <&pioB 10 GPIO_ACTIVE_LOW>; gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/usb_a9263.dts
View file @ f9d6fa5d
...@@ -143,7 +143,7 @@ user_pb { ...@@ -143,7 +143,7 @@ user_pb {
label = "user_pb"; label = "user_pb";
gpios = <&pioB 10 GPIO_ACTIVE_LOW>; gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
......
arch/arm/configs/at91_dt_defconfig
View file @ f9d6fa5d
...@@ -125,7 +125,6 @@ CONFIG_POWER_RESET=y ...@@ -125,7 +125,6 @@ CONFIG_POWER_RESET=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_AT91SAM9X_WATCHDOG=y CONFIG_AT91SAM9X_WATCHDOG=y
CONFIG_SSB=m
CONFIG_MFD_ATMEL_HLCDC=y CONFIG_MFD_ATMEL_HLCDC=y
CONFIG_REGULATOR=y CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y
......
arch/arm/configs/sama5_defconfig
View file @ f9d6fa5d
...@@ -129,7 +129,6 @@ CONFIG_GPIO_SYSFS=y ...@@ -129,7 +129,6 @@ CONFIG_GPIO_SYSFS=y
CONFIG_POWER_SUPPLY=y CONFIG_POWER_SUPPLY=y
CONFIG_POWER_RESET=y CONFIG_POWER_RESET=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
CONFIG_SSB=m
CONFIG_MFD_ATMEL_FLEXCOM=y CONFIG_MFD_ATMEL_FLEXCOM=y
CONFIG_REGULATOR=y CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7