Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Daniel Baluta <daniel.baluta@nxp.com>
To:     "robh+dt@kernel.org" <robh+dt@kernel.org>,
        "shawnguo@kernel.org" <shawnguo@kernel.org>,
        "timur@kernel.org" <timur@kernel.org>,
        "nicoleotsuka@gmail.com" <nicoleotsuka@gmail.com>,
        "broonie@kernel.org" <broonie@kernel.org>
CC:     "mark.rutland@arm.com" <mark.rutland@arm.com>,
        "kernel@pengutronix.de" <kernel@pengutronix.de>,
        "s.hauer@pengutronix.de" <s.hauer@pengutronix.de>,
        "festevam@gmail.com" <festevam@gmail.com>,
        dl-linux-imx <linux-imx@nxp.com>,
        "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "Xiubo.Lee@gmail.com" <Xiubo.Lee@gmail.com>,
        "lgirdwood@gmail.com" <lgirdwood@gmail.com>,
        "tiwai@suse.com" <tiwai@suse.com>,
        "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
        "S.j. Wang" <shengjiu.wang@nxp.com>,
        Daniel Baluta <daniel.baluta@nxp.com>
Subject: [PATCH 1/3] ARM: dts: imx: Add mclk0 clock for SAI
Thread-Topic: [PATCH 1/3] ARM: dts: imx: Add mclk0 clock for SAI
Thread-Index: AQHVFVgwyNst+ZOF4kWBUcHYo9G8SQ==
Date:   Tue, 28 May 2019 13:21:00 +0000
Message-ID: <20190528132034.3908-2-daniel.baluta@nxp.com>
References: <20190528132034.3908-1-daniel.baluta@nxp.com>
In-Reply-To: <20190528132034.3908-1-daniel.baluta@nxp.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-mailer: git-send-email 2.17.1
x-originating-ip: [89.37.124.34]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: f7504bd8-91ea-4145-3933-08d6e36f4c48
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020);SRVR:AM6PR04MB4261;
x-ms-traffictypediagnostic: AM6PR04MB4261:
x-microsoft-antispam-prvs: <AM6PR04MB4261974012779F3CB7D262E0F91E0@AM6PR04MB4261.eurprd04.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:5236;
x-forefront-prvs: 00514A2FE6
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(136003)(39860400002)(396003)(346002)(376002)(199004)(189003)(66066001)(71190400001)(305945005)(71200400001)(8676002)(81156014)(102836004)(2906002)(386003)(2501003)(6116002)(3846002)(7416002)(478600001)(53936002)(68736007)(50226002)(5660300002)(81166006)(7736002)(1076003)(14454004)(8936002)(86362001)(256004)(186003)(26005)(6512007)(486006)(446003)(11346002)(476003)(2616005)(54906003)(110136005)(44832011)(73956011)(64756008)(66946007)(66556008)(66476007)(66446008)(316002)(52116002)(25786009)(36756003)(6506007)(99286004)(6486002)(76176011)(14444005)(6436002)(4326008)(2201001);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR04MB4261;H:AM6PR04MB5207.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1;
received-spf: None (protection.outlook.com: nxp.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: O6zim8eacVvwS6STlB1/12H1kAyDvoa3ZgoqGMa/VPZPU+CmlVRZTxe0XrjlNuFbVXjAE8O8RbCGFMOHqeZYWEfWkk0NcKihfIc/sAqiXWjUV9BF2Ux+NPA2ehYh2AscUe5lRpqtkF6wwZlvemfGlWN50LOxA8qcfYcXUs/W8neWAoLFdBm5fU9cQKie8bVRTPjZ8qotkAyqoUdUbz7Sxne3EmTZ8DtbFnb0e3fP4rKdXc88KoXgMaJQCc/9Peo+K4cTmwlyJjy2DJEsmKFZtrZR/hxzCKqGQ/ROPSt8SPf+hrEZZzBl0y2KNZvsvwVZx4HOpNMf+1HSeSXQvHaT0vti97PqyyxFK+qGiDXP18tTuxiBTPZ8UxO87QNNdihNPUel+kGzUkiiu7lONyaMCAogJigdXvUbmtoR49cymJs=
Content-Type: text/plain; charset="iso-8859-1"
Content-ID: <20D3443DBB6CC84981BDDFDA2756471E@eurprd04.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f7504bd8-91ea-4145-3933-08d6e36f4c48
X-MS-Exchange-CrossTenant-originalarrivaltime: 28 May 2019 13:21:00.0763
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: daniel.baluta@nxp.com
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4261
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Shengjiu Wang <shengjiu.wang@nxp.com>

Audio MCLK source option is selected with a 4:1 MUX
controller using MCLK Select bits in SAI xCR2 register.

On imx6/7 mclk0 and mclk1 always point to the same clock
source. Anyhow, this is no longer true for imx8.

For this reason, we need to add mclk0 and handle it
in a generic way in SAI driver.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
---
 arch/arm/boot/dts/imx6sx.dtsi | 6 ++++--
 arch/arm/boot/dts/imx6ul.dtsi | 9 ++++++---
 arch/arm/boot/dts/imx7s.dtsi  | 9 ++++++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index b16a123990a2..682207b5d868 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -1071,9 +1071,10 @@
 				reg =3D <0x021d4000 0x4000>;
 				interrupts =3D <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
 				clocks =3D <&clks IMX6SX_CLK_SAI1_IPG>,
+					 <&clks IMX6SX_CLK_SAI1>,
 					 <&clks IMX6SX_CLK_SAI1>,
 					 <&clks 0>, <&clks 0>;
-				clock-names =3D "bus", "mclk1", "mclk2", "mclk3";
+				clock-names =3D "bus", "mclk0", "mclk1", "mclk2", "mclk3";
 				dma-names =3D "rx", "tx";
 				dmas =3D <&sdma 31 24 0>, <&sdma 32 24 0>;
 				status =3D "disabled";
@@ -1090,9 +1091,10 @@
 				reg =3D <0x021dc000 0x4000>;
 				interrupts =3D <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
 				clocks =3D <&clks IMX6SX_CLK_SAI2_IPG>,
+					 <&clks IMX6SX_CLK_SAI2>,
 					 <&clks IMX6SX_CLK_SAI2>,
 					 <&clks 0>, <&clks 0>;
-				clock-names =3D "bus", "mclk1", "mclk2", "mclk3";
+				clock-names =3D "bus", "mclk0", "mclk1", "mclk2", "mclk3";
 				dma-names =3D "rx", "tx";
 				dmas =3D <&sdma 33 24 0>, <&sdma 34 24 0>;
 				status =3D "disabled";
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index bbf010c73336..e9691306f557 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -304,9 +304,10 @@
 					reg =3D <0x02028000 0x4000>;
 					interrupts =3D <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
 					clocks =3D <&clks IMX6UL_CLK_SAI1_IPG>,
+						 <&clks IMX6UL_CLK_SAI1>,
 						 <&clks IMX6UL_CLK_SAI1>,
 						 <&clks IMX6UL_CLK_DUMMY>, <&clks IMX6UL_CLK_DUMMY>;
-					clock-names =3D "bus", "mclk1", "mclk2", "mclk3";
+					clock-names =3D "bus", "mclk0", "mclk1", "mclk2", "mclk3";
 					dmas =3D <&sdma 35 24 0>,
 					       <&sdma 36 24 0>;
 					dma-names =3D "rx", "tx";
@@ -319,9 +320,10 @@
 					reg =3D <0x0202c000 0x4000>;
 					interrupts =3D <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
 					clocks =3D <&clks IMX6UL_CLK_SAI2_IPG>,
+						 <&clks IMX6UL_CLK_SAI2>,
 						 <&clks IMX6UL_CLK_SAI2>,
 						 <&clks IMX6UL_CLK_DUMMY>, <&clks IMX6UL_CLK_DUMMY>;
-					clock-names =3D "bus", "mclk1", "mclk2", "mclk3";
+					clock-names =3D "bus", "mclk0", "mclk1", "mclk2", "mclk3";
 					dmas =3D <&sdma 37 24 0>,
 					       <&sdma 38 24 0>;
 					dma-names =3D "rx", "tx";
@@ -334,9 +336,10 @@
 					reg =3D <0x02030000 0x4000>;
 					interrupts =3D <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
 					clocks =3D <&clks IMX6UL_CLK_SAI3_IPG>,
+						 <&clks IMX6UL_CLK_SAI3>,
 						 <&clks IMX6UL_CLK_SAI3>,
 						 <&clks IMX6UL_CLK_DUMMY>, <&clks IMX6UL_CLK_DUMMY>;
-					clock-names =3D "bus", "mclk1", "mclk2", "mclk3";
+					clock-names =3D "bus", "mclk0", "mclk1", "mclk2", "mclk3";
 					dmas =3D <&sdma 39 24 0>,
 					       <&sdma 40 24 0>;
 					dma-names =3D "rx", "tx";
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 106711d2c01b..c345a2e6d824 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -886,10 +886,11 @@
 					reg =3D <0x308a0000 0x10000>;
 					interrupts =3D <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
 					clocks =3D <&clks IMX7D_SAI1_IPG_CLK>,
+						 <&clks IMX7D_SAI1_ROOT_CLK>,
 						 <&clks IMX7D_SAI1_ROOT_CLK>,
 						 <&clks IMX7D_CLK_DUMMY>,
 						 <&clks IMX7D_CLK_DUMMY>;
-					clock-names =3D "bus", "mclk1", "mclk2", "mclk3";
+					clock-names =3D "bus", "mclk0", "mclk1", "mclk2", "mclk3";
 					dma-names =3D "rx", "tx";
 					dmas =3D <&sdma 8 24 0>, <&sdma 9 24 0>;
 					status =3D "disabled";
@@ -901,10 +902,11 @@
 					reg =3D <0x308b0000 0x10000>;
 					interrupts =3D <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
 					clocks =3D <&clks IMX7D_SAI2_IPG_CLK>,
+						 <&clks IMX7D_SAI2_ROOT_CLK>,
 						 <&clks IMX7D_SAI2_ROOT_CLK>,
 						 <&clks IMX7D_CLK_DUMMY>,
 						 <&clks IMX7D_CLK_DUMMY>;
-					clock-names =3D "bus", "mclk1", "mclk2", "mclk3";
+					clock-names =3D "bus", "mclk0", "mclk1", "mclk2", "mclk3";
 					dma-names =3D "rx", "tx";
 					dmas =3D <&sdma 10 24 0>, <&sdma 11 24 0>;
 					status =3D "disabled";
@@ -916,10 +918,11 @@
 					reg =3D <0x308c0000 0x10000>;
 					interrupts =3D <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
 					clocks =3D <&clks IMX7D_SAI3_IPG_CLK>,
+						 <&clks IMX7D_SAI3_ROOT_CLK>,
 						 <&clks IMX7D_SAI3_ROOT_CLK>,
 						 <&clks IMX7D_CLK_DUMMY>,
 						 <&clks IMX7D_CLK_DUMMY>;
-					clock-names =3D "bus", "mclk1", "mclk2", "mclk3";
+					clock-names =3D "bus", "mclk0", "mclk1", "mclk2", "mclk3";
 					dma-names =3D "rx", "tx";
 					dmas =3D <&sdma 12 24 0>, <&sdma 13 24 0>;
 					status =3D "disabled";
--=20
2.17.1