aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Riegel <damien.riegel@savoirfairelinux.com>2017-12-07 10:19:41 -0500
committerAndy Gross <andy.gross@linaro.org>2018-01-01 00:50:13 -0500
commit500566e0e9fc1e5f3d260c691c58071cab596598 (patch)
tree16e703d328a7e3e94c22949e47a90c3be41b1357
parent24fe618b2d9a10091454def66838b786f0649855 (diff)
arm64: dts: qcom: msm8916: normalize I2C and SPI nodes
The QUP core can be used either for I2C or SPI, so the same IP is mapped by a driver or the other. SPI bindings use a leading 0 for the start address and a size of 0x600, I2C bindings don't have the leading 0 and have a size 0x1000. To make them more similar, add the leading 0 to I2C bindings and changes the size to 0x500 for all of them, as this is the actual size of these blocks. Also align the second entry of the clocks array. Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com> Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Andy Gross <andy.gross@linaro.org>
-rw-r--r--arch/arm64/boot/dts/qcom/msm8916.dtsi24
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index b84c0ca4f84a..e51b04900726 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -355,7 +355,7 @@
355 355
356 blsp_spi1: spi@78b5000 { 356 blsp_spi1: spi@78b5000 {
357 compatible = "qcom,spi-qup-v2.2.1"; 357 compatible = "qcom,spi-qup-v2.2.1";
358 reg = <0x078b5000 0x600>; 358 reg = <0x078b5000 0x500>;
359 interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>; 359 interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
360 clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>, 360 clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>,
361 <&gcc GCC_BLSP1_AHB_CLK>; 361 <&gcc GCC_BLSP1_AHB_CLK>;
@@ -372,7 +372,7 @@
372 372
373 blsp_spi2: spi@78b6000 { 373 blsp_spi2: spi@78b6000 {
374 compatible = "qcom,spi-qup-v2.2.1"; 374 compatible = "qcom,spi-qup-v2.2.1";
375 reg = <0x078b6000 0x600>; 375 reg = <0x078b6000 0x500>;
376 interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; 376 interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
377 clocks = <&gcc GCC_BLSP1_QUP2_SPI_APPS_CLK>, 377 clocks = <&gcc GCC_BLSP1_QUP2_SPI_APPS_CLK>,
378 <&gcc GCC_BLSP1_AHB_CLK>; 378 <&gcc GCC_BLSP1_AHB_CLK>;
@@ -389,7 +389,7 @@
389 389
390 blsp_spi3: spi@78b7000 { 390 blsp_spi3: spi@78b7000 {
391 compatible = "qcom,spi-qup-v2.2.1"; 391 compatible = "qcom,spi-qup-v2.2.1";
392 reg = <0x078b7000 0x600>; 392 reg = <0x078b7000 0x500>;
393 interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; 393 interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
394 clocks = <&gcc GCC_BLSP1_QUP3_SPI_APPS_CLK>, 394 clocks = <&gcc GCC_BLSP1_QUP3_SPI_APPS_CLK>,
395 <&gcc GCC_BLSP1_AHB_CLK>; 395 <&gcc GCC_BLSP1_AHB_CLK>;
@@ -406,7 +406,7 @@
406 406
407 blsp_spi4: spi@78b8000 { 407 blsp_spi4: spi@78b8000 {
408 compatible = "qcom,spi-qup-v2.2.1"; 408 compatible = "qcom,spi-qup-v2.2.1";
409 reg = <0x078b8000 0x600>; 409 reg = <0x078b8000 0x500>;
410 interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>; 410 interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
411 clocks = <&gcc GCC_BLSP1_QUP4_SPI_APPS_CLK>, 411 clocks = <&gcc GCC_BLSP1_QUP4_SPI_APPS_CLK>,
412 <&gcc GCC_BLSP1_AHB_CLK>; 412 <&gcc GCC_BLSP1_AHB_CLK>;
@@ -423,7 +423,7 @@
423 423
424 blsp_spi5: spi@78b9000 { 424 blsp_spi5: spi@78b9000 {
425 compatible = "qcom,spi-qup-v2.2.1"; 425 compatible = "qcom,spi-qup-v2.2.1";
426 reg = <0x078b9000 0x600>; 426 reg = <0x078b9000 0x500>;
427 interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; 427 interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
428 clocks = <&gcc GCC_BLSP1_QUP5_SPI_APPS_CLK>, 428 clocks = <&gcc GCC_BLSP1_QUP5_SPI_APPS_CLK>,
429 <&gcc GCC_BLSP1_AHB_CLK>; 429 <&gcc GCC_BLSP1_AHB_CLK>;
@@ -440,7 +440,7 @@
440 440
441 blsp_spi6: spi@78ba000 { 441 blsp_spi6: spi@78ba000 {
442 compatible = "qcom,spi-qup-v2.2.1"; 442 compatible = "qcom,spi-qup-v2.2.1";
443 reg = <0x078ba000 0x600>; 443 reg = <0x078ba000 0x500>;
444 interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; 444 interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
445 clocks = <&gcc GCC_BLSP1_QUP6_SPI_APPS_CLK>, 445 clocks = <&gcc GCC_BLSP1_QUP6_SPI_APPS_CLK>,
446 <&gcc GCC_BLSP1_AHB_CLK>; 446 <&gcc GCC_BLSP1_AHB_CLK>;
@@ -457,10 +457,10 @@
457 457
458 blsp_i2c2: i2c@78b6000 { 458 blsp_i2c2: i2c@78b6000 {
459 compatible = "qcom,i2c-qup-v2.2.1"; 459 compatible = "qcom,i2c-qup-v2.2.1";
460 reg = <0x78b6000 0x1000>; 460 reg = <0x078b6000 0x500>;
461 interrupts = <GIC_SPI 96 0>; 461 interrupts = <GIC_SPI 96 0>;
462 clocks = <&gcc GCC_BLSP1_AHB_CLK>, 462 clocks = <&gcc GCC_BLSP1_AHB_CLK>,
463 <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>; 463 <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
464 clock-names = "iface", "core"; 464 clock-names = "iface", "core";
465 pinctrl-names = "default", "sleep"; 465 pinctrl-names = "default", "sleep";
466 pinctrl-0 = <&i2c2_default>; 466 pinctrl-0 = <&i2c2_default>;
@@ -472,10 +472,10 @@
472 472
473 blsp_i2c4: i2c@78b8000 { 473 blsp_i2c4: i2c@78b8000 {
474 compatible = "qcom,i2c-qup-v2.2.1"; 474 compatible = "qcom,i2c-qup-v2.2.1";
475 reg = <0x78b8000 0x1000>; 475 reg = <0x078b8000 0x500>;
476 interrupts = <GIC_SPI 98 0>; 476 interrupts = <GIC_SPI 98 0>;
477 clocks = <&gcc GCC_BLSP1_AHB_CLK>, 477 clocks = <&gcc GCC_BLSP1_AHB_CLK>,
478 <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>; 478 <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>;
479 clock-names = "iface", "core"; 479 clock-names = "iface", "core";
480 pinctrl-names = "default", "sleep"; 480 pinctrl-names = "default", "sleep";
481 pinctrl-0 = <&i2c4_default>; 481 pinctrl-0 = <&i2c4_default>;
@@ -487,10 +487,10 @@
487 487
488 blsp_i2c6: i2c@78ba000 { 488 blsp_i2c6: i2c@78ba000 {
489 compatible = "qcom,i2c-qup-v2.2.1"; 489 compatible = "qcom,i2c-qup-v2.2.1";
490 reg = <0x78ba000 0x1000>; 490 reg = <0x078ba000 0x500>;
491 interrupts = <GIC_SPI 100 0>; 491 interrupts = <GIC_SPI 100 0>;
492 clocks = <&gcc GCC_BLSP1_AHB_CLK>, 492 clocks = <&gcc GCC_BLSP1_AHB_CLK>,
493 <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>; 493 <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>;
494 clock-names = "iface", "core"; 494 clock-names = "iface", "core";
495 pinctrl-names = "default", "sleep"; 495 pinctrl-names = "default", "sleep";
496 pinctrl-0 = <&i2c6_default>; 496 pinctrl-0 = <&i2c6_default>;