From patchwork Fri Oct 13 09:16:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 825344 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="flpLjRkM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yD2Ck51Ppz9s7p for ; Fri, 13 Oct 2017 20:16:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756573AbdJMJQs (ORCPT ); Fri, 13 Oct 2017 05:16:48 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:55631 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751650AbdJMJQr (ORCPT ); Fri, 13 Oct 2017 05:16:47 -0400 Received: by mail-wm0-f53.google.com with SMTP id u138so20065231wmu.4 for ; Fri, 13 Oct 2017 02:16:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Yygbbs9gvO0pXavqLDXptgCv3Y8GOCg2lwKtS1E5hAQ=; b=flpLjRkMBH+KlLDSBcs5Ukbm6sWYYXQt+J5HcFog4VsKZES7msK7lS9Xvmp7pJomjn 1JwU5VCMp6M62W7+nN9wJtTKY88GIGX1+fj3dJRQ+31IUW3H1Y+C+vtEMMWxMepnGwhK JtTH/W4H4uiB9E4MbC0AmvkbF1RAYVT6imPMGr0xE4b6Qu7JYc1dVFoqSH7H4k7EaS3a Ad7EXNBtFC4tIn7khE08NCQWE/ANQQurMHW9SIBHO2ffsoivIDz0MYn8HRUoGUIgw9Xk xKF1atI9aCNQPsNGLG2+udU8Gby5nS5OAOAhmJG1f8mSjS4KWrr2PB+uTRqi0znwq6Oc KgeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Yygbbs9gvO0pXavqLDXptgCv3Y8GOCg2lwKtS1E5hAQ=; b=pOtQhRlCBPeXoRXQEqHS2Xxkyjs5tn7IIbX3evwy9YYMncWb47+O3GKD92J1Gk9NwU ZuKDPe6QmU9gs5MVlGSHhfqD38GJS7cxTVjLpDgv0i9seGsKhZsbaO5QYpVURbrrzSvy 69M3D0ze0XXRoVuY2/5HPWlxmtyup+5fAmqksXjlmPoJ8oF1dO8ZA2sQaJIHh3WtYobD xid71lq16EWN0mIIVxYOSTYBTHYXQZESuX7X2ukT3G/FRHKGG6Em046osIybEB61+lsP OZZKKebz0dqvAzi7Icodsj9efBuWgOdZMxAXFBrqECctkAti0WVpW/fRgMZlARPcJLAQ /JLA== X-Gm-Message-State: AMCzsaU8WzCoVeKqi98cI1GsNvUEFZHpAhYpumPQ3agxiemGKjeGf+fk CB/D1Y0Dsy8+LQCvG4CBbxI81Q== X-Google-Smtp-Source: AOwi7QCJ9fDroOKwJFzWszckT0QpCE7tUzrJLV8NVdg52e1Po3qcwQUf1EZo4R3Lej2OgkUp67dmnA== X-Received: by 10.223.168.66 with SMTP id l60mr792438wrc.144.1507886206263; Fri, 13 Oct 2017 02:16:46 -0700 (PDT) Received: from localhost.localdomain (cag06-3-82-243-161-21.fbx.proxad.net. [82.243.161.21]) by smtp.googlemail.com with ESMTPSA id m48sm1043863wrf.51.2017.10.13.02.16.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Oct 2017 02:16:45 -0700 (PDT) From: Jerome Brunet To: Thierry Reding , Kevin Hilman , Carlo Caione Cc: Jerome Brunet , linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] pwm: meson: use generic compatibles Date: Fri, 13 Oct 2017 11:16:42 +0200 Message-Id: <20171013091642.31948-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.13.6 Sender: linux-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org The meson pwm driver seems to be compatible with more SoCs than initially thought. Let's use the most generic compatibles he have in DT instead of the gxbb specific ones Signed-off-by: Jerome Brunet --- Documentation/devicetree/bindings/pwm/pwm-meson.txt | 6 +++--- drivers/pwm/pwm-meson.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/pwm/pwm-meson.txt b/Documentation/devicetree/bindings/pwm/pwm-meson.txt index 1ee81321c35e..439e05030553 100644 --- a/Documentation/devicetree/bindings/pwm/pwm-meson.txt +++ b/Documentation/devicetree/bindings/pwm/pwm-meson.txt @@ -3,8 +3,8 @@ Amlogic Meson PWM Controller Required properties: - compatible: Shall contain "amlogic,meson8b-pwm" - or "amlogic,meson-gxbb-pwm" - or "amlogic,meson-gxbb-ao-pwm" + or "amlogic,meson-gx-pwm" + or "amlogic,meson-gx-ao-pwm" - #pwm-cells: Should be 3. See pwm.txt in this directory for a description of the cells format. @@ -16,7 +16,7 @@ Optional properties: Example: pwm_ab: pwm@8550 { - compatible = "amlogic,meson-gxbb-pwm"; + compatible = "amlogic,meson-gx-pwm"; reg = <0x0 0x08550 0x0 0x10>; #pwm-cells = <3>; clocks = <&xtal>, <&xtal>; diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index d589331d1884..ababcc5ca3f1 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -393,7 +393,7 @@ static const char * const pwm_gxbb_parent_names[] = { "xtal", "hdmi_pll", "fclk_div4", "fclk_div3" }; -static const struct meson_pwm_data pwm_gxbb_data = { +static const struct meson_pwm_data pwm_gx_data = { .parent_names = pwm_gxbb_parent_names, .num_parents = ARRAY_SIZE(pwm_gxbb_parent_names), }; @@ -406,7 +406,7 @@ static const char * const pwm_gxbb_ao_parent_names[] = { "xtal", "clk81" }; -static const struct meson_pwm_data pwm_gxbb_ao_data = { +static const struct meson_pwm_data pwm_gx_ao_data = { .parent_names = pwm_gxbb_ao_parent_names, .num_parents = ARRAY_SIZE(pwm_gxbb_ao_parent_names), }; @@ -417,12 +417,12 @@ static const struct of_device_id meson_pwm_matches[] = { .data = &pwm_meson8b_data }, { - .compatible = "amlogic,meson-gxbb-pwm", - .data = &pwm_gxbb_data + .compatible = "amlogic,meson-gx-pwm", + .data = &pwm_gx_data }, { - .compatible = "amlogic,meson-gxbb-ao-pwm", - .data = &pwm_gxbb_ao_data + .compatible = "amlogic,meson-gx-ao-pwm", + .data = &pwm_gx_ao_data }, {}, };