The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: alexander.levin@verizon.com
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	alexander.levin@verizon.com
Subject: [PATCH AUTOSEL for 4.14 29/51] dt-bindings: timer: renesas, cmt: Fix SoC-specific compatible values
Date: Wed, 22 Nov 2017 22:25:43 +0000	[thread overview]
Message-ID: <20171122222526.20021-29-alexander.levin@verizon.com> (raw)
In-Reply-To: <20171122222526.20021-1-alexander.levin@verizon.com>

From: Geert Uytterhoeven <geert+renesas@glider.be>

[ Upstream commit e20824e944c3bf4352fcd8d9f446c41b53901e7b ]

While the new family-specific compatible values introduced by commit
6f54cc1adcc8957f ("devicetree: bindings: R-Car Gen2 CMT0 and CMT1
bindings") use the recommended order "<vendor>,<family>-<device>", the
new SoC-specific compatible values still use the old and deprecated
order "<vendor>,<device>-<soc>".

Switch the SoC-specific compatible values to the recommended order while
there are no upstream users of these compatible values yet.

Fixes: 7f03a0ecfdc786c1 ("devicetree: bindings: r8a73a4 and R-Car Gen2 CMT bindings")
Fixes: 63d9e8ca0dd4bfa4 ("devicetree: bindings: Deprecate property, update example")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
 .../devicetree/bindings/timer/renesas,cmt.txt      | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Documentation/devicetree/bindings/timer/renesas,cmt.txt b/Documentation/devicetree/bindings/timer/renesas,cmt.txt
index 6ca6b9e582a0..d740989eb569 100644
--- a/Documentation/devicetree/bindings/timer/renesas,cmt.txt
+++ b/Documentation/devicetree/bindings/timer/renesas,cmt.txt
@@ -20,16 +20,16 @@ Required Properties:
 		(CMT1 on sh73a0 and r8a7740)
 		This is a fallback for the above renesas,cmt-48-* entries.
 
-    - "renesas,cmt0-r8a73a4" for the 32-bit CMT0 device included in r8a73a4.
-    - "renesas,cmt1-r8a73a4" for the 48-bit CMT1 device included in r8a73a4.
-    - "renesas,cmt0-r8a7790" for the 32-bit CMT0 device included in r8a7790.
-    - "renesas,cmt1-r8a7790" for the 48-bit CMT1 device included in r8a7790.
-    - "renesas,cmt0-r8a7791" for the 32-bit CMT0 device included in r8a7791.
-    - "renesas,cmt1-r8a7791" for the 48-bit CMT1 device included in r8a7791.
-    - "renesas,cmt0-r8a7793" for the 32-bit CMT0 device included in r8a7793.
-    - "renesas,cmt1-r8a7793" for the 48-bit CMT1 device included in r8a7793.
-    - "renesas,cmt0-r8a7794" for the 32-bit CMT0 device included in r8a7794.
-    - "renesas,cmt1-r8a7794" for the 48-bit CMT1 device included in r8a7794.
+    - "renesas,r8a73a4-cmt0" for the 32-bit CMT0 device included in r8a73a4.
+    - "renesas,r8a73a4-cmt1" for the 48-bit CMT1 device included in r8a73a4.
+    - "renesas,r8a7790-cmt0" for the 32-bit CMT0 device included in r8a7790.
+    - "renesas,r8a7790-cmt1" for the 48-bit CMT1 device included in r8a7790.
+    - "renesas,r8a7791-cmt0" for the 32-bit CMT0 device included in r8a7791.
+    - "renesas,r8a7791-cmt1" for the 48-bit CMT1 device included in r8a7791.
+    - "renesas,r8a7793-cmt0" for the 32-bit CMT0 device included in r8a7793.
+    - "renesas,r8a7793-cmt1" for the 48-bit CMT1 device included in r8a7793.
+    - "renesas,r8a7794-cmt0" for the 32-bit CMT0 device included in r8a7794.
+    - "renesas,r8a7794-cmt1" for the 48-bit CMT1 device included in r8a7794.
 
     - "renesas,rcar-gen2-cmt0" for 32-bit CMT0 devices included in R-Car Gen2.
     - "renesas,rcar-gen2-cmt1" for 48-bit CMT1 devices included in R-Car Gen2.
@@ -46,7 +46,7 @@ Required Properties:
 Example: R8A7790 (R-Car H2) CMT0 and CMT1 nodes
 
 	cmt0: timer@ffca0000 {
-		compatible = "renesas,cmt0-r8a7790", "renesas,rcar-gen2-cmt0";
+		compatible = "renesas,r8a7790-cmt0", "renesas,rcar-gen2-cmt0";
 		reg = <0 0xffca0000 0 0x1004>;
 		interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 142 IRQ_TYPE_LEVEL_HIGH>;
@@ -55,7 +55,7 @@ Example: R8A7790 (R-Car H2) CMT0 and CMT1 nodes
 	};
 
 	cmt1: timer@e6130000 {
-		compatible = "renesas,cmt1-r8a7790", "renesas,rcar-gen2-cmt1";
+		compatible = "renesas,r8a7790-cmt1", "renesas,rcar-gen2-cmt1";
 		reg = <0 0xe6130000 0 0x1004>;
 		interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 121 IRQ_TYPE_LEVEL_HIGH>,
-- 
2.11.0

  parent reply	other threads:[~2017-11-22 22:48 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-22 22:25 [PATCH AUTOSEL for 4.14 01/51] ima: fix hash algorithm initialization alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 03/51] PM / Domains: Fix genpd to deal with drivers returning 1 from ->prepare() alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 02/51] s390: vfio-ccw: Do not attempt to free no-op, test and tic cda alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 06/51] selftests/x86/ldt_gdt: Robustify against set_thread_area() and LAR oddities alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 04/51] s390/pci: do not require AIS facility alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 07/51] staging: greybus: loopback: Fix iteration count on async path alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 08/51] m68k: fix ColdFire node shift size calculation alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 05/51] selftests/x86/ldt_get: Add a few additional tests for limits alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 12/51] spi: sh-msiof: Fix DMA transfer size check alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 10/51] staging: rtl8822be: fix wrong dma unmap len alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 09/51] serial: 8250_fintek: Fix rs485 disablement on invalid ioctl() alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 11/51] staging: rtl8188eu: avoid a null dereference on pmlmepriv alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 14/51] mmc: tmio: check mmc_regulator_get_supply return value alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 13/51] spi: spi-axi: fix potential use-after-free after deregistration alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 16/51] hwmon: (pmbus/core) Prevent unintentional setting of page to 0xFF alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 15/51] mmc: sdhci-msm: fix issue with power irq alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 17/51] perf/core: Fix __perf_read_group_add() locking alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 19/51] usb: dwc2: Fix UDC state tracking alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 20/51] usb: dwc2: Error out of dwc2_hsotg_ep_disable() if we're in host mode alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 18/51] perf callchain: Compare symbol name for inlined frames when matching alexander.levin
2017-11-23  8:55   ` Milian Wolff
2017-11-28 15:12     ` alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 21/51] usb: phy: tahvo: fix error handling in tahvo_usb_probe() alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 23/51] x86/intel_rdt: Initialize bitmask of shareable resource if CDP enabled alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 22/51] PCI: dra7xx: Create functional dependency between PCIe and PHY alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 27/51] x86/entry: Use SYSCALL_DEFINE() macros for sys_modify_ldt() alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 26/51] kprobes: Use synchronize_rcu_tasks() for optprobe with CONFIG_PREEMPT=y alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 25/51] serial: 8250: Preserve DLD[7:4] for PORT_XR17V35X alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 24/51] x86/intel_rdt: Fix potential deadlock during resctrl mount alexander.levin
2017-11-22 22:25 ` alexander.levin [this message]
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 31/51] EDAC, sb_edac: Fix missing break in switch alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 30/51] irqchip/gic: Make quirks matching conditional on init return value alexander.levin
2017-11-23  8:50   ` Marc Zyngier
2017-11-28 15:13     ` alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 28/51] clocksource/drivers/arm_arch_timer: Validate CNTFRQ after enabling frame alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 36/51] usb: xhci: Return error when host is dead in xhci_disable_slot() alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 32/51] usb: mtu3: fix error return code in ssusb_gadget_init() alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 33/51] staging: fsl-dpaa2/eth: Account for Rx FD buffers on error path alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 34/51] staging: rtl8822be: Keep array subscript no lower than zero alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 35/51] ARM: cpuidle: Correct driver unregistration if init fails alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 38/51] serial: sh-sci: suppress warning for ports without dma channels alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 37/51] sysrq : fix Show Regs call trace on ARM alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 40/51] serial: imx: Update cached mctrl value when changing RTS alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 39/51] usbip: tools: Install all headers needed for libusbip development alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 43/51] perf test attr: Fix python error on empty result alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 44/51] kprobes/x86: Disable preemption in ftrace-based jprobes alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 42/51] perf test attr: Fix ignored test case result alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 41/51] staging: fsl-mc/dpio: Fix incorrect comparison alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 46/51] s390/ptrace: fix guarded storage regset handling alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 48/51] perf tools: Fix leaking rec_argv in error cases alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 45/51] locking/refcounts, x86/asm: Use unique .text section for refcount exceptions alexander.levin
2017-11-22 23:19   ` Kees Cook
2017-11-23  1:13     ` alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 47/51] tools include: Do not use poison with C++ alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 49/51] mm, x86/mm: Fix performance regression in get_user_pages_fast() alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 51/51] iio: multiplexer: add NULL check on devm_kzalloc() and devm_kmemdup() return values alexander.levin
2017-11-22 22:25 ` [PATCH AUTOSEL for 4.14 50/51] iio: adc: ti-ads1015: add 10% to conversion wait time alexander.levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171122222526.20021-29-alexander.levin@verizon.com \
    --to=alexander.levin@verizon.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=geert+renesas@glider.be \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox