Merge branch 'socfpga/dt' into next/dt
SoCFPGA DT changes from Dinh Nguyen. * socfpga/dt: dts: Rename DW APB timer compatible strings dts: Deprecate ALTR as a vendor prefix of: add vendor prefix for Altera Corp. Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
56e9e0f3a3
|
@ -1,7 +1,10 @@
|
|||
* Designware APB timer
|
||||
|
||||
Required properties:
|
||||
- compatible: "snps,dw-apb-timer-sp" or "snps,dw-apb-timer-osc"
|
||||
- compatible: One of:
|
||||
"snps,dw-apb-timer"
|
||||
"snps,dw-apb-timer-sp" <DEPRECATED>
|
||||
"snps,dw-apb-timer-osc" <DEPRECATED>
|
||||
- reg: physical base address of the controller and length of memory mapped
|
||||
region.
|
||||
- interrupts: IRQ line for the timer.
|
||||
|
@ -20,25 +23,10 @@ systems may use one.
|
|||
|
||||
|
||||
Example:
|
||||
|
||||
timer1: timer@ffc09000 {
|
||||
compatible = "snps,dw-apb-timer-sp";
|
||||
interrupts = <0 168 4>;
|
||||
clock-frequency = <200000000>;
|
||||
reg = <0xffc09000 0x1000>;
|
||||
};
|
||||
|
||||
timer2: timer@ffd00000 {
|
||||
compatible = "snps,dw-apb-timer-osc";
|
||||
interrupts = <0 169 4>;
|
||||
clock-frequency = <200000000>;
|
||||
reg = <0xffd00000 0x1000>;
|
||||
};
|
||||
|
||||
timer3: timer@ffe00000 {
|
||||
compatible = "snps,dw-apb-timer-osc";
|
||||
interrupts = <0 170 4>;
|
||||
reg = <0xffe00000 0x1000>;
|
||||
clocks = <&timer_clk>, <&timer_pclk>;
|
||||
clock-names = "timer", "pclk";
|
||||
};
|
||||
timer@ffe00000 {
|
||||
compatible = "snps,dw-apb-timer";
|
||||
interrupts = <0 170 4>;
|
||||
reg = <0xffe00000 0x1000>;
|
||||
clocks = <&timer_clk>, <&timer_pclk>;
|
||||
clock-names = "timer", "pclk";
|
||||
};
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
Altera JTAG UART
|
||||
|
||||
Required properties:
|
||||
- compatible : should be "ALTR,juart-1.0"
|
||||
- compatible : should be "ALTR,juart-1.0" <DEPRECATED>
|
||||
- compatible : should be "altr,juart-1.0"
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
Altera UART
|
||||
|
||||
Required properties:
|
||||
- compatible : should be "ALTR,uart-1.0"
|
||||
- compatible : should be "ALTR,uart-1.0" <DEPRECATED>
|
||||
- compatible : should be "altr,uart-1.0"
|
||||
|
||||
Optional properties:
|
||||
- clock-frequency : frequency of the clock input to the UART
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
Altera UP PS/2 controller
|
||||
|
||||
Required properties:
|
||||
- compatible : should be "ALTR,ps2-1.0".
|
||||
- compatible : should be "ALTR,ps2-1.0". <DEPRECATED>
|
||||
- compatible : should be "altr,ps2-1.0".
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
Altera SPI
|
||||
|
||||
Required properties:
|
||||
- compatible : should be "ALTR,spi-1.0".
|
||||
- compatible : should be "ALTR,spi-1.0". <DEPRECATED>
|
||||
- compatible : should be "altr,spi-1.0".
|
||||
|
|
|
@ -7,6 +7,7 @@ ad Avionic Design GmbH
|
|||
adi Analog Devices, Inc.
|
||||
aeroflexgaisler Aeroflex Gaisler AB
|
||||
ak Asahi Kasei Corp.
|
||||
altr Altera Corp.
|
||||
amcc Applied Micro Circuits Corporation (APM, formally AMCC)
|
||||
apm Applied Micro Circuits Corporation (APM)
|
||||
arm ARM Ltd.
|
||||
|
|
|
@ -476,25 +476,25 @@
|
|||
};
|
||||
|
||||
timer0: timer0@ffc08000 {
|
||||
compatible = "snps,dw-apb-timer-sp";
|
||||
compatible = "snps,dw-apb-timer";
|
||||
interrupts = <0 167 4>;
|
||||
reg = <0xffc08000 0x1000>;
|
||||
};
|
||||
|
||||
timer1: timer1@ffc09000 {
|
||||
compatible = "snps,dw-apb-timer-sp";
|
||||
compatible = "snps,dw-apb-timer";
|
||||
interrupts = <0 168 4>;
|
||||
reg = <0xffc09000 0x1000>;
|
||||
};
|
||||
|
||||
timer2: timer2@ffd00000 {
|
||||
compatible = "snps,dw-apb-timer-osc";
|
||||
compatible = "snps,dw-apb-timer";
|
||||
interrupts = <0 169 4>;
|
||||
reg = <0xffd00000 0x1000>;
|
||||
};
|
||||
|
||||
timer3: timer3@ffd01000 {
|
||||
compatible = "snps,dw-apb-timer-osc";
|
||||
compatible = "snps,dw-apb-timer";
|
||||
interrupts = <0 170 4>;
|
||||
reg = <0xffd01000 0x1000>;
|
||||
};
|
||||
|
|
|
@ -176,6 +176,7 @@ static int altera_ps2_remove(struct platform_device *pdev)
|
|||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id altera_ps2_match[] = {
|
||||
{ .compatible = "ALTR,ps2-1.0", },
|
||||
{ .compatible = "altr,ps2-1.0", },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, altera_ps2_match);
|
||||
|
|
|
@ -302,6 +302,7 @@ static int altera_spi_remove(struct platform_device *dev)
|
|||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id altera_spi_match[] = {
|
||||
{ .compatible = "ALTR,spi-1.0", },
|
||||
{ .compatible = "altr,spi-1.0", },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, altera_spi_match);
|
||||
|
|
|
@ -470,6 +470,7 @@ static int altera_jtaguart_remove(struct platform_device *pdev)
|
|||
#ifdef CONFIG_OF
|
||||
static struct of_device_id altera_jtaguart_match[] = {
|
||||
{ .compatible = "ALTR,juart-1.0", },
|
||||
{ .compatible = "altr,juart-1.0", },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, altera_jtaguart_match);
|
||||
|
|
|
@ -613,6 +613,7 @@ static int altera_uart_remove(struct platform_device *pdev)
|
|||
#ifdef CONFIG_OF
|
||||
static struct of_device_id altera_uart_match[] = {
|
||||
{ .compatible = "ALTR,uart-1.0", },
|
||||
{ .compatible = "altr,uart-1.0", },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, altera_uart_match);
|
||||
|
|
Loading…
Reference in a new issue