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: 10003927 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EAFF5602B3 for ; Fri, 13 Oct 2017 09:22:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCC9B28E9E for ; Fri, 13 Oct 2017 09:22:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D196428F3B; Fri, 13 Oct 2017 09:22:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9E37528E9E for ; Fri, 13 Oct 2017 09:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=A9b1rjCm/O+YwVs4C9R56vN7+r6R/EeSrh3Y7z6reWA=; b=pHy +2nJC5KE3On4dyguT/fC05SU4YkrbH6/18JZE02RhtDEe+D505mCK2GZh9c7mNCI7jYV+6utLM7hu 1q7qAhYJa8S4d7Tlk9k4G8JBTWrDkO75FXxkBLnJX6JQP1+N7c0gaxlQhWZaznAVHdnMVbEMcbbyk pnIFZanmzzZ1k9Lq7f1CYANnmY0Evw0z4L2eDZ2r3snEZWLgjgAa+c9tdhjJvKxe3pVT+ACk1N5zz SPFrgxc5lJQSWU/mvKkY6TRZupqQ2eQ41/lYry4OFqBXPcpxC3eg25YwYS0lbfEtfhbGm5rbAr0xH bKDANuaO8qzAYhkAFT5Jp1aPSZz/yKg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e2wAo-0006lE-AH; Fri, 13 Oct 2017 09:22:30 +0000 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e2wAh-0006hq-NU for linux-arm-kernel@lists.infradead.org; Fri, 13 Oct 2017 09:22:26 +0000 Received: by mail-wm0-x234.google.com with SMTP id l68so19970568wmd.5 for ; Fri, 13 Oct 2017 02:22:02 -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=jmpWF34X6oYk7DSY9M3fi4CNsxQ15UaEZlb6PAgH//F6k8WsG/Vf3YnJeEBEQ/NBVs W1axsfOvSEYtPo6fUBLnO6q/h5/pa681ryhDADfiIwjvom044xPUEfRQWCu0G/pjAZJM uaJB1Mo2C10A3r05MBOhNgVgJX20jlTF3TYWZKCaBufM3Cuebp+YVqaao2W26gkmJr8h buKw9kZlraefcCsm3XXOm8CWB650dlZ1C5vYfnINSY/kio+QgbdEVtI0Inkj3YkEUQCu UzT1KYuKIje2AcuiBct1Ijv8OKAIWUgkgEYVHrXIGlx6H0KSyzj21lAC5kYQMB0lEQHi 3DWg== X-Gm-Message-State: AMCzsaVzoJlCSqQXxGzRHVaRu3zX6+VwdKmelLQMnPnG5AZsvUDjYqNs rixu/1a9UiZ/UtvHJqC9K06xwg== 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171013_022224_096044_5514739D X-CRM114-Status: GOOD ( 10.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 }, {}, };