diff options
author | Dinh Nguyen <dinguyen@altera.com> | 2013-08-14 16:25:19 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-08-29 15:58:55 -0400 |
commit | 13960b47dc1df695f8537c32a0e0ce5ae5d4eee4 (patch) | |
tree | 44294a7a3bf360dbc4797bef9009758942488c3b | |
parent | 5db17a71a5260beecca9b1ea7a0a23dba860327a (diff) |
dts: Deprecate ALTR as a vendor prefix
Because most of the vendor prefixes are lower case, deprecate
the vendor prefix "ALTR" in place of "altr" for Altera Corp..
Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: devicetree@vger.kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | Documentation/devicetree/bindings/serial/altera_jtaguart.txt | 3 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/serial/altera_uart.txt | 3 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/serio/altera_ps2.txt | 3 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/spi/spi_altera.txt | 3 | ||||
-rw-r--r-- | drivers/input/serio/altera_ps2.c | 1 | ||||
-rw-r--r-- | drivers/spi/spi-altera.c | 1 | ||||
-rw-r--r-- | drivers/tty/serial/altera_jtaguart.c | 1 | ||||
-rw-r--r-- | drivers/tty/serial/altera_uart.c | 1 |
8 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/serial/altera_jtaguart.txt b/Documentation/devicetree/bindings/serial/altera_jtaguart.txt index c152f65f9a28..55a901051e8f 100644 --- a/Documentation/devicetree/bindings/serial/altera_jtaguart.txt +++ b/Documentation/devicetree/bindings/serial/altera_jtaguart.txt | |||
@@ -1,4 +1,5 @@ | |||
1 | Altera JTAG UART | 1 | Altera JTAG UART |
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : should be "ALTR,juart-1.0" | 4 | - compatible : should be "ALTR,juart-1.0" <DEPRECATED> |
5 | - compatible : should be "altr,juart-1.0" | ||
diff --git a/Documentation/devicetree/bindings/serial/altera_uart.txt b/Documentation/devicetree/bindings/serial/altera_uart.txt index 71cae3f70100..81bf7ffb1a81 100644 --- a/Documentation/devicetree/bindings/serial/altera_uart.txt +++ b/Documentation/devicetree/bindings/serial/altera_uart.txt | |||
@@ -1,7 +1,8 @@ | |||
1 | Altera UART | 1 | Altera UART |
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : should be "ALTR,uart-1.0" | 4 | - compatible : should be "ALTR,uart-1.0" <DEPRECATED> |
5 | - compatible : should be "altr,uart-1.0" | ||
5 | 6 | ||
6 | Optional properties: | 7 | Optional properties: |
7 | - clock-frequency : frequency of the clock input to the UART | 8 | - clock-frequency : frequency of the clock input to the UART |
diff --git a/Documentation/devicetree/bindings/serio/altera_ps2.txt b/Documentation/devicetree/bindings/serio/altera_ps2.txt index 4d9eecc2ef7d..520199e2e347 100644 --- a/Documentation/devicetree/bindings/serio/altera_ps2.txt +++ b/Documentation/devicetree/bindings/serio/altera_ps2.txt | |||
@@ -1,4 +1,5 @@ | |||
1 | Altera UP PS/2 controller | 1 | Altera UP PS/2 controller |
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : should be "ALTR,ps2-1.0". | 4 | - compatible : should be "ALTR,ps2-1.0". <DEPRECATED> |
5 | - compatible : should be "altr,ps2-1.0". | ||
diff --git a/Documentation/devicetree/bindings/spi/spi_altera.txt b/Documentation/devicetree/bindings/spi/spi_altera.txt index dda375943506..31319dcf30ab 100644 --- a/Documentation/devicetree/bindings/spi/spi_altera.txt +++ b/Documentation/devicetree/bindings/spi/spi_altera.txt | |||
@@ -1,4 +1,5 @@ | |||
1 | Altera SPI | 1 | Altera SPI |
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : should be "ALTR,spi-1.0". | 4 | - compatible : should be "ALTR,spi-1.0". <DEPRECATED> |
5 | - compatible : should be "altr,spi-1.0". | ||
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c index a0a2657e31ff..4777a73cd390 100644 --- a/drivers/input/serio/altera_ps2.c +++ b/drivers/input/serio/altera_ps2.c | |||
@@ -176,6 +176,7 @@ static int altera_ps2_remove(struct platform_device *pdev) | |||
176 | #ifdef CONFIG_OF | 176 | #ifdef CONFIG_OF |
177 | static const struct of_device_id altera_ps2_match[] = { | 177 | static const struct of_device_id altera_ps2_match[] = { |
178 | { .compatible = "ALTR,ps2-1.0", }, | 178 | { .compatible = "ALTR,ps2-1.0", }, |
179 | { .compatible = "altr,ps2-1.0", }, | ||
179 | {}, | 180 | {}, |
180 | }; | 181 | }; |
181 | MODULE_DEVICE_TABLE(of, altera_ps2_match); | 182 | MODULE_DEVICE_TABLE(of, altera_ps2_match); |
diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c index 81b9adb6e766..7456eef201a6 100644 --- a/drivers/spi/spi-altera.c +++ b/drivers/spi/spi-altera.c | |||
@@ -302,6 +302,7 @@ static int altera_spi_remove(struct platform_device *dev) | |||
302 | #ifdef CONFIG_OF | 302 | #ifdef CONFIG_OF |
303 | static const struct of_device_id altera_spi_match[] = { | 303 | static const struct of_device_id altera_spi_match[] = { |
304 | { .compatible = "ALTR,spi-1.0", }, | 304 | { .compatible = "ALTR,spi-1.0", }, |
305 | { .compatible = "altr,spi-1.0", }, | ||
305 | {}, | 306 | {}, |
306 | }; | 307 | }; |
307 | MODULE_DEVICE_TABLE(of, altera_spi_match); | 308 | MODULE_DEVICE_TABLE(of, altera_spi_match); |
diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c index c6bdb943726b..dbc7f121162f 100644 --- a/drivers/tty/serial/altera_jtaguart.c +++ b/drivers/tty/serial/altera_jtaguart.c | |||
@@ -470,6 +470,7 @@ static int altera_jtaguart_remove(struct platform_device *pdev) | |||
470 | #ifdef CONFIG_OF | 470 | #ifdef CONFIG_OF |
471 | static struct of_device_id altera_jtaguart_match[] = { | 471 | static struct of_device_id altera_jtaguart_match[] = { |
472 | { .compatible = "ALTR,juart-1.0", }, | 472 | { .compatible = "ALTR,juart-1.0", }, |
473 | { .compatible = "altr,juart-1.0", }, | ||
473 | {}, | 474 | {}, |
474 | }; | 475 | }; |
475 | MODULE_DEVICE_TABLE(of, altera_jtaguart_match); | 476 | MODULE_DEVICE_TABLE(of, altera_jtaguart_match); |
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c index 1d46966e2a65..8b5a8a2caebc 100644 --- a/drivers/tty/serial/altera_uart.c +++ b/drivers/tty/serial/altera_uart.c | |||
@@ -613,6 +613,7 @@ static int altera_uart_remove(struct platform_device *pdev) | |||
613 | #ifdef CONFIG_OF | 613 | #ifdef CONFIG_OF |
614 | static struct of_device_id altera_uart_match[] = { | 614 | static struct of_device_id altera_uart_match[] = { |
615 | { .compatible = "ALTR,uart-1.0", }, | 615 | { .compatible = "ALTR,uart-1.0", }, |
616 | { .compatible = "altr,uart-1.0", }, | ||
616 | {}, | 617 | {}, |
617 | }; | 618 | }; |
618 | MODULE_DEVICE_TABLE(of, altera_uart_match); | 619 | MODULE_DEVICE_TABLE(of, altera_uart_match); |