* [PATCH 3/3] ARM: dts: aspeed: zaius: fixed I2C bus numbers for pcie slots
From: Patrick Venture @ 2019-04-16 16:21 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190416162150.150154-1-venture@google.com>
From: Robert Lippert <rlippert@google.com>
The change to include ibm-power9-cfam.dtsi resulted in a renumbering
of all of the I2C bus numbers behind the on-board muxes. This breaks
some tools which have hardcoded the bus numbers.
Add device tree aliases for the I2C buses routed through the PCIe slots
so that they return to their former numbers before the cfam change.
Signed-off-by: Robert Lippert <rlippert@google.com>
Signed-off-by: Patrick Venture <venture@google.com>
---
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 40 ++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
index 51265af622574..c12f89e042efc 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -7,6 +7,14 @@
model = "Zaius BMC";
compatible = "ingrasys,zaius-bmc", "aspeed,ast2500";
+ aliases {
+ i2c15 = &i2cpcie0;
+ i2c16 = &i2cpcie1;
+ i2c17 = &i2cpcie2;
+ i2c19 = &i2cpcie3;
+ i2c20 = &i2cpcie4;
+ };
+
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
@@ -223,6 +231,27 @@
reg = <0x71>;
#address-cells = <1>;
#size-cells = <0>;
+
+ i2cpcie0: i2c at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+ };
+ i2cpcie1: i2c at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+ };
+ i2cpcie2: i2c at 2 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <2>;
+ };
+ i2ctpm: i2c at 3 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <3>;
+ };
};
/* MUX1 PCA9546A @71h
@@ -253,6 +282,17 @@
reg = <0x71>;
#address-cells = <1>;
#size-cells = <0>;
+
+ i2cpcie3: i2c at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+ };
+ i2cpcie4: i2c at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+ };
};
/* MUX1 PCA9546A @71h
--
2.21.0.392.gf8f6787159e-goog
^ permalink raw reply related
* [PATCH 2/3] ARM: dts: aspeed: zaius: update 12V brick I2C address
From: Patrick Venture @ 2019-04-16 16:21 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190416162150.150154-1-venture@google.com>
From: Robert Lippert <rlippert@google.com>
The I2C address of the brick is different depending on the board SKU.
Update the values to instantiate addresses which work for most boards.
Signed-off-by: Robert Lippert <rlippert@google.com>
Signed-off-by: Patrick Venture <venture@google.com>
---
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
index 63e892f16d050..51265af622574 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -328,10 +328,21 @@
* LM5066I PMBUS @10h
*/
- /* 12V Quarter Brick DC/DC Converter Q54SJ12050 @61h */
- power-brick at 61 {
+ /*
+ * Brick will be one of these types/addresses. Depending
+ * on the board SKU only one is actually present and will successfully
+ * instantiate while the others will fail the probe operation.
+ * These are the PVT (and presumably beyond) addresses:
+ * 12V Quarter Brick DC/DC Converter Q54SJ12050 @6Ah
+ * 12V Quarter Brick DC/DC Converter Q54SH12050 @30h
+ */
+ power-brick at 6a {
+ compatible = "delta,dps800";
+ reg = <0x6a>;
+ };
+ power-brick at 30 {
compatible = "delta,dps800";
- reg = <0x61>;
+ reg = <0x30>;
};
/* CPU0 VR ISL68137 0.7V, 0.96V PMBUS @64h */
@@ -342,7 +353,6 @@
/* Master selector PCA9541A @70h (other master: CPU0)
* LM5066I PMBUS @10h
*/
- /* 12V SMPS Q54SH12050NNDH @61h */
};
&i2c8 {
--
2.21.0.392.gf8f6787159e-goog
^ permalink raw reply related
* [PATCH 1/3] ARM: dts: aspeed: zaius: add Infineon and Intersil regulators
From: Patrick Venture @ 2019-04-16 16:21 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190416162150.150154-1-venture@google.com>
From: Maxim Sloyko <maxims@google.com>
Add the nodes for the ir38064 and isl68137 devices on the Zaius board.
Signed-off-by: Maxim Sloyko <maxims@google.com>
Signed-off-by: Robert Lippert <rlippert@google.com>
Signed-off-by: Patrick Venture <venture@google.com>
---
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 65 ++++++++++++++++++++--
1 file changed, 60 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
index 2c5aa90a546d7..63e892f16d050 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -296,6 +296,32 @@
reg = <0x54>;
};
};
+
+ };
+
+ vrm at 64 {
+ compatible = "isil,isl68137";
+ reg = <0x64>;
+ };
+
+ vrm at 40 {
+ compatible = "isil,isl68137";
+ reg = <0x40>;
+ };
+
+ vrm at 60 {
+ compatible = "isil,isl68137";
+ reg = <0x60>;
+ };
+
+ vrm at 43 {
+ compatible = "infineon,ir38064";
+ reg = <0x43>;
+ };
+
+ vrm at 41 {
+ compatible = "isil,isl68137";
+ reg = <0x41>;
};
/* Master selector PCA9541A @70h (other master: CPU0)
@@ -311,18 +337,47 @@
/* CPU0 VR ISL68137 0.7V, 0.96V PMBUS @64h */
/* CPU0 VR ISL68137 1.2V CH03 PMBUS @40h */
/* CPU0 VR ISL68137 0.8V PMBUS @60h */
- /* CPU0 VR 1.0V IR38064 I2C @11h, PMBUS @41h */
+ /* CPU0 VR 1.0V IR38064 I2C @11h, PMBUS @43h */
/* CPU0 VR ISL68137 1.2V CH47 PMBUS @41h */
+ /* Master selector PCA9541A @70h (other master: CPU0)
+ * LM5066I PMBUS @10h
+ */
+ /* 12V SMPS Q54SH12050NNDH @61h */
};
&i2c8 {
status = "okay";
- /* CPU1 VR ISL68137 0.7V, 0.96V PMBUS @65h */
- /* CPU1 VR ISL68137 1.2V CH03 PMBUS @44h */
- /* CPU1 VR ISL68137 0.8V PMBUS @61h */
+ vrm at 64 {
+ compatible = "isil,isl68137";
+ reg = <0x64>;
+ };
+
+ vrm at 40 {
+ compatible = "isil,isl68137";
+ reg = <0x40>;
+ };
+
+ vrm at 41 {
+ compatible = "isil,isl68137";
+ reg = <0x41>;
+ };
+
+ vrm at 42 {
+ compatible = "infineon,ir38064";
+ reg = <0x42>;
+ };
+
+ vrm at 60 {
+ compatible = "isil,isl68137";
+ reg = <0x60>;
+ };
+
+ /* CPU1 VR ISL68137 0.7V, 0.96V PMBUS @64h */
+ /* CPU1 VR ISL68137 1.2V CH03 PMBUS @40h */
+ /* CPU1 VR ISL68137 1.2V CH47 PMBUS @41h */
/* CPU1 VR 1.0V IR38064 I2C @12h, PMBUS @42h */
- /* CPU0 VR ISL68137 1.2V CH47 PMBUS @45h */
+ /* CPU1 VR ISL68137 0.8V PMBUS @60h */
};
--
2.21.0.392.gf8f6787159e-goog
^ permalink raw reply related
* [PATCH 0/3] update aspeed-bmc-opp-zaius device-tree
From: Patrick Venture @ 2019-04-16 16:21 UTC (permalink / raw)
To: linux-aspeed
Hi,
This series contains three updates to the Zaius ASPEED device-tree to
add voltrage regulators, and update addresses and aliases. The Infineon
and Intersil drivers are staged on hwmon-next, and the trivial device
dt-bindings changed are up for review.
Maxim Sloyko (1):
ARM: dts: aspeed: zaius: add Infineon and Intersil regulators
Robert Lippert (2):
ARM: dts: aspeed: zaius: update 12V brick I2C address
ARM: dts: aspeed: zaius: fixed I2C bus numbers for pcie slots
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 121 +++++++++++++++++++--
1 file changed, 113 insertions(+), 8 deletions(-)
--
2.21.0.392.gf8f6787159e-goog
^ permalink raw reply
* [PATCH v10 1/2] dt-bindings: misc: aspeed-p2a-ctrl: add support
From: Patrick Venture @ 2019-04-16 14:27 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <998d869d-de1d-4ac9-b4e6-8942945912dd@www.fastmail.com>
On Mon, Apr 8, 2019 at 5:48 PM Andrew Jeffery <andrew@aj.id.au> wrote:
>
>
>
> On Tue, 9 Apr 2019, at 00:12, Patrick Venture wrote:
> > Document the ast2400, ast2500 PCI-to-AHB bridge control driver bindings.
> >
> > Signed-off-by: Patrick Venture <venture@google.com>
> > Reviewed-by: Rob Herring <robh@kernel.org>
>
> Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
>
> > ---
> > Changes for v10:
> > - Chopped out nearly identical information.
> > Changes for v9:
> > - Added missing details about syscon parent
> > Changes for v8:
> > - None
> > Changes for v7:
> > - Moved node under the syscon node it requires
> > Changes for v6:
> > - None
> > Changes for v5:
> > - None
> > Changes for v4:
> > - None
> > Changes for v3:
> > - None
> > Changes for v2:
> > - Added comment about syscon required parameter.
> > ---
> > .../bindings/misc/aspeed-p2a-ctrl.txt | 47 +++++++++++++++++++
> > 1 file changed, 47 insertions(+)
> > create mode 100644 Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt
> >
> > diff --git a/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt
> > b/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt
> > new file mode 100644
> > index 0000000000000..854bd67ffec68
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt
> > @@ -0,0 +1,47 @@
> > +======================================================================
> > +Device tree bindings for Aspeed AST2400/AST2500 PCI-to-AHB Bridge
> > Control Driver
> > +======================================================================
> > +
> > +The bridge is available on platforms with the VGA enabled on the
> > Aspeed device.
> > +In this case, the host has access to a 64KiB window into all of the
> > BMC's
> > +memory. The BMC can disable this bridge. If the bridge is enabled,
> > the host
> > +has read access to all the regions of memory, however the host only
> > has read
> > +and write access depending on a register controlled by the BMC.
> > +
> > +Required properties:
> > +===================
> > +
> > + - compatible: must be one of:
> > + - "aspeed,ast2400-p2a-ctrl"
> > + - "aspeed,ast2500-p2a-ctrl"
> > +
> > +Optional properties:
> > +===================
> > +
> > +- memory-region: A phandle to a reserved_memory region to be used for
> > the PCI
> > + to AHB mapping
> > +
> > +The p2a-control node should be the child of a syscon node with the
> > required
> > +property:
> > +
> > +- compatible : Should be one of the following:
> > + "aspeed,ast2400-scu", "syscon", "simple-mfd"
> > + "aspeed,g4-scu", "syscon", "simple-mfd"
> > + "aspeed,ast2500-scu", "syscon", "simple-mfd"
> > + "aspeed,g5-scu", "syscon", "simple-mfd"
> > +
> > +Example
> > +===================
> > +
> > +g4 Example
> > +----------
> > +
> > +syscon: scu at 1e6e2000 {
> > + compatible = "aspeed,ast2400-scu", "syscon", "simple-mfd";
> > + reg = <0x1e6e2000 0x1a8>;
> > +
> > + p2a: p2a-control {
> > + compatible = "aspeed,ast2400-p2a-ctrl";
> > + memory-region = <&reserved_memory>;
> > + };
> > +};
> > --
> > 2.21.0.392.gf8f6787159e-goog
> >
> >
I'm sorry, is there something more I need to do with the patch series?
Sometimes I miss emails.
Thanks,
Patrick
^ permalink raw reply
* [PATCH v2 00/21] Convert hwmon documentation to ReST
From: Guenter Roeck @ 2019-04-13 3:09 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190412100451.6fe49de7@lwn.net>
On 4/12/19 9:04 AM, Jonathan Corbet wrote:
> On Thu, 11 Apr 2019 14:07:31 -0700
> Guenter Roeck <linux@roeck-us.net> wrote:
>
>>> While nobody does such split, IMHO, the best would be to keep the
>>> information outside Documentation/admin-guide. But hey! You're
>>> the Doc maintainer. If you prefer to move, I'm perfectly fine
>>> with that.
>>>
>>
>> Same here, but please don't move the files which are kernel facing only.
>
> Well, let's step back and think about this. Who is the audience for
> these documents? That will tell us a lot about where they should really
> be.
>
> What I would prefer to avoid is the status quo where *everything* is in
> the top-level directory, and where documents are organized for the
> convenience of their maintainers rather than of their readers. But
> sometimes I feel like I'm alone in that desire...:)
>
The big real-world question is: Is the series good enough for you to accept,
or do you expect some level of user/kernel separation ?
Guenter
^ permalink raw reply
* [PATCH v2 00/21] Convert hwmon documentation to ReST
From: Guenter Roeck @ 2019-04-13 0:52 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190412212541.0cde9452@coco.lan>
On 4/12/19 5:25 PM, Mauro Carvalho Chehab wrote:
> Em Fri, 12 Apr 2019 09:12:52 -0700
> Guenter Roeck <linux@roeck-us.net> escreveu:
>
>> On 4/12/19 9:04 AM, Jonathan Corbet wrote:
>>> On Thu, 11 Apr 2019 14:07:31 -0700
>>> Guenter Roeck <linux@roeck-us.net> wrote:
>>>
>>>>> While nobody does such split, IMHO, the best would be to keep the
>>>>> information outside Documentation/admin-guide. But hey! You're
>>>>> the Doc maintainer. If you prefer to move, I'm perfectly fine
>>>>> with that.
>>>>>
>>>>
>>>> Same here, but please don't move the files which are kernel facing only.
>>>
>>> Well, let's step back and think about this. Who is the audience for
>>> these documents? That will tell us a lot about where they should really
>>> be.
>>>
>>
>> Most of them are for users, some of them are for driver developers. A few
>> are for both, though that is generally not the intention (and one may argue
>> that driver internal documentation should be moved into the respective
>> driver source).
>
> The big issue is really those files that contain both kernel internals
> and userspace stuff.
>
> This is a common pattern. I just finishing converting a lot more
> documents to ReST and I found the same thing on almost all document
> directories I touched.
>
>>> What I would prefer to avoid is the status quo where *everything* is in
>>> the top-level directory, and where documents are organized for the
>>> convenience of their maintainers rather than of their readers. But
>>> sometimes I feel like I'm alone in that desire...:)
>>>
>> I am fine with separating user pointing from kernel API/driver developer
>> guides, and I agree that it would make a lot of sense. As I said, please
>> just make sure that kernel facing files don't end up in the wrong directory.
>
> I like the idea of splitting user faced documents from the rest, but
> this is not an easy task. On several cases, there are just a couple
> of paragraphs with things like sysfs entries in the middle of a big
> file with Kernel internals.
>
Yes, I know. I don't think that cleanup is going to happen anytime soon.
Guenter
^ permalink raw reply
* [PATCH v2 00/21] Convert hwmon documentation to ReST
From: Mauro Carvalho Chehab @ 2019-04-13 0:25 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <8514ff97-3167-3c89-3468-e247d14c5086@roeck-us.net>
Em Fri, 12 Apr 2019 09:12:52 -0700
Guenter Roeck <linux@roeck-us.net> escreveu:
> On 4/12/19 9:04 AM, Jonathan Corbet wrote:
> > On Thu, 11 Apr 2019 14:07:31 -0700
> > Guenter Roeck <linux@roeck-us.net> wrote:
> >
> >>> While nobody does such split, IMHO, the best would be to keep the
> >>> information outside Documentation/admin-guide. But hey! You're
> >>> the Doc maintainer. If you prefer to move, I'm perfectly fine
> >>> with that.
> >>>
> >>
> >> Same here, but please don't move the files which are kernel facing only.
> >
> > Well, let's step back and think about this. Who is the audience for
> > these documents? That will tell us a lot about where they should really
> > be.
> >
>
> Most of them are for users, some of them are for driver developers. A few
> are for both, though that is generally not the intention (and one may argue
> that driver internal documentation should be moved into the respective
> driver source).
The big issue is really those files that contain both kernel internals
and userspace stuff.
This is a common pattern. I just finishing converting a lot more
documents to ReST and I found the same thing on almost all document
directories I touched.
> > What I would prefer to avoid is the status quo where *everything* is in
> > the top-level directory, and where documents are organized for the
> > convenience of their maintainers rather than of their readers. But
> > sometimes I feel like I'm alone in that desire...:)
> >
> I am fine with separating user pointing from kernel API/driver developer
> guides, and I agree that it would make a lot of sense. As I said, please
> just make sure that kernel facing files don't end up in the wrong directory.
I like the idea of splitting user faced documents from the rest, but
this is not an easy task. On several cases, there are just a couple
of paragraphs with things like sysfs entries in the middle of a big
file with Kernel internals.
Thanks,
Mauro
^ permalink raw reply
* [PATCH v2] media: platform: fix a kernel warning on clk control
From: Jae Hyun Yoo @ 2019-04-12 16:26 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <e8b18722-7ced-54ec-3a0a-4d8170eca0d4@linux.ibm.com>
On 4/12/2019 7:33 AM, Eddie James wrote:
>
> On 4/12/19 7:17 AM, Herrenschmidt, Benjamin wrote:
>> On Fri, 2019-04-12 at 13:00 +0200, Hans Verkuil wrote:
>>> Eddie, can you review this?
>
>
> Yes, this looks good.
>
> Thanks,
>
> Reviewed-by: Eddie James <eajames@linux.ibm.com>
Thanks Eddie!
I'll submit a new patch on top of your upstreaming patch. It would be
better to match the merge order with our downstream tree.
Regards,
Jae
>>>
>>> Jae Hyun Yoo, for future reference: please add the driver name in the
>>> subject.
>>> I.e. something like this: [PATCH v2] media: aspeed: fix a kernel
>>> warning on clk control
>>>
>>> That helps maintainers figuring out who should look at which patch.
>> test_bit/clear_bit/set_bit are atomic. The way they are used here is
>> either a waste of cycles (there's already a lock) or racy. Not too sure
>
>
> Yes, it's conceivable that this could be done locklessly, but I'm fine
> with being cautious. I asked Jae to use the bit functions and flag for
> code cleanliness instead of an additional bool... are the additional
> cycles that bad here?
>
>
>> :)
>>
>> Cheers,
>> Ben.
>>
>>> Regards,
>>>
>>> ????Hans
>>>
>>> On 3/29/19 10:27 PM, Jae Hyun Yoo wrote:
>>>> video_on and video_off functions in the Aspeed video engine driver
>>>> are
>>>> being called from multiple contexts without any protection so video
>>>> clocks
>>>> can be disabled twice and eventually it causes a kernel warning
>>>> with stack
>>>> dump printing out like below:
>>>>
>>>> [? 120.034729] WARNING: CPU: 0 PID: 1334 at drivers/clk/clk.c:684
>>>> clk_core_unprepare+0x13c/0x170
>>>> [? 120.043252] eclk-gate already unprepared
>>>> [? 120.047283] CPU: 0 PID: 1334 Comm: obmc-ikvm Tainted:
>>>> G??????? W???????? 5.0.3-b94b74e8b52db91fe4e99e0bb481ec8bf2b5b47c
>>>> #1
>>>> [? 120.058417] Hardware name: Generic DT based system
>>>> [? 120.063219] Backtrace:
>>>> [? 120.065787] [<80107cdc>] (dump_backtrace) from [<80107f10>]
>>>> (show_stack+0x20/0x24)
>>>> [? 120.073371]? r7:803a4ff0 r6:00000009 r5:00000000 r4:96197e1c
>>>> [? 120.079152] [<80107ef0>] (show_stack) from [<8068f7d8>]
>>>> (dump_stack+0x20/0x28)
>>>> [? 120.086479] [<8068f7b8>] (dump_stack) from [<8011604c>]
>>>> (__warn.part.3+0xb4/0xdc)
>>>> [? 120.094068] [<80115f98>] (__warn.part.3) from [<801160e0>]
>>>> (warn_slowpath_fmt+0x6c/0x90)
>>>> [? 120.102164]? r6:000002ac r5:8080c0b8 r4:80a07008
>>>> [? 120.106893] [<80116078>] (warn_slowpath_fmt) from [<803a4ff0>]
>>>> (clk_core_unprepare+0x13c/0x170)
>>>> [? 120.115686]? r3:8080cf8c r2:8080c17c
>>>> [? 120.119276]? r7:97d68e58 r6:9df23200 r5:9668c260 r4:96459260
>>>> [? 120.125046] [<803a4eb4>] (clk_core_unprepare) from [<803a707c>]
>>>> (clk_unprepare+0x34/0x3c)
>>>> [? 120.133226]? r5:9668c260 r4:96459260
>>>> [? 120.136932] [<803a7048>] (clk_unprepare) from [<804f34bc>]
>>>> (aspeed_video_off+0x44/0x48)
>>>> [? 120.145031]? r5:9668c260 r4:9668cbc0
>>>> [? 120.148647] [<804f3478>] (aspeed_video_off) from [<804f3fd0>]
>>>> (aspeed_video_release+0x94/0x118)
>>>> [? 120.157435]? r5:966a0cb8 r4:966a0800
>>>> [? 120.161049] [<804f3f3c>] (aspeed_video_release) from
>>>> [<804d2c58>] (v4l2_release+0xd4/0xe8)
>>>> [? 120.169404]? r7:97d68e58 r6:9d087810 r5:9df23200 r4:966a0b20
>>>> [? 120.175168] [<804d2b84>] (v4l2_release) from [<80236224>]
>>>> (__fput+0x98/0x1c4)
>>>> [? 120.182316]? r5:96698e78 r4:9df23200
>>>> [? 120.185994] [<8023618c>] (__fput) from [<802363b8>]
>>>> (____fput+0x18/0x1c)
>>>> [? 120.192712]? r9:80a0700c r8:801011e4 r7:00000000 r6:80a64bbc
>>>> r5:961dd560 r4:961dd89c
>>>> [? 120.200562] [<802363a0>] (____fput) from [<80131c08>]
>>>> (task_work_run+0x7c/0xa4)
>>>> [? 120.207994] [<80131b8c>] (task_work_run) from [<80106884>]
>>>> (do_work_pending+0x4a8/0x578)
>>>> [? 120.216163]? r7:801011e4 r6:80a07008 r5:96197fb0 r4:ffffe000
>>>> [? 120.221856] [<801063dc>] (do_work_pending) from [<8010106c>]
>>>> (slow_work_pending+0xc/0x20)
>>>> [? 120.230116] Exception stack(0x96197fb0 to 0x96197ff8)
>>>> [? 120.235254] 7fa0:???????????????????????????????????? 00000000
>>>> 76ccf094 00000000 00000000
>>>> [? 120.243438] 7fc0: 00000008 00a11978 7eab3c30 00000006 00000000
>>>> 00000000 475b0fa4 00000000
>>>> [? 120.251692] 7fe0: 00000002 7eab3a40 00000000 47720e38 80000010
>>>> 00000008
>>>> [? 120.258396]? r10:00000000 r9:96196000 r8:801011e4 r7:00000006
>>>> r6:7eab3c30 r5:00a11978
>>>> [? 120.266291]? r4:00000008
>>>>
>>>> To prevent this issue, this commit adds spinlock protection and
>>>> clock
>>>> status checking logic into the Aspeed video engine driver.
>>>>
>>>> Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine
>>>> driver")
>>>> Signed-off-by: Jae Hyun Yoo<jae.hyun.yoo@linux.intel.com>
>>>> Cc: Eddie James<eajames@linux.ibm.com>
>>>> Cc: Mauro Carvalho Chehab<mchehab@kernel.org>
>>>> Cc: Joel Stanley<joel@jms.id.au>
>>>> Cc: Andrew Jeffery<andrew@aj.id.au>
>>>> ---
>>>> ? drivers/media/platform/aspeed-video.c | 32
>>>> ++++++++++++++++++++++++---
>>>> ? 1 file changed, 29 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/drivers/media/platform/aspeed-video.c
>>>> b/drivers/media/platform/aspeed-video.c
>>>> index 692e08ef38c0..744d22ecc620 100644
>>>> --- a/drivers/media/platform/aspeed-video.c
>>>> +++ b/drivers/media/platform/aspeed-video.c
>>>> @@ -188,6 +188,7 @@ enum {
>>>> ????? VIDEO_STREAMING,
>>>> ????? VIDEO_FRAME_INPRG,
>>>> ????? VIDEO_STOPPED,
>>>> +??? VIDEO_CLOCKS_ON,
>>>> ? };
>>>> ? struct aspeed_video_addr {
>>>> @@ -495,20 +496,30 @@ static void aspeed_video_reset(struct
>>>> aspeed_video *video)
>>>> ? static void aspeed_video_off(struct aspeed_video *video)
>>>> ? {
>>>> +??? if (!test_bit(VIDEO_CLOCKS_ON, &video->flags))
>>>> +??????? return;
>>>> +
>>>> ????? aspeed_video_reset(video);
>>>> ????? /* Turn off the relevant clocks */
>>>> ????? clk_disable_unprepare(video->vclk);
>>>> ????? clk_disable_unprepare(video->eclk);
>>>> +
>>>> +??? clear_bit(VIDEO_CLOCKS_ON, &video->flags);
>>>> ? }
>>>> ? static void aspeed_video_on(struct aspeed_video *video)
>>>> ? {
>>>> +??? if (test_bit(VIDEO_CLOCKS_ON, &video->flags))
>>>> +??????? return;
>>>> +
>>>> ????? /* Turn on the relevant clocks */
>>>> ????? clk_prepare_enable(video->eclk);
>>>> ????? clk_prepare_enable(video->vclk);
>>>> ????? aspeed_video_reset(video);
>>>> +
>>>> +??? set_bit(VIDEO_CLOCKS_ON, &video->flags);
>>>> ? }
>>>> ? static void aspeed_video_bufs_done(struct aspeed_video *video,
>>>> @@ -526,12 +537,14 @@ static void aspeed_video_bufs_done(struct
>>>> aspeed_video *video,
>>>> ? static void aspeed_video_irq_res_change(struct aspeed_video
>>>> *video)
>>>> ? {
>>>> +??? spin_lock(&video->lock);
>>>> ????? dev_dbg(video->dev, "Resolution changed; resetting\n");
>>>> ????? set_bit(VIDEO_RES_CHANGE, &video->flags);
>>>> ????? clear_bit(VIDEO_FRAME_INPRG, &video->flags);
>>>> ????? aspeed_video_off(video);
>>>> +??? spin_unlock(&video->lock);
>>>> ????? aspeed_video_bufs_done(video, VB2_BUF_STATE_ERROR);
>>>> ????? schedule_delayed_work(&video->res_work,
>>>> RESOLUTION_CHANGE_DELAY);
>>>> @@ -951,9 +964,13 @@ static void aspeed_video_init_regs(struct
>>>> aspeed_video *video)
>>>> ? static void aspeed_video_start(struct aspeed_video *video)
>>>> ? {
>>>> +??? unsigned long flags;
>>>> +
>>>> +??? spin_lock_irqsave(&video->lock, flags);
>>>> ????? aspeed_video_on(video);
>>>> ????? aspeed_video_init_regs(video);
>>>> +??? spin_unlock_irqrestore(&video->lock, flags);
>>>> ????? /* Resolution set to 640x480 if no signal found */
>>>> ????? aspeed_video_get_resolution(video);
>>>> @@ -969,6 +986,9 @@ static void aspeed_video_start(struct
>>>> aspeed_video *video)
>>>> ? static void aspeed_video_stop(struct aspeed_video *video)
>>>> ? {
>>>> +??? unsigned long flags;
>>>> +
>>>> +??? spin_lock_irqsave(&video->lock, flags);
>>>> ????? set_bit(VIDEO_STOPPED, &video->flags);
>>>> ????? cancel_delayed_work_sync(&video->res_work);
>>>> @@ -982,6 +1002,7 @@ static void aspeed_video_stop(struct
>>>> aspeed_video *video)
>>>> ????? video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL;
>>>> ????? video->flags = 0;
>>>> +??? spin_unlock_irqrestore(&video->lock, flags);
>>>> ? }
>>>> ? static int aspeed_video_querycap(struct file *file, void *fh,
>>>> @@ -1319,16 +1340,21 @@ static void
>>>> aspeed_video_resolution_work(struct work_struct *work)
>>>> ????? struct delayed_work *dwork = to_delayed_work(work);
>>>> ????? struct aspeed_video *video = container_of(dwork, struct
>>>> aspeed_video,
>>>> ??????????????????????????? res_work);
>>>> -??? u32 input_status = video->v4l2_input_status;
>>>> +??? unsigned long flags;
>>>> +??? u32 input_status;
>>>> +??? spin_lock_irqsave(&video->lock, flags);
>>>> +??? input_status = video->v4l2_input_status;
>>>> ????? aspeed_video_on(video);
>>>> ????? /* Exit early in case no clients remain */
>>>> -??? if (test_bit(VIDEO_STOPPED, &video->flags))
>>>> +??? if (test_bit(VIDEO_STOPPED, &video->flags)) {
>>>> +??????? spin_unlock_irqrestore(&video->lock, flags);
>>>> ????????? goto done;
>>>> +??? }
>>>> ????? aspeed_video_init_regs(video);
>>>> -
>>>> +??? spin_unlock_irqrestore(&video->lock, flags);
>>>> ????? aspeed_video_get_resolution(video);
>>>> ????? if (video->detected_timings.width != video-
>>>>> active_timings.width ||
>
^ permalink raw reply
* [PATCH v2] media: platform: fix a kernel warning on clk control
From: Jae Hyun Yoo @ 2019-04-12 16:22 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <9aa895a5184ddd30eb5750e4ec223fd5a5df4a54.camel@amazon.com>
On 4/12/2019 5:17 AM, Herrenschmidt, Benjamin wrote:
> On Fri, 2019-04-12 at 13:00 +0200, Hans Verkuil wrote:
>> Eddie, can you review this?
>>
>> Jae Hyun Yoo, for future reference: please add the driver name in the
>> subject.
>> I.e. something like this: [PATCH v2] media: aspeed: fix a kernel
>> warning on clk control
>>
>> That helps maintainers figuring out who should look at which patch.
>
> test_bit/clear_bit/set_bit are atomic. The way they are used here is
> either a waste of cycles (there's already a lock) or racy. Not too sure
> :)
Hi Ben,
I added spin lock handling too to protect corresponding sequence of
turning on and off of the video engine which should be serialized.
Even with this protection, clock enable/disable can be double called
so I had to add the flag checking.
Thanks,
Jae
> Cheers,
> Ben.
>
>> Regards,
>>
>> Hans
>>
>> On 3/29/19 10:27 PM, Jae Hyun Yoo wrote:
>>> video_on and video_off functions in the Aspeed video engine driver
>>> are
>>> being called from multiple contexts without any protection so video
>>> clocks
>>> can be disabled twice and eventually it causes a kernel warning
>>> with stack
>>> dump printing out like below:
>>>
>>> [ 120.034729] WARNING: CPU: 0 PID: 1334 at drivers/clk/clk.c:684
>>> clk_core_unprepare+0x13c/0x170
>>> [ 120.043252] eclk-gate already unprepared
>>> [ 120.047283] CPU: 0 PID: 1334 Comm: obmc-ikvm Tainted:
>>> G W 5.0.3-b94b74e8b52db91fe4e99e0bb481ec8bf2b5b47c
>>> #1
>>> [ 120.058417] Hardware name: Generic DT based system
>>> [ 120.063219] Backtrace:
>>> [ 120.065787] [<80107cdc>] (dump_backtrace) from [<80107f10>]
>>> (show_stack+0x20/0x24)
>>> [ 120.073371] r7:803a4ff0 r6:00000009 r5:00000000 r4:96197e1c
>>> [ 120.079152] [<80107ef0>] (show_stack) from [<8068f7d8>]
>>> (dump_stack+0x20/0x28)
>>> [ 120.086479] [<8068f7b8>] (dump_stack) from [<8011604c>]
>>> (__warn.part.3+0xb4/0xdc)
>>> [ 120.094068] [<80115f98>] (__warn.part.3) from [<801160e0>]
>>> (warn_slowpath_fmt+0x6c/0x90)
>>> [ 120.102164] r6:000002ac r5:8080c0b8 r4:80a07008
>>> [ 120.106893] [<80116078>] (warn_slowpath_fmt) from [<803a4ff0>]
>>> (clk_core_unprepare+0x13c/0x170)
>>> [ 120.115686] r3:8080cf8c r2:8080c17c
>>> [ 120.119276] r7:97d68e58 r6:9df23200 r5:9668c260 r4:96459260
>>> [ 120.125046] [<803a4eb4>] (clk_core_unprepare) from [<803a707c>]
>>> (clk_unprepare+0x34/0x3c)
>>> [ 120.133226] r5:9668c260 r4:96459260
>>> [ 120.136932] [<803a7048>] (clk_unprepare) from [<804f34bc>]
>>> (aspeed_video_off+0x44/0x48)
>>> [ 120.145031] r5:9668c260 r4:9668cbc0
>>> [ 120.148647] [<804f3478>] (aspeed_video_off) from [<804f3fd0>]
>>> (aspeed_video_release+0x94/0x118)
>>> [ 120.157435] r5:966a0cb8 r4:966a0800
>>> [ 120.161049] [<804f3f3c>] (aspeed_video_release) from
>>> [<804d2c58>] (v4l2_release+0xd4/0xe8)
>>> [ 120.169404] r7:97d68e58 r6:9d087810 r5:9df23200 r4:966a0b20
>>> [ 120.175168] [<804d2b84>] (v4l2_release) from [<80236224>]
>>> (__fput+0x98/0x1c4)
>>> [ 120.182316] r5:96698e78 r4:9df23200
>>> [ 120.185994] [<8023618c>] (__fput) from [<802363b8>]
>>> (____fput+0x18/0x1c)
>>> [ 120.192712] r9:80a0700c r8:801011e4 r7:00000000 r6:80a64bbc
>>> r5:961dd560 r4:961dd89c
>>> [ 120.200562] [<802363a0>] (____fput) from [<80131c08>]
>>> (task_work_run+0x7c/0xa4)
>>> [ 120.207994] [<80131b8c>] (task_work_run) from [<80106884>]
>>> (do_work_pending+0x4a8/0x578)
>>> [ 120.216163] r7:801011e4 r6:80a07008 r5:96197fb0 r4:ffffe000
>>> [ 120.221856] [<801063dc>] (do_work_pending) from [<8010106c>]
>>> (slow_work_pending+0xc/0x20)
>>> [ 120.230116] Exception stack(0x96197fb0 to 0x96197ff8)
>>> [ 120.235254] 7fa0: 00000000
>>> 76ccf094 00000000 00000000
>>> [ 120.243438] 7fc0: 00000008 00a11978 7eab3c30 00000006 00000000
>>> 00000000 475b0fa4 00000000
>>> [ 120.251692] 7fe0: 00000002 7eab3a40 00000000 47720e38 80000010
>>> 00000008
>>> [ 120.258396] r10:00000000 r9:96196000 r8:801011e4 r7:00000006
>>> r6:7eab3c30 r5:00a11978
>>> [ 120.266291] r4:00000008
>>>
>>> To prevent this issue, this commit adds spinlock protection and
>>> clock
>>> status checking logic into the Aspeed video engine driver.
>>>
>>> Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine
>>> driver")
>>> Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
>>> Cc: Eddie James <eajames@linux.ibm.com>
>>> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
>>> Cc: Joel Stanley <joel@jms.id.au>
>>> Cc: Andrew Jeffery <andrew@aj.id.au>
>>> ---
>>> drivers/media/platform/aspeed-video.c | 32
>>> ++++++++++++++++++++++++---
>>> 1 file changed, 29 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/media/platform/aspeed-video.c
>>> b/drivers/media/platform/aspeed-video.c
>>> index 692e08ef38c0..744d22ecc620 100644
>>> --- a/drivers/media/platform/aspeed-video.c
>>> +++ b/drivers/media/platform/aspeed-video.c
>>> @@ -188,6 +188,7 @@ enum {
>>> VIDEO_STREAMING,
>>> VIDEO_FRAME_INPRG,
>>> VIDEO_STOPPED,
>>> + VIDEO_CLOCKS_ON,
>>> };
>>>
>>> struct aspeed_video_addr {
>>> @@ -495,20 +496,30 @@ static void aspeed_video_reset(struct
>>> aspeed_video *video)
>>>
>>> static void aspeed_video_off(struct aspeed_video *video)
>>> {
>>> + if (!test_bit(VIDEO_CLOCKS_ON, &video->flags))
>>> + return;
>>> +
>>> aspeed_video_reset(video);
>>>
>>> /* Turn off the relevant clocks */
>>> clk_disable_unprepare(video->vclk);
>>> clk_disable_unprepare(video->eclk);
>>> +
>>> + clear_bit(VIDEO_CLOCKS_ON, &video->flags);
>>> }
>>>
>>> static void aspeed_video_on(struct aspeed_video *video)
>>> {
>>> + if (test_bit(VIDEO_CLOCKS_ON, &video->flags))
>>> + return;
>>> +
>>> /* Turn on the relevant clocks */
>>> clk_prepare_enable(video->eclk);
>>> clk_prepare_enable(video->vclk);
>>>
>>> aspeed_video_reset(video);
>>> +
>>> + set_bit(VIDEO_CLOCKS_ON, &video->flags);
>>> }
>>>
>>> static void aspeed_video_bufs_done(struct aspeed_video *video,
>>> @@ -526,12 +537,14 @@ static void aspeed_video_bufs_done(struct
>>> aspeed_video *video,
>>>
>>> static void aspeed_video_irq_res_change(struct aspeed_video
>>> *video)
>>> {
>>> + spin_lock(&video->lock);
>>> dev_dbg(video->dev, "Resolution changed; resetting\n");
>>>
>>> set_bit(VIDEO_RES_CHANGE, &video->flags);
>>> clear_bit(VIDEO_FRAME_INPRG, &video->flags);
>>>
>>> aspeed_video_off(video);
>>> + spin_unlock(&video->lock);
>>> aspeed_video_bufs_done(video, VB2_BUF_STATE_ERROR);
>>>
>>> schedule_delayed_work(&video->res_work,
>>> RESOLUTION_CHANGE_DELAY);
>>> @@ -951,9 +964,13 @@ static void aspeed_video_init_regs(struct
>>> aspeed_video *video)
>>>
>>> static void aspeed_video_start(struct aspeed_video *video)
>>> {
>>> + unsigned long flags;
>>> +
>>> + spin_lock_irqsave(&video->lock, flags);
>>> aspeed_video_on(video);
>>>
>>> aspeed_video_init_regs(video);
>>> + spin_unlock_irqrestore(&video->lock, flags);
>>>
>>> /* Resolution set to 640x480 if no signal found */
>>> aspeed_video_get_resolution(video);
>>> @@ -969,6 +986,9 @@ static void aspeed_video_start(struct
>>> aspeed_video *video)
>>>
>>> static void aspeed_video_stop(struct aspeed_video *video)
>>> {
>>> + unsigned long flags;
>>> +
>>> + spin_lock_irqsave(&video->lock, flags);
>>> set_bit(VIDEO_STOPPED, &video->flags);
>>> cancel_delayed_work_sync(&video->res_work);
>>>
>>> @@ -982,6 +1002,7 @@ static void aspeed_video_stop(struct
>>> aspeed_video *video)
>>>
>>> video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL;
>>> video->flags = 0;
>>> + spin_unlock_irqrestore(&video->lock, flags);
>>> }
>>>
>>> static int aspeed_video_querycap(struct file *file, void *fh,
>>> @@ -1319,16 +1340,21 @@ static void
>>> aspeed_video_resolution_work(struct work_struct *work)
>>> struct delayed_work *dwork = to_delayed_work(work);
>>> struct aspeed_video *video = container_of(dwork, struct
>>> aspeed_video,
>>> res_work);
>>> - u32 input_status = video->v4l2_input_status;
>>> + unsigned long flags;
>>> + u32 input_status;
>>>
>>> + spin_lock_irqsave(&video->lock, flags);
>>> + input_status = video->v4l2_input_status;
>>> aspeed_video_on(video);
>>>
>>> /* Exit early in case no clients remain */
>>> - if (test_bit(VIDEO_STOPPED, &video->flags))
>>> + if (test_bit(VIDEO_STOPPED, &video->flags)) {
>>> + spin_unlock_irqrestore(&video->lock, flags);
>>> goto done;
>>> + }
>>>
>>> aspeed_video_init_regs(video);
>>> -
>>> + spin_unlock_irqrestore(&video->lock, flags);
>>> aspeed_video_get_resolution(video);
>>>
>>> if (video->detected_timings.width != video-
>>>> active_timings.width ||
>>>
^ permalink raw reply
* [PATCH v2] media: platform: fix a kernel warning on clk control
From: Jae Hyun Yoo @ 2019-04-12 16:13 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <09113211-ef61-2168-cf78-37c76f21edba@xs4all.nl>
On 4/12/2019 4:00 AM, Hans Verkuil wrote:
> Eddie, can you review this?
>
> Jae Hyun Yoo, for future reference: please add the driver name in the subject.
> I.e. something like this: [PATCH v2] media: aspeed: fix a kernel warning on clk control
>
> That helps maintainers figuring out who should look at which patch.
Hi Hans,
I see. I'll change the subject like you suggested. Thanks for your
comments.
Regards,
Jae
> Regards,
>
> Hans
^ permalink raw reply
* [PATCH v2 00/21] Convert hwmon documentation to ReST
From: Guenter Roeck @ 2019-04-12 16:12 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190412100451.6fe49de7@lwn.net>
On 4/12/19 9:04 AM, Jonathan Corbet wrote:
> On Thu, 11 Apr 2019 14:07:31 -0700
> Guenter Roeck <linux@roeck-us.net> wrote:
>
>>> While nobody does such split, IMHO, the best would be to keep the
>>> information outside Documentation/admin-guide. But hey! You're
>>> the Doc maintainer. If you prefer to move, I'm perfectly fine
>>> with that.
>>>
>>
>> Same here, but please don't move the files which are kernel facing only.
>
> Well, let's step back and think about this. Who is the audience for
> these documents? That will tell us a lot about where they should really
> be.
>
Most of them are for users, some of them are for driver developers. A few
are for both, though that is generally not the intention (and one may argue
that driver internal documentation should be moved into the respective
driver source).
> What I would prefer to avoid is the status quo where *everything* is in
> the top-level directory, and where documents are organized for the
> convenience of their maintainers rather than of their readers. But
> sometimes I feel like I'm alone in that desire...:)
>
I am fine with separating user pointing from kernel API/driver developer
guides, and I agree that it would make a lot of sense. As I said, please
just make sure that kernel facing files don't end up in the wrong directory.
Thanks,
Guenter
^ permalink raw reply
* [PATCH v2 00/21] Convert hwmon documentation to ReST
From: Jonathan Corbet @ 2019-04-12 16:04 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190411210731.GA29378@roeck-us.net>
On Thu, 11 Apr 2019 14:07:31 -0700
Guenter Roeck <linux@roeck-us.net> wrote:
> > While nobody does such split, IMHO, the best would be to keep the
> > information outside Documentation/admin-guide. But hey! You're
> > the Doc maintainer. If you prefer to move, I'm perfectly fine
> > with that.
> >
>
> Same here, but please don't move the files which are kernel facing only.
Well, let's step back and think about this. Who is the audience for
these documents? That will tell us a lot about where they should really
be.
What I would prefer to avoid is the status quo where *everything* is in
the top-level directory, and where documents are organized for the
convenience of their maintainers rather than of their readers. But
sometimes I feel like I'm alone in that desire...:)
Thanks,
jon
^ permalink raw reply
* [PATCH v2] media: platform: fix a kernel warning on clk control
From: Eddie James @ 2019-04-12 14:33 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <9aa895a5184ddd30eb5750e4ec223fd5a5df4a54.camel@amazon.com>
On 4/12/19 7:17 AM, Herrenschmidt, Benjamin wrote:
> On Fri, 2019-04-12 at 13:00 +0200, Hans Verkuil wrote:
>> Eddie, can you review this?
Yes, this looks good.
Thanks,
Reviewed-by: Eddie James <eajames@linux.ibm.com>
>>
>> Jae Hyun Yoo, for future reference: please add the driver name in the
>> subject.
>> I.e. something like this: [PATCH v2] media: aspeed: fix a kernel
>> warning on clk control
>>
>> That helps maintainers figuring out who should look at which patch.
> test_bit/clear_bit/set_bit are atomic. The way they are used here is
> either a waste of cycles (there's already a lock) or racy. Not too sure
Yes, it's conceivable that this could be done locklessly, but I'm fine
with being cautious. I asked Jae to use the bit functions and flag for
code cleanliness instead of an additional bool... are the additional
cycles that bad here?
> :)
>
> Cheers,
> Ben.
>
>> Regards,
>>
>> Hans
>>
>> On 3/29/19 10:27 PM, Jae Hyun Yoo wrote:
>>> video_on and video_off functions in the Aspeed video engine driver
>>> are
>>> being called from multiple contexts without any protection so video
>>> clocks
>>> can be disabled twice and eventually it causes a kernel warning
>>> with stack
>>> dump printing out like below:
>>>
>>> [ 120.034729] WARNING: CPU: 0 PID: 1334 at drivers/clk/clk.c:684
>>> clk_core_unprepare+0x13c/0x170
>>> [ 120.043252] eclk-gate already unprepared
>>> [ 120.047283] CPU: 0 PID: 1334 Comm: obmc-ikvm Tainted:
>>> G W 5.0.3-b94b74e8b52db91fe4e99e0bb481ec8bf2b5b47c
>>> #1
>>> [ 120.058417] Hardware name: Generic DT based system
>>> [ 120.063219] Backtrace:
>>> [ 120.065787] [<80107cdc>] (dump_backtrace) from [<80107f10>]
>>> (show_stack+0x20/0x24)
>>> [ 120.073371] r7:803a4ff0 r6:00000009 r5:00000000 r4:96197e1c
>>> [ 120.079152] [<80107ef0>] (show_stack) from [<8068f7d8>]
>>> (dump_stack+0x20/0x28)
>>> [ 120.086479] [<8068f7b8>] (dump_stack) from [<8011604c>]
>>> (__warn.part.3+0xb4/0xdc)
>>> [ 120.094068] [<80115f98>] (__warn.part.3) from [<801160e0>]
>>> (warn_slowpath_fmt+0x6c/0x90)
>>> [ 120.102164] r6:000002ac r5:8080c0b8 r4:80a07008
>>> [ 120.106893] [<80116078>] (warn_slowpath_fmt) from [<803a4ff0>]
>>> (clk_core_unprepare+0x13c/0x170)
>>> [ 120.115686] r3:8080cf8c r2:8080c17c
>>> [ 120.119276] r7:97d68e58 r6:9df23200 r5:9668c260 r4:96459260
>>> [ 120.125046] [<803a4eb4>] (clk_core_unprepare) from [<803a707c>]
>>> (clk_unprepare+0x34/0x3c)
>>> [ 120.133226] r5:9668c260 r4:96459260
>>> [ 120.136932] [<803a7048>] (clk_unprepare) from [<804f34bc>]
>>> (aspeed_video_off+0x44/0x48)
>>> [ 120.145031] r5:9668c260 r4:9668cbc0
>>> [ 120.148647] [<804f3478>] (aspeed_video_off) from [<804f3fd0>]
>>> (aspeed_video_release+0x94/0x118)
>>> [ 120.157435] r5:966a0cb8 r4:966a0800
>>> [ 120.161049] [<804f3f3c>] (aspeed_video_release) from
>>> [<804d2c58>] (v4l2_release+0xd4/0xe8)
>>> [ 120.169404] r7:97d68e58 r6:9d087810 r5:9df23200 r4:966a0b20
>>> [ 120.175168] [<804d2b84>] (v4l2_release) from [<80236224>]
>>> (__fput+0x98/0x1c4)
>>> [ 120.182316] r5:96698e78 r4:9df23200
>>> [ 120.185994] [<8023618c>] (__fput) from [<802363b8>]
>>> (____fput+0x18/0x1c)
>>> [ 120.192712] r9:80a0700c r8:801011e4 r7:00000000 r6:80a64bbc
>>> r5:961dd560 r4:961dd89c
>>> [ 120.200562] [<802363a0>] (____fput) from [<80131c08>]
>>> (task_work_run+0x7c/0xa4)
>>> [ 120.207994] [<80131b8c>] (task_work_run) from [<80106884>]
>>> (do_work_pending+0x4a8/0x578)
>>> [ 120.216163] r7:801011e4 r6:80a07008 r5:96197fb0 r4:ffffe000
>>> [ 120.221856] [<801063dc>] (do_work_pending) from [<8010106c>]
>>> (slow_work_pending+0xc/0x20)
>>> [ 120.230116] Exception stack(0x96197fb0 to 0x96197ff8)
>>> [ 120.235254] 7fa0: 00000000
>>> 76ccf094 00000000 00000000
>>> [ 120.243438] 7fc0: 00000008 00a11978 7eab3c30 00000006 00000000
>>> 00000000 475b0fa4 00000000
>>> [ 120.251692] 7fe0: 00000002 7eab3a40 00000000 47720e38 80000010
>>> 00000008
>>> [ 120.258396] r10:00000000 r9:96196000 r8:801011e4 r7:00000006
>>> r6:7eab3c30 r5:00a11978
>>> [ 120.266291] r4:00000008
>>>
>>> To prevent this issue, this commit adds spinlock protection and
>>> clock
>>> status checking logic into the Aspeed video engine driver.
>>>
>>> Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine
>>> driver")
>>> Signed-off-by: Jae Hyun Yoo<jae.hyun.yoo@linux.intel.com>
>>> Cc: Eddie James<eajames@linux.ibm.com>
>>> Cc: Mauro Carvalho Chehab<mchehab@kernel.org>
>>> Cc: Joel Stanley<joel@jms.id.au>
>>> Cc: Andrew Jeffery<andrew@aj.id.au>
>>> ---
>>> drivers/media/platform/aspeed-video.c | 32
>>> ++++++++++++++++++++++++---
>>> 1 file changed, 29 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/media/platform/aspeed-video.c
>>> b/drivers/media/platform/aspeed-video.c
>>> index 692e08ef38c0..744d22ecc620 100644
>>> --- a/drivers/media/platform/aspeed-video.c
>>> +++ b/drivers/media/platform/aspeed-video.c
>>> @@ -188,6 +188,7 @@ enum {
>>> VIDEO_STREAMING,
>>> VIDEO_FRAME_INPRG,
>>> VIDEO_STOPPED,
>>> + VIDEO_CLOCKS_ON,
>>> };
>>>
>>> struct aspeed_video_addr {
>>> @@ -495,20 +496,30 @@ static void aspeed_video_reset(struct
>>> aspeed_video *video)
>>>
>>> static void aspeed_video_off(struct aspeed_video *video)
>>> {
>>> + if (!test_bit(VIDEO_CLOCKS_ON, &video->flags))
>>> + return;
>>> +
>>> aspeed_video_reset(video);
>>>
>>> /* Turn off the relevant clocks */
>>> clk_disable_unprepare(video->vclk);
>>> clk_disable_unprepare(video->eclk);
>>> +
>>> + clear_bit(VIDEO_CLOCKS_ON, &video->flags);
>>> }
>>>
>>> static void aspeed_video_on(struct aspeed_video *video)
>>> {
>>> + if (test_bit(VIDEO_CLOCKS_ON, &video->flags))
>>> + return;
>>> +
>>> /* Turn on the relevant clocks */
>>> clk_prepare_enable(video->eclk);
>>> clk_prepare_enable(video->vclk);
>>>
>>> aspeed_video_reset(video);
>>> +
>>> + set_bit(VIDEO_CLOCKS_ON, &video->flags);
>>> }
>>>
>>> static void aspeed_video_bufs_done(struct aspeed_video *video,
>>> @@ -526,12 +537,14 @@ static void aspeed_video_bufs_done(struct
>>> aspeed_video *video,
>>>
>>> static void aspeed_video_irq_res_change(struct aspeed_video
>>> *video)
>>> {
>>> + spin_lock(&video->lock);
>>> dev_dbg(video->dev, "Resolution changed; resetting\n");
>>>
>>> set_bit(VIDEO_RES_CHANGE, &video->flags);
>>> clear_bit(VIDEO_FRAME_INPRG, &video->flags);
>>>
>>> aspeed_video_off(video);
>>> + spin_unlock(&video->lock);
>>> aspeed_video_bufs_done(video, VB2_BUF_STATE_ERROR);
>>>
>>> schedule_delayed_work(&video->res_work,
>>> RESOLUTION_CHANGE_DELAY);
>>> @@ -951,9 +964,13 @@ static void aspeed_video_init_regs(struct
>>> aspeed_video *video)
>>>
>>> static void aspeed_video_start(struct aspeed_video *video)
>>> {
>>> + unsigned long flags;
>>> +
>>> + spin_lock_irqsave(&video->lock, flags);
>>> aspeed_video_on(video);
>>>
>>> aspeed_video_init_regs(video);
>>> + spin_unlock_irqrestore(&video->lock, flags);
>>>
>>> /* Resolution set to 640x480 if no signal found */
>>> aspeed_video_get_resolution(video);
>>> @@ -969,6 +986,9 @@ static void aspeed_video_start(struct
>>> aspeed_video *video)
>>>
>>> static void aspeed_video_stop(struct aspeed_video *video)
>>> {
>>> + unsigned long flags;
>>> +
>>> + spin_lock_irqsave(&video->lock, flags);
>>> set_bit(VIDEO_STOPPED, &video->flags);
>>> cancel_delayed_work_sync(&video->res_work);
>>>
>>> @@ -982,6 +1002,7 @@ static void aspeed_video_stop(struct
>>> aspeed_video *video)
>>>
>>> video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL;
>>> video->flags = 0;
>>> + spin_unlock_irqrestore(&video->lock, flags);
>>> }
>>>
>>> static int aspeed_video_querycap(struct file *file, void *fh,
>>> @@ -1319,16 +1340,21 @@ static void
>>> aspeed_video_resolution_work(struct work_struct *work)
>>> struct delayed_work *dwork = to_delayed_work(work);
>>> struct aspeed_video *video = container_of(dwork, struct
>>> aspeed_video,
>>> res_work);
>>> - u32 input_status = video->v4l2_input_status;
>>> + unsigned long flags;
>>> + u32 input_status;
>>>
>>> + spin_lock_irqsave(&video->lock, flags);
>>> + input_status = video->v4l2_input_status;
>>> aspeed_video_on(video);
>>>
>>> /* Exit early in case no clients remain */
>>> - if (test_bit(VIDEO_STOPPED, &video->flags))
>>> + if (test_bit(VIDEO_STOPPED, &video->flags)) {
>>> + spin_unlock_irqrestore(&video->lock, flags);
>>> goto done;
>>> + }
>>>
>>> aspeed_video_init_regs(video);
>>> -
>>> + spin_unlock_irqrestore(&video->lock, flags);
>>> aspeed_video_get_resolution(video);
>>>
>>> if (video->detected_timings.width != video-
>>>> active_timings.width ||
^ permalink raw reply
* [PATCH v2] media: platform: fix a kernel warning on clk control
From: Herrenschmidt, Benjamin @ 2019-04-12 12:18 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <09113211-ef61-2168-cf78-37c76f21edba@xs4all.nl>
On Fri, 2019-04-12 at 13:00 +0200, Hans Verkuil wrote:
> Eddie, can you review this?
>
> Jae Hyun Yoo, for future reference: please add the driver name in the
> subject.
> I.e. something like this: [PATCH v2] media: aspeed: fix a kernel
> warning on clk control
>
> That helps maintainers figuring out who should look at which patch.
test_bit/clear_bit/set_bit are atomic. The way they are used here is
either a waste of cycles (there's already a lock) or racy. Not too sure
:)
Cheers,
Ben.
> Regards,
>
> Hans
>
> On 3/29/19 10:27 PM, Jae Hyun Yoo wrote:
> > video_on and video_off functions in the Aspeed video engine driver
> > are
> > being called from multiple contexts without any protection so video
> > clocks
> > can be disabled twice and eventually it causes a kernel warning
> > with stack
> > dump printing out like below:
> >
> > [ 120.034729] WARNING: CPU: 0 PID: 1334 at drivers/clk/clk.c:684
> > clk_core_unprepare+0x13c/0x170
> > [ 120.043252] eclk-gate already unprepared
> > [ 120.047283] CPU: 0 PID: 1334 Comm: obmc-ikvm Tainted:
> > G W 5.0.3-b94b74e8b52db91fe4e99e0bb481ec8bf2b5b47c
> > #1
> > [ 120.058417] Hardware name: Generic DT based system
> > [ 120.063219] Backtrace:
> > [ 120.065787] [<80107cdc>] (dump_backtrace) from [<80107f10>]
> > (show_stack+0x20/0x24)
> > [ 120.073371] r7:803a4ff0 r6:00000009 r5:00000000 r4:96197e1c
> > [ 120.079152] [<80107ef0>] (show_stack) from [<8068f7d8>]
> > (dump_stack+0x20/0x28)
> > [ 120.086479] [<8068f7b8>] (dump_stack) from [<8011604c>]
> > (__warn.part.3+0xb4/0xdc)
> > [ 120.094068] [<80115f98>] (__warn.part.3) from [<801160e0>]
> > (warn_slowpath_fmt+0x6c/0x90)
> > [ 120.102164] r6:000002ac r5:8080c0b8 r4:80a07008
> > [ 120.106893] [<80116078>] (warn_slowpath_fmt) from [<803a4ff0>]
> > (clk_core_unprepare+0x13c/0x170)
> > [ 120.115686] r3:8080cf8c r2:8080c17c
> > [ 120.119276] r7:97d68e58 r6:9df23200 r5:9668c260 r4:96459260
> > [ 120.125046] [<803a4eb4>] (clk_core_unprepare) from [<803a707c>]
> > (clk_unprepare+0x34/0x3c)
> > [ 120.133226] r5:9668c260 r4:96459260
> > [ 120.136932] [<803a7048>] (clk_unprepare) from [<804f34bc>]
> > (aspeed_video_off+0x44/0x48)
> > [ 120.145031] r5:9668c260 r4:9668cbc0
> > [ 120.148647] [<804f3478>] (aspeed_video_off) from [<804f3fd0>]
> > (aspeed_video_release+0x94/0x118)
> > [ 120.157435] r5:966a0cb8 r4:966a0800
> > [ 120.161049] [<804f3f3c>] (aspeed_video_release) from
> > [<804d2c58>] (v4l2_release+0xd4/0xe8)
> > [ 120.169404] r7:97d68e58 r6:9d087810 r5:9df23200 r4:966a0b20
> > [ 120.175168] [<804d2b84>] (v4l2_release) from [<80236224>]
> > (__fput+0x98/0x1c4)
> > [ 120.182316] r5:96698e78 r4:9df23200
> > [ 120.185994] [<8023618c>] (__fput) from [<802363b8>]
> > (____fput+0x18/0x1c)
> > [ 120.192712] r9:80a0700c r8:801011e4 r7:00000000 r6:80a64bbc
> > r5:961dd560 r4:961dd89c
> > [ 120.200562] [<802363a0>] (____fput) from [<80131c08>]
> > (task_work_run+0x7c/0xa4)
> > [ 120.207994] [<80131b8c>] (task_work_run) from [<80106884>]
> > (do_work_pending+0x4a8/0x578)
> > [ 120.216163] r7:801011e4 r6:80a07008 r5:96197fb0 r4:ffffe000
> > [ 120.221856] [<801063dc>] (do_work_pending) from [<8010106c>]
> > (slow_work_pending+0xc/0x20)
> > [ 120.230116] Exception stack(0x96197fb0 to 0x96197ff8)
> > [ 120.235254] 7fa0: 00000000
> > 76ccf094 00000000 00000000
> > [ 120.243438] 7fc0: 00000008 00a11978 7eab3c30 00000006 00000000
> > 00000000 475b0fa4 00000000
> > [ 120.251692] 7fe0: 00000002 7eab3a40 00000000 47720e38 80000010
> > 00000008
> > [ 120.258396] r10:00000000 r9:96196000 r8:801011e4 r7:00000006
> > r6:7eab3c30 r5:00a11978
> > [ 120.266291] r4:00000008
> >
> > To prevent this issue, this commit adds spinlock protection and
> > clock
> > status checking logic into the Aspeed video engine driver.
> >
> > Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine
> > driver")
> > Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
> > Cc: Eddie James <eajames@linux.ibm.com>
> > Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> > Cc: Joel Stanley <joel@jms.id.au>
> > Cc: Andrew Jeffery <andrew@aj.id.au>
> > ---
> > drivers/media/platform/aspeed-video.c | 32
> > ++++++++++++++++++++++++---
> > 1 file changed, 29 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/media/platform/aspeed-video.c
> > b/drivers/media/platform/aspeed-video.c
> > index 692e08ef38c0..744d22ecc620 100644
> > --- a/drivers/media/platform/aspeed-video.c
> > +++ b/drivers/media/platform/aspeed-video.c
> > @@ -188,6 +188,7 @@ enum {
> > VIDEO_STREAMING,
> > VIDEO_FRAME_INPRG,
> > VIDEO_STOPPED,
> > + VIDEO_CLOCKS_ON,
> > };
> >
> > struct aspeed_video_addr {
> > @@ -495,20 +496,30 @@ static void aspeed_video_reset(struct
> > aspeed_video *video)
> >
> > static void aspeed_video_off(struct aspeed_video *video)
> > {
> > + if (!test_bit(VIDEO_CLOCKS_ON, &video->flags))
> > + return;
> > +
> > aspeed_video_reset(video);
> >
> > /* Turn off the relevant clocks */
> > clk_disable_unprepare(video->vclk);
> > clk_disable_unprepare(video->eclk);
> > +
> > + clear_bit(VIDEO_CLOCKS_ON, &video->flags);
> > }
> >
> > static void aspeed_video_on(struct aspeed_video *video)
> > {
> > + if (test_bit(VIDEO_CLOCKS_ON, &video->flags))
> > + return;
> > +
> > /* Turn on the relevant clocks */
> > clk_prepare_enable(video->eclk);
> > clk_prepare_enable(video->vclk);
> >
> > aspeed_video_reset(video);
> > +
> > + set_bit(VIDEO_CLOCKS_ON, &video->flags);
> > }
> >
> > static void aspeed_video_bufs_done(struct aspeed_video *video,
> > @@ -526,12 +537,14 @@ static void aspeed_video_bufs_done(struct
> > aspeed_video *video,
> >
> > static void aspeed_video_irq_res_change(struct aspeed_video
> > *video)
> > {
> > + spin_lock(&video->lock);
> > dev_dbg(video->dev, "Resolution changed; resetting\n");
> >
> > set_bit(VIDEO_RES_CHANGE, &video->flags);
> > clear_bit(VIDEO_FRAME_INPRG, &video->flags);
> >
> > aspeed_video_off(video);
> > + spin_unlock(&video->lock);
> > aspeed_video_bufs_done(video, VB2_BUF_STATE_ERROR);
> >
> > schedule_delayed_work(&video->res_work,
> > RESOLUTION_CHANGE_DELAY);
> > @@ -951,9 +964,13 @@ static void aspeed_video_init_regs(struct
> > aspeed_video *video)
> >
> > static void aspeed_video_start(struct aspeed_video *video)
> > {
> > + unsigned long flags;
> > +
> > + spin_lock_irqsave(&video->lock, flags);
> > aspeed_video_on(video);
> >
> > aspeed_video_init_regs(video);
> > + spin_unlock_irqrestore(&video->lock, flags);
> >
> > /* Resolution set to 640x480 if no signal found */
> > aspeed_video_get_resolution(video);
> > @@ -969,6 +986,9 @@ static void aspeed_video_start(struct
> > aspeed_video *video)
> >
> > static void aspeed_video_stop(struct aspeed_video *video)
> > {
> > + unsigned long flags;
> > +
> > + spin_lock_irqsave(&video->lock, flags);
> > set_bit(VIDEO_STOPPED, &video->flags);
> > cancel_delayed_work_sync(&video->res_work);
> >
> > @@ -982,6 +1002,7 @@ static void aspeed_video_stop(struct
> > aspeed_video *video)
> >
> > video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL;
> > video->flags = 0;
> > + spin_unlock_irqrestore(&video->lock, flags);
> > }
> >
> > static int aspeed_video_querycap(struct file *file, void *fh,
> > @@ -1319,16 +1340,21 @@ static void
> > aspeed_video_resolution_work(struct work_struct *work)
> > struct delayed_work *dwork = to_delayed_work(work);
> > struct aspeed_video *video = container_of(dwork, struct
> > aspeed_video,
> > res_work);
> > - u32 input_status = video->v4l2_input_status;
> > + unsigned long flags;
> > + u32 input_status;
> >
> > + spin_lock_irqsave(&video->lock, flags);
> > + input_status = video->v4l2_input_status;
> > aspeed_video_on(video);
> >
> > /* Exit early in case no clients remain */
> > - if (test_bit(VIDEO_STOPPED, &video->flags))
> > + if (test_bit(VIDEO_STOPPED, &video->flags)) {
> > + spin_unlock_irqrestore(&video->lock, flags);
> > goto done;
> > + }
> >
> > aspeed_video_init_regs(video);
> > -
> > + spin_unlock_irqrestore(&video->lock, flags);
> > aspeed_video_get_resolution(video);
> >
> > if (video->detected_timings.width != video-
> > >active_timings.width ||
> >
^ permalink raw reply
* [PATCH v2] media: platform: fix a kernel warning on clk control
From: Hans Verkuil @ 2019-04-12 11:00 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190329212710.5378-1-jae.hyun.yoo@linux.intel.com>
Eddie, can you review this?
Jae Hyun Yoo, for future reference: please add the driver name in the subject.
I.e. something like this: [PATCH v2] media: aspeed: fix a kernel warning on clk control
That helps maintainers figuring out who should look at which patch.
Regards,
Hans
On 3/29/19 10:27 PM, Jae Hyun Yoo wrote:
> video_on and video_off functions in the Aspeed video engine driver are
> being called from multiple contexts without any protection so video clocks
> can be disabled twice and eventually it causes a kernel warning with stack
> dump printing out like below:
>
> [ 120.034729] WARNING: CPU: 0 PID: 1334 at drivers/clk/clk.c:684 clk_core_unprepare+0x13c/0x170
> [ 120.043252] eclk-gate already unprepared
> [ 120.047283] CPU: 0 PID: 1334 Comm: obmc-ikvm Tainted: G W 5.0.3-b94b74e8b52db91fe4e99e0bb481ec8bf2b5b47c #1
> [ 120.058417] Hardware name: Generic DT based system
> [ 120.063219] Backtrace:
> [ 120.065787] [<80107cdc>] (dump_backtrace) from [<80107f10>] (show_stack+0x20/0x24)
> [ 120.073371] r7:803a4ff0 r6:00000009 r5:00000000 r4:96197e1c
> [ 120.079152] [<80107ef0>] (show_stack) from [<8068f7d8>] (dump_stack+0x20/0x28)
> [ 120.086479] [<8068f7b8>] (dump_stack) from [<8011604c>] (__warn.part.3+0xb4/0xdc)
> [ 120.094068] [<80115f98>] (__warn.part.3) from [<801160e0>] (warn_slowpath_fmt+0x6c/0x90)
> [ 120.102164] r6:000002ac r5:8080c0b8 r4:80a07008
> [ 120.106893] [<80116078>] (warn_slowpath_fmt) from [<803a4ff0>] (clk_core_unprepare+0x13c/0x170)
> [ 120.115686] r3:8080cf8c r2:8080c17c
> [ 120.119276] r7:97d68e58 r6:9df23200 r5:9668c260 r4:96459260
> [ 120.125046] [<803a4eb4>] (clk_core_unprepare) from [<803a707c>] (clk_unprepare+0x34/0x3c)
> [ 120.133226] r5:9668c260 r4:96459260
> [ 120.136932] [<803a7048>] (clk_unprepare) from [<804f34bc>] (aspeed_video_off+0x44/0x48)
> [ 120.145031] r5:9668c260 r4:9668cbc0
> [ 120.148647] [<804f3478>] (aspeed_video_off) from [<804f3fd0>] (aspeed_video_release+0x94/0x118)
> [ 120.157435] r5:966a0cb8 r4:966a0800
> [ 120.161049] [<804f3f3c>] (aspeed_video_release) from [<804d2c58>] (v4l2_release+0xd4/0xe8)
> [ 120.169404] r7:97d68e58 r6:9d087810 r5:9df23200 r4:966a0b20
> [ 120.175168] [<804d2b84>] (v4l2_release) from [<80236224>] (__fput+0x98/0x1c4)
> [ 120.182316] r5:96698e78 r4:9df23200
> [ 120.185994] [<8023618c>] (__fput) from [<802363b8>] (____fput+0x18/0x1c)
> [ 120.192712] r9:80a0700c r8:801011e4 r7:00000000 r6:80a64bbc r5:961dd560 r4:961dd89c
> [ 120.200562] [<802363a0>] (____fput) from [<80131c08>] (task_work_run+0x7c/0xa4)
> [ 120.207994] [<80131b8c>] (task_work_run) from [<80106884>] (do_work_pending+0x4a8/0x578)
> [ 120.216163] r7:801011e4 r6:80a07008 r5:96197fb0 r4:ffffe000
> [ 120.221856] [<801063dc>] (do_work_pending) from [<8010106c>] (slow_work_pending+0xc/0x20)
> [ 120.230116] Exception stack(0x96197fb0 to 0x96197ff8)
> [ 120.235254] 7fa0: 00000000 76ccf094 00000000 00000000
> [ 120.243438] 7fc0: 00000008 00a11978 7eab3c30 00000006 00000000 00000000 475b0fa4 00000000
> [ 120.251692] 7fe0: 00000002 7eab3a40 00000000 47720e38 80000010 00000008
> [ 120.258396] r10:00000000 r9:96196000 r8:801011e4 r7:00000006 r6:7eab3c30 r5:00a11978
> [ 120.266291] r4:00000008
>
> To prevent this issue, this commit adds spinlock protection and clock
> status checking logic into the Aspeed video engine driver.
>
> Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver")
> Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
> Cc: Eddie James <eajames@linux.ibm.com>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: Joel Stanley <joel@jms.id.au>
> Cc: Andrew Jeffery <andrew@aj.id.au>
> ---
> drivers/media/platform/aspeed-video.c | 32 ++++++++++++++++++++++++---
> 1 file changed, 29 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
> index 692e08ef38c0..744d22ecc620 100644
> --- a/drivers/media/platform/aspeed-video.c
> +++ b/drivers/media/platform/aspeed-video.c
> @@ -188,6 +188,7 @@ enum {
> VIDEO_STREAMING,
> VIDEO_FRAME_INPRG,
> VIDEO_STOPPED,
> + VIDEO_CLOCKS_ON,
> };
>
> struct aspeed_video_addr {
> @@ -495,20 +496,30 @@ static void aspeed_video_reset(struct aspeed_video *video)
>
> static void aspeed_video_off(struct aspeed_video *video)
> {
> + if (!test_bit(VIDEO_CLOCKS_ON, &video->flags))
> + return;
> +
> aspeed_video_reset(video);
>
> /* Turn off the relevant clocks */
> clk_disable_unprepare(video->vclk);
> clk_disable_unprepare(video->eclk);
> +
> + clear_bit(VIDEO_CLOCKS_ON, &video->flags);
> }
>
> static void aspeed_video_on(struct aspeed_video *video)
> {
> + if (test_bit(VIDEO_CLOCKS_ON, &video->flags))
> + return;
> +
> /* Turn on the relevant clocks */
> clk_prepare_enable(video->eclk);
> clk_prepare_enable(video->vclk);
>
> aspeed_video_reset(video);
> +
> + set_bit(VIDEO_CLOCKS_ON, &video->flags);
> }
>
> static void aspeed_video_bufs_done(struct aspeed_video *video,
> @@ -526,12 +537,14 @@ static void aspeed_video_bufs_done(struct aspeed_video *video,
>
> static void aspeed_video_irq_res_change(struct aspeed_video *video)
> {
> + spin_lock(&video->lock);
> dev_dbg(video->dev, "Resolution changed; resetting\n");
>
> set_bit(VIDEO_RES_CHANGE, &video->flags);
> clear_bit(VIDEO_FRAME_INPRG, &video->flags);
>
> aspeed_video_off(video);
> + spin_unlock(&video->lock);
> aspeed_video_bufs_done(video, VB2_BUF_STATE_ERROR);
>
> schedule_delayed_work(&video->res_work, RESOLUTION_CHANGE_DELAY);
> @@ -951,9 +964,13 @@ static void aspeed_video_init_regs(struct aspeed_video *video)
>
> static void aspeed_video_start(struct aspeed_video *video)
> {
> + unsigned long flags;
> +
> + spin_lock_irqsave(&video->lock, flags);
> aspeed_video_on(video);
>
> aspeed_video_init_regs(video);
> + spin_unlock_irqrestore(&video->lock, flags);
>
> /* Resolution set to 640x480 if no signal found */
> aspeed_video_get_resolution(video);
> @@ -969,6 +986,9 @@ static void aspeed_video_start(struct aspeed_video *video)
>
> static void aspeed_video_stop(struct aspeed_video *video)
> {
> + unsigned long flags;
> +
> + spin_lock_irqsave(&video->lock, flags);
> set_bit(VIDEO_STOPPED, &video->flags);
> cancel_delayed_work_sync(&video->res_work);
>
> @@ -982,6 +1002,7 @@ static void aspeed_video_stop(struct aspeed_video *video)
>
> video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL;
> video->flags = 0;
> + spin_unlock_irqrestore(&video->lock, flags);
> }
>
> static int aspeed_video_querycap(struct file *file, void *fh,
> @@ -1319,16 +1340,21 @@ static void aspeed_video_resolution_work(struct work_struct *work)
> struct delayed_work *dwork = to_delayed_work(work);
> struct aspeed_video *video = container_of(dwork, struct aspeed_video,
> res_work);
> - u32 input_status = video->v4l2_input_status;
> + unsigned long flags;
> + u32 input_status;
>
> + spin_lock_irqsave(&video->lock, flags);
> + input_status = video->v4l2_input_status;
> aspeed_video_on(video);
>
> /* Exit early in case no clients remain */
> - if (test_bit(VIDEO_STOPPED, &video->flags))
> + if (test_bit(VIDEO_STOPPED, &video->flags)) {
> + spin_unlock_irqrestore(&video->lock, flags);
> goto done;
> + }
>
> aspeed_video_init_regs(video);
> -
> + spin_unlock_irqrestore(&video->lock, flags);
> aspeed_video_get_resolution(video);
>
> if (video->detected_timings.width != video->active_timings.width ||
>
^ permalink raw reply
* [PATCH v2 00/21] Convert hwmon documentation to ReST
From: Mauro Carvalho Chehab @ 2019-04-11 23:54 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190411210731.GA29378@roeck-us.net>
Em Thu, 11 Apr 2019 14:07:31 -0700
Guenter Roeck <linux@roeck-us.net> escreveu:
> On Thu, Apr 11, 2019 at 05:43:57PM -0300, Mauro Carvalho Chehab wrote:
> > Em Thu, 11 Apr 2019 12:43:24 -0600
> > Jonathan Corbet <corbet@lwn.net> escreveu:
> >
> > > On Wed, 10 Apr 2019 16:22:37 -0300
> > > Mauro Carvalho Chehab <mchehab+samsung@kernel.org> wrote:
> > >
> > > > This series converts the contents of Documentation/hwmon to ReST
> > > > format.
> > > >
> > > > PS.: I opted to group the conversion files per groups of maintainer
> > > > set, as, if I were to generate one patch per file, it would give around
> > > > 160 patches.
> > > >
> > > > I also added those patches to my development tree at:
> > > > https://git.linuxtv.org/mchehab/experimental.git/log/?h=hwmon
> > > >
> > > > If you want to see the results, they're at:
> > > > https://www.infradead.org/~mchehab/hwmon/
> > >
> > > This set seems generally good and could probably be applied as-is. But I
> > > have to ask...is there a reason to not take the last step and actually
> > > bring this stuff into the Sphinx doc tree?
> > >
> > > We seem to be mostly documenting sysfs files and such. I am *guessing*
> > > that perhaps the set should move to Documentation/admin-guide/hwmon? Or
> > > have I misunderstood the intended audience here?
> >
> > :-)
> >
> > Yeah, I'd say that 80% of the contents there are user-faced.
> >
> > Yet, the main issue with this (and other driver subsystems) is that there's
> > a mix of userspace and Kernelspace stuff. One somewhat simple case is
> > the abituguru: it has a "datasheet" file:
> >
> > abituguru-datasheet
> >
> > This contains programming information for the corresponding drivers,
> > while abituguru and abituguru3 contains mostly userspace
> > stuff (still, it also contains the I2C address, with shouldn't mean
> > anything for the user).
> >
> > However, if you take a look at w83781d, you'll see a mix of both
> > userspace and driver developer info there... it has a chapter called
> > "Data sheet updates", for example, with is probably meaningless for
> > anyone but the hwmon driver developers.
> >
> > That's, btw, a pattern that happens a lot inside device driver
> > documents on almost all subsystems I checked: driver-specific
> > documentation is usually not split into user-facing/kernel-facing.
> >
> > While nobody does such split, IMHO, the best would be to keep the
> > information outside Documentation/admin-guide. But hey! You're
> > the Doc maintainer. If you prefer to move, I'm perfectly fine
> > with that.
> >
>
> Same here, but please don't move the files which are kernel facing only.
>
> How do you want to handle this series ? Do you expect it to be pushed
> through hwmon, or through Documentation, or do you plan to push yourself ?
>
> If the series isn't pushed through hwmon, we'll likely have a couple of
> conflicts against hwmon-next.
Guenter,
I won't be pushing it myself. IMO, it makes more sense to apply it at
hwmon-next, except if it would cause some conflicts against docs-next.
Regards,
Mauro
^ permalink raw reply
* [PATCH v2 00/21] Convert hwmon documentation to ReST
From: Guenter Roeck @ 2019-04-11 21:07 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190411174357.251904f5@coco.lan>
On Thu, Apr 11, 2019 at 05:43:57PM -0300, Mauro Carvalho Chehab wrote:
> Em Thu, 11 Apr 2019 12:43:24 -0600
> Jonathan Corbet <corbet@lwn.net> escreveu:
>
> > On Wed, 10 Apr 2019 16:22:37 -0300
> > Mauro Carvalho Chehab <mchehab+samsung@kernel.org> wrote:
> >
> > > This series converts the contents of Documentation/hwmon to ReST
> > > format.
> > >
> > > PS.: I opted to group the conversion files per groups of maintainer
> > > set, as, if I were to generate one patch per file, it would give around
> > > 160 patches.
> > >
> > > I also added those patches to my development tree at:
> > > https://git.linuxtv.org/mchehab/experimental.git/log/?h=hwmon
> > >
> > > If you want to see the results, they're at:
> > > https://www.infradead.org/~mchehab/hwmon/
> >
> > This set seems generally good and could probably be applied as-is. But I
> > have to ask...is there a reason to not take the last step and actually
> > bring this stuff into the Sphinx doc tree?
> >
> > We seem to be mostly documenting sysfs files and such. I am *guessing*
> > that perhaps the set should move to Documentation/admin-guide/hwmon? Or
> > have I misunderstood the intended audience here?
>
> :-)
>
> Yeah, I'd say that 80% of the contents there are user-faced.
>
> Yet, the main issue with this (and other driver subsystems) is that there's
> a mix of userspace and Kernelspace stuff. One somewhat simple case is
> the abituguru: it has a "datasheet" file:
>
> abituguru-datasheet
>
> This contains programming information for the corresponding drivers,
> while abituguru and abituguru3 contains mostly userspace
> stuff (still, it also contains the I2C address, with shouldn't mean
> anything for the user).
>
> However, if you take a look at w83781d, you'll see a mix of both
> userspace and driver developer info there... it has a chapter called
> "Data sheet updates", for example, with is probably meaningless for
> anyone but the hwmon driver developers.
>
> That's, btw, a pattern that happens a lot inside device driver
> documents on almost all subsystems I checked: driver-specific
> documentation is usually not split into user-facing/kernel-facing.
>
> While nobody does such split, IMHO, the best would be to keep the
> information outside Documentation/admin-guide. But hey! You're
> the Doc maintainer. If you prefer to move, I'm perfectly fine
> with that.
>
Same here, but please don't move the files which are kernel facing only.
How do you want to handle this series ? Do you expect it to be pushed
through hwmon, or through Documentation, or do you plan to push yourself ?
If the series isn't pushed through hwmon, we'll likely have a couple of
conflicts against hwmon-next.
Thanks,
Guenter
^ permalink raw reply
* [PATCH v2 00/21] Convert hwmon documentation to ReST
From: Mauro Carvalho Chehab @ 2019-04-11 20:43 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190411124324.3ed62fad@lwn.net>
Em Thu, 11 Apr 2019 12:43:24 -0600
Jonathan Corbet <corbet@lwn.net> escreveu:
> On Wed, 10 Apr 2019 16:22:37 -0300
> Mauro Carvalho Chehab <mchehab+samsung@kernel.org> wrote:
>
> > This series converts the contents of Documentation/hwmon to ReST
> > format.
> >
> > PS.: I opted to group the conversion files per groups of maintainer
> > set, as, if I were to generate one patch per file, it would give around
> > 160 patches.
> >
> > I also added those patches to my development tree at:
> > https://git.linuxtv.org/mchehab/experimental.git/log/?h=hwmon
> >
> > If you want to see the results, they're at:
> > https://www.infradead.org/~mchehab/hwmon/
>
> This set seems generally good and could probably be applied as-is. But I
> have to ask...is there a reason to not take the last step and actually
> bring this stuff into the Sphinx doc tree?
>
> We seem to be mostly documenting sysfs files and such. I am *guessing*
> that perhaps the set should move to Documentation/admin-guide/hwmon? Or
> have I misunderstood the intended audience here?
:-)
Yeah, I'd say that 80% of the contents there are user-faced.
Yet, the main issue with this (and other driver subsystems) is that there's
a mix of userspace and Kernelspace stuff. One somewhat simple case is
the abituguru: it has a "datasheet" file:
abituguru-datasheet
This contains programming information for the corresponding drivers,
while abituguru and abituguru3 contains mostly userspace
stuff (still, it also contains the I2C address, with shouldn't mean
anything for the user).
However, if you take a look at w83781d, you'll see a mix of both
userspace and driver developer info there... it has a chapter called
"Data sheet updates", for example, with is probably meaningless for
anyone but the hwmon driver developers.
That's, btw, a pattern that happens a lot inside device driver
documents on almost all subsystems I checked: driver-specific
documentation is usually not split into user-facing/kernel-facing.
While nobody does such split, IMHO, the best would be to keep the
information outside Documentation/admin-guide. But hey! You're
the Doc maintainer. If you prefer to move, I'm perfectly fine
with that.
Thanks,
Mauro
^ permalink raw reply
* [PATCH v2 00/21] Convert hwmon documentation to ReST
From: Jonathan Corbet @ 2019-04-11 18:43 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <cover.1554923967.git.mchehab+samsung@kernel.org>
On Wed, 10 Apr 2019 16:22:37 -0300
Mauro Carvalho Chehab <mchehab+samsung@kernel.org> wrote:
> This series converts the contents of Documentation/hwmon to ReST
> format.
>
> PS.: I opted to group the conversion files per groups of maintainer
> set, as, if I were to generate one patch per file, it would give around
> 160 patches.
>
> I also added those patches to my development tree at:
> https://git.linuxtv.org/mchehab/experimental.git/log/?h=hwmon
>
> If you want to see the results, they're at:
> https://www.infradead.org/~mchehab/hwmon/
This set seems generally good and could probably be applied as-is. But I
have to ask...is there a reason to not take the last step and actually
bring this stuff into the Sphinx doc tree?
We seem to be mostly documenting sysfs files and such. I am *guessing*
that perhaps the set should move to Documentation/admin-guide/hwmon? Or
have I misunderstood the intended audience here?
Thanks,
jon
^ permalink raw reply
* [PATCH v2 21/21] docs: hwmon: Add an index file and rename docs to *.rst
From: Liviu Dudau @ 2019-04-11 13:07 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <6d80bfc14608f4bb5514b79721d30b486f50c987.1554923967.git.mchehab+samsung@kernel.org>
On Wed, Apr 10, 2019 at 04:22:58PM -0300, Mauro Carvalho Chehab wrote:
> Now that all files were converted to ReST format, rename them
> and add an index.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
> ---
> .../devicetree/bindings/hwmon/g762.txt | 2 +-
> Documentation/hwmon/{ab8500 => ab8500.rst} | 2 +-
> ...guru-datasheet => abituguru-datasheet.rst} | 0
> .../hwmon/{abituguru => abituguru.rst} | 0
> .../hwmon/{abituguru3 => abituguru3.rst} | 0
> Documentation/hwmon/{abx500 => abx500.rst} | 0
> ...{acpi_power_meter => acpi_power_meter.rst} | 2 +-
> Documentation/hwmon/{ad7314 => ad7314.rst} | 0
> .../hwmon/{adc128d818 => adc128d818.rst} | 0
> Documentation/hwmon/{adm1021 => adm1021.rst} | 0
> Documentation/hwmon/{adm1025 => adm1025.rst} | 0
> Documentation/hwmon/{adm1026 => adm1026.rst} | 0
> Documentation/hwmon/{adm1031 => adm1031.rst} | 0
> Documentation/hwmon/{adm1275 => adm1275.rst} | 4 +-
> Documentation/hwmon/{adm9240 => adm9240.rst} | 0
> Documentation/hwmon/{ads1015 => ads1015.rst} | 0
> Documentation/hwmon/{ads7828 => ads7828.rst} | 0
> Documentation/hwmon/{adt7410 => adt7410.rst} | 0
> Documentation/hwmon/{adt7411 => adt7411.rst} | 0
> Documentation/hwmon/{adt7462 => adt7462.rst} | 0
> Documentation/hwmon/{adt7470 => adt7470.rst} | 0
> Documentation/hwmon/{adt7475 => adt7475.rst} | 0
> Documentation/hwmon/{amc6821 => amc6821.rst} | 0
> Documentation/hwmon/{asb100 => asb100.rst} | 0
> Documentation/hwmon/{asc7621 => asc7621.rst} | 0
> ...{aspeed-pwm-tacho => aspeed-pwm-tacho.rst} | 0
> .../hwmon/{coretemp => coretemp.rst} | 0
> Documentation/hwmon/{da9052 => da9052.rst} | 0
> Documentation/hwmon/{da9055 => da9055.rst} | 0
> Documentation/hwmon/{dme1737 => dme1737.rst} | 0
> Documentation/hwmon/{ds1621 => ds1621.rst} | 0
> Documentation/hwmon/{ds620 => ds620.rst} | 0
> Documentation/hwmon/{emc1403 => emc1403.rst} | 0
> Documentation/hwmon/{emc2103 => emc2103.rst} | 0
> .../hwmon/{emc6w201 => emc6w201.rst} | 0
> Documentation/hwmon/{f71805f => f71805f.rst} | 0
> .../hwmon/{f71882fg => f71882fg.rst} | 0
> .../hwmon/{fam15h_power => fam15h_power.rst} | 0
> .../hwmon/{ftsteutates => ftsteutates.rst} | 0
> Documentation/hwmon/{g760a => g760a.rst} | 0
> Documentation/hwmon/{g762 => g762.rst} | 2 +-
> Documentation/hwmon/{gl518sm => gl518sm.rst} | 0
> Documentation/hwmon/{hih6130 => hih6130.rst} | 0
> ...on-kernel-api.txt => hwmon-kernel-api.rst} | 4 +-
> .../hwmon/{ibm-cffps => ibm-cffps.rst} | 0
> Documentation/hwmon/{ibmaem => ibmaem.rst} | 0
> .../hwmon/{ibmpowernv => ibmpowernv.rst} | 0
> Documentation/hwmon/{ina209 => ina209.rst} | 0
> Documentation/hwmon/{ina2xx => ina2xx.rst} | 2 +-
> Documentation/hwmon/{ina3221 => ina3221.rst} | 0
> Documentation/hwmon/index.rst | 179 ++++++++++++++++++
> Documentation/hwmon/{ir35221 => ir35221.rst} | 0
> Documentation/hwmon/{it87 => it87.rst} | 0
> Documentation/hwmon/{jc42 => jc42.rst} | 0
> Documentation/hwmon/{k10temp => k10temp.rst} | 0
> Documentation/hwmon/{k8temp => k8temp.rst} | 0
> .../hwmon/{lineage-pem => lineage-pem.rst} | 0
> Documentation/hwmon/{lm25066 => lm25066.rst} | 2 +-
> Documentation/hwmon/{lm63 => lm63.rst} | 0
> Documentation/hwmon/{lm70 => lm70.rst} | 0
> Documentation/hwmon/{lm73 => lm73.rst} | 0
> Documentation/hwmon/{lm75 => lm75.rst} | 0
> Documentation/hwmon/{lm77 => lm77.rst} | 0
> Documentation/hwmon/{lm78 => lm78.rst} | 0
> Documentation/hwmon/{lm80 => lm80.rst} | 0
> Documentation/hwmon/{lm83 => lm83.rst} | 0
> Documentation/hwmon/{lm85 => lm85.rst} | 0
> Documentation/hwmon/{lm87 => lm87.rst} | 0
> Documentation/hwmon/{lm90 => lm90.rst} | 0
> Documentation/hwmon/{lm92 => lm92.rst} | 0
> Documentation/hwmon/{lm93 => lm93.rst} | 0
> Documentation/hwmon/{lm95234 => lm95234.rst} | 0
> Documentation/hwmon/{lm95245 => lm95245.rst} | 0
> Documentation/hwmon/{ltc2945 => ltc2945.rst} | 0
> Documentation/hwmon/{ltc2978 => ltc2978.rst} | 0
> Documentation/hwmon/{ltc2990 => ltc2990.rst} | 0
> Documentation/hwmon/{ltc3815 => ltc3815.rst} | 0
> Documentation/hwmon/{ltc4151 => ltc4151.rst} | 0
> Documentation/hwmon/{ltc4215 => ltc4215.rst} | 0
> Documentation/hwmon/{ltc4245 => ltc4245.rst} | 0
> Documentation/hwmon/{ltc4260 => ltc4260.rst} | 0
> Documentation/hwmon/{ltc4261 => ltc4261.rst} | 0
> .../hwmon/{max16064 => max16064.rst} | 2 +-
> .../hwmon/{max16065 => max16065.rst} | 0
> Documentation/hwmon/{max1619 => max1619.rst} | 0
> Documentation/hwmon/{max1668 => max1668.rst} | 0
> Documentation/hwmon/{max197 => max197.rst} | 0
> .../hwmon/{max20751 => max20751.rst} | 2 +-
> .../hwmon/{max31722 => max31722.rst} | 0
> .../hwmon/{max31785 => max31785.rst} | 0
> .../hwmon/{max31790 => max31790.rst} | 0
> .../hwmon/{max34440 => max34440.rst} | 2 +-
> Documentation/hwmon/{max6639 => max6639.rst} | 0
> Documentation/hwmon/{max6642 => max6642.rst} | 0
> Documentation/hwmon/{max6650 => max6650.rst} | 0
> Documentation/hwmon/{max6697 => max6697.rst} | 0
> Documentation/hwmon/{max8688 => max8688.rst} | 2 +-
> .../hwmon/{mc13783-adc => mc13783-adc.rst} | 0
> Documentation/hwmon/{mcp3021 => mcp3021.rst} | 0
> .../hwmon/{menf21bmc => menf21bmc.rst} | 0
> .../hwmon/{mlxreg-fan => mlxreg-fan.rst} | 0
> Documentation/hwmon/{nct6683 => nct6683.rst} | 0
> Documentation/hwmon/{nct6775 => nct6775.rst} | 0
> Documentation/hwmon/{nct7802 => nct7802.rst} | 0
> Documentation/hwmon/{nct7904 => nct7904.rst} | 0
> .../{npcm750-pwm-fan => npcm750-pwm-fan.rst} | 0
> Documentation/hwmon/{nsa320 => nsa320.rst} | 0
> .../{ntc_thermistor => ntc_thermistor.rst} | 0
> Documentation/hwmon/{occ => occ.rst} | 0
> Documentation/hwmon/{pc87360 => pc87360.rst} | 0
> Documentation/hwmon/{pc87427 => pc87427.rst} | 0
> Documentation/hwmon/{pcf8591 => pcf8591.rst} | 0
> .../hwmon/{pmbus-core => pmbus-core.rst} | 0
> Documentation/hwmon/{pmbus => pmbus.rst} | 0
> .../hwmon/{powr1220 => powr1220.rst} | 0
> Documentation/hwmon/{pwm-fan => pwm-fan.rst} | 0
> ...aspberrypi-hwmon => raspberrypi-hwmon.rst} | 0
> Documentation/hwmon/{sch5627 => sch5627.rst} | 0
> Documentation/hwmon/{sch5636 => sch5636.rst} | 0
> .../hwmon/{scpi-hwmon => scpi-hwmon.rst} | 0
> Documentation/hwmon/{sht15 => sht15.rst} | 0
> Documentation/hwmon/{sht21 => sht21.rst} | 0
> Documentation/hwmon/{sht3x => sht3x.rst} | 0
> Documentation/hwmon/{shtc1 => shtc1.rst} | 0
> Documentation/hwmon/{sis5595 => sis5595.rst} | 0
> Documentation/hwmon/{smm665 => smm665.rst} | 0
> .../hwmon/{smsc47b397 => smsc47b397.rst} | 0
> .../hwmon/{smsc47m1 => smsc47m1.rst} | 0
> .../hwmon/{smsc47m192 => smsc47m192.rst} | 0
> ...mitting-patches => submitting-patches.rst} | 6 +-
> .../{sysfs-interface => sysfs-interface.rst} | 0
> Documentation/hwmon/{tc654 => tc654.rst} | 0
> Documentation/hwmon/{tc74 => tc74.rst} | 0
> Documentation/hwmon/{thmc50 => thmc50.rst} | 0
> Documentation/hwmon/{tmp102 => tmp102.rst} | 2 +-
> Documentation/hwmon/{tmp103 => tmp103.rst} | 2 +-
> Documentation/hwmon/{tmp108 => tmp108.rst} | 2 +-
> Documentation/hwmon/{tmp401 => tmp401.rst} | 2 +-
> Documentation/hwmon/{tmp421 => tmp421.rst} | 0
> .../hwmon/{tps40422 => tps40422.rst} | 2 +-
> ...4030-madc-hwmon => twl4030-madc-hwmon.rst} | 0
> Documentation/hwmon/{ucd9000 => ucd9000.rst} | 4 +-
> Documentation/hwmon/{ucd9200 => ucd9200.rst} | 4 +-
> .../{userspace-tools => userspace-tools.rst} | 0
> .../hwmon/{vexpress => vexpress.rst} | 0
> Documentation/hwmon/{via686a => via686a.rst} | 0
> Documentation/hwmon/{vt1211 => vt1211.rst} | 0
> .../hwmon/{w83627ehf => w83627ehf.rst} | 0
> .../hwmon/{w83627hf => w83627hf.rst} | 0
> Documentation/hwmon/{w83773g => w83773g.rst} | 0
> Documentation/hwmon/{w83781d => w83781d.rst} | 0
> Documentation/hwmon/{w83791d => w83791d.rst} | 2 +-
> Documentation/hwmon/{w83792d => w83792d.rst} | 0
> Documentation/hwmon/{w83793 => w83793.rst} | 0
> Documentation/hwmon/{w83795 => w83795.rst} | 0
> .../hwmon/{w83l785ts => w83l785ts.rst} | 0
> .../hwmon/{w83l786ng => w83l786ng.rst} | 0
> Documentation/hwmon/{wm831x => wm831x.rst} | 0
> Documentation/hwmon/{wm8350 => wm8350.rst} | 0
> .../hwmon/{xgene-hwmon => xgene-hwmon.rst} | 0
> Documentation/hwmon/{zl6100 => zl6100.rst} | 2 +-
> Documentation/index.rst | 1 +
> Documentation/thermal/sysfs-api.txt | 2 +-
> MAINTAINERS | 108 +++++------
> drivers/hwmon/Kconfig | 8 +-
> drivers/hwmon/ads7828.c | 2 +-
> drivers/hwmon/max197.c | 2 +-
> drivers/hwmon/sht15.c | 2 +-
> include/linux/platform_data/ads7828.h | 2 +-
> include/linux/platform_data/ds620.h | 2 +-
> include/linux/platform_data/ina2xx.h | 2 +-
> include/linux/platform_data/max197.h | 2 +-
> include/linux/platform_data/ntc_thermistor.h | 2 +-
> 173 files changed, 275 insertions(+), 95 deletions(-)
> rename Documentation/hwmon/{ab8500 => ab8500.rst} (86%)
> rename Documentation/hwmon/{abituguru-datasheet => abituguru-datasheet.rst} (100%)
> rename Documentation/hwmon/{abituguru => abituguru.rst} (100%)
> rename Documentation/hwmon/{abituguru3 => abituguru3.rst} (100%)
> rename Documentation/hwmon/{abx500 => abx500.rst} (100%)
> rename Documentation/hwmon/{acpi_power_meter => acpi_power_meter.rst} (97%)
> rename Documentation/hwmon/{ad7314 => ad7314.rst} (100%)
> rename Documentation/hwmon/{adc128d818 => adc128d818.rst} (100%)
> rename Documentation/hwmon/{adm1021 => adm1021.rst} (100%)
> rename Documentation/hwmon/{adm1025 => adm1025.rst} (100%)
> rename Documentation/hwmon/{adm1026 => adm1026.rst} (100%)
> rename Documentation/hwmon/{adm1031 => adm1031.rst} (100%)
> rename Documentation/hwmon/{adm1275 => adm1275.rst} (97%)
> rename Documentation/hwmon/{adm9240 => adm9240.rst} (100%)
> rename Documentation/hwmon/{ads1015 => ads1015.rst} (100%)
> rename Documentation/hwmon/{ads7828 => ads7828.rst} (100%)
> rename Documentation/hwmon/{adt7410 => adt7410.rst} (100%)
> rename Documentation/hwmon/{adt7411 => adt7411.rst} (100%)
> rename Documentation/hwmon/{adt7462 => adt7462.rst} (100%)
> rename Documentation/hwmon/{adt7470 => adt7470.rst} (100%)
> rename Documentation/hwmon/{adt7475 => adt7475.rst} (100%)
> rename Documentation/hwmon/{amc6821 => amc6821.rst} (100%)
> rename Documentation/hwmon/{asb100 => asb100.rst} (100%)
> rename Documentation/hwmon/{asc7621 => asc7621.rst} (100%)
> rename Documentation/hwmon/{aspeed-pwm-tacho => aspeed-pwm-tacho.rst} (100%)
> rename Documentation/hwmon/{coretemp => coretemp.rst} (100%)
> rename Documentation/hwmon/{da9052 => da9052.rst} (100%)
> rename Documentation/hwmon/{da9055 => da9055.rst} (100%)
> rename Documentation/hwmon/{dme1737 => dme1737.rst} (100%)
> rename Documentation/hwmon/{ds1621 => ds1621.rst} (100%)
> rename Documentation/hwmon/{ds620 => ds620.rst} (100%)
> rename Documentation/hwmon/{emc1403 => emc1403.rst} (100%)
> rename Documentation/hwmon/{emc2103 => emc2103.rst} (100%)
> rename Documentation/hwmon/{emc6w201 => emc6w201.rst} (100%)
> rename Documentation/hwmon/{f71805f => f71805f.rst} (100%)
> rename Documentation/hwmon/{f71882fg => f71882fg.rst} (100%)
> rename Documentation/hwmon/{fam15h_power => fam15h_power.rst} (100%)
> rename Documentation/hwmon/{ftsteutates => ftsteutates.rst} (100%)
> rename Documentation/hwmon/{g760a => g760a.rst} (100%)
> rename Documentation/hwmon/{g762 => g762.rst} (97%)
> rename Documentation/hwmon/{gl518sm => gl518sm.rst} (100%)
> rename Documentation/hwmon/{hih6130 => hih6130.rst} (100%)
> rename Documentation/hwmon/{hwmon-kernel-api.txt => hwmon-kernel-api.rst} (99%)
> rename Documentation/hwmon/{ibm-cffps => ibm-cffps.rst} (100%)
> rename Documentation/hwmon/{ibmaem => ibmaem.rst} (100%)
> rename Documentation/hwmon/{ibmpowernv => ibmpowernv.rst} (100%)
> rename Documentation/hwmon/{ina209 => ina209.rst} (100%)
> rename Documentation/hwmon/{ina2xx => ina2xx.rst} (97%)
> rename Documentation/hwmon/{ina3221 => ina3221.rst} (100%)
> create mode 100644 Documentation/hwmon/index.rst
> rename Documentation/hwmon/{ir35221 => ir35221.rst} (100%)
> rename Documentation/hwmon/{it87 => it87.rst} (100%)
> rename Documentation/hwmon/{jc42 => jc42.rst} (100%)
> rename Documentation/hwmon/{k10temp => k10temp.rst} (100%)
> rename Documentation/hwmon/{k8temp => k8temp.rst} (100%)
> rename Documentation/hwmon/{lineage-pem => lineage-pem.rst} (100%)
> rename Documentation/hwmon/{lm25066 => lm25066.rst} (97%)
> rename Documentation/hwmon/{lm63 => lm63.rst} (100%)
> rename Documentation/hwmon/{lm70 => lm70.rst} (100%)
> rename Documentation/hwmon/{lm73 => lm73.rst} (100%)
> rename Documentation/hwmon/{lm75 => lm75.rst} (100%)
> rename Documentation/hwmon/{lm77 => lm77.rst} (100%)
> rename Documentation/hwmon/{lm78 => lm78.rst} (100%)
> rename Documentation/hwmon/{lm80 => lm80.rst} (100%)
> rename Documentation/hwmon/{lm83 => lm83.rst} (100%)
> rename Documentation/hwmon/{lm85 => lm85.rst} (100%)
> rename Documentation/hwmon/{lm87 => lm87.rst} (100%)
> rename Documentation/hwmon/{lm90 => lm90.rst} (100%)
> rename Documentation/hwmon/{lm92 => lm92.rst} (100%)
> rename Documentation/hwmon/{lm93 => lm93.rst} (100%)
> rename Documentation/hwmon/{lm95234 => lm95234.rst} (100%)
> rename Documentation/hwmon/{lm95245 => lm95245.rst} (100%)
> rename Documentation/hwmon/{ltc2945 => ltc2945.rst} (100%)
> rename Documentation/hwmon/{ltc2978 => ltc2978.rst} (100%)
> rename Documentation/hwmon/{ltc2990 => ltc2990.rst} (100%)
> rename Documentation/hwmon/{ltc3815 => ltc3815.rst} (100%)
> rename Documentation/hwmon/{ltc4151 => ltc4151.rst} (100%)
> rename Documentation/hwmon/{ltc4215 => ltc4215.rst} (100%)
> rename Documentation/hwmon/{ltc4245 => ltc4245.rst} (100%)
> rename Documentation/hwmon/{ltc4260 => ltc4260.rst} (100%)
> rename Documentation/hwmon/{ltc4261 => ltc4261.rst} (100%)
> rename Documentation/hwmon/{max16064 => max16064.rst} (96%)
> rename Documentation/hwmon/{max16065 => max16065.rst} (100%)
> rename Documentation/hwmon/{max1619 => max1619.rst} (100%)
> rename Documentation/hwmon/{max1668 => max1668.rst} (100%)
> rename Documentation/hwmon/{max197 => max197.rst} (100%)
> rename Documentation/hwmon/{max20751 => max20751.rst} (96%)
> rename Documentation/hwmon/{max31722 => max31722.rst} (100%)
> rename Documentation/hwmon/{max31785 => max31785.rst} (100%)
> rename Documentation/hwmon/{max31790 => max31790.rst} (100%)
> rename Documentation/hwmon/{max34440 => max34440.rst} (98%)
> rename Documentation/hwmon/{max6639 => max6639.rst} (100%)
> rename Documentation/hwmon/{max6642 => max6642.rst} (100%)
> rename Documentation/hwmon/{max6650 => max6650.rst} (100%)
> rename Documentation/hwmon/{max6697 => max6697.rst} (100%)
> rename Documentation/hwmon/{max8688 => max8688.rst} (97%)
> rename Documentation/hwmon/{mc13783-adc => mc13783-adc.rst} (100%)
> rename Documentation/hwmon/{mcp3021 => mcp3021.rst} (100%)
> rename Documentation/hwmon/{menf21bmc => menf21bmc.rst} (100%)
> rename Documentation/hwmon/{mlxreg-fan => mlxreg-fan.rst} (100%)
> rename Documentation/hwmon/{nct6683 => nct6683.rst} (100%)
> rename Documentation/hwmon/{nct6775 => nct6775.rst} (100%)
> rename Documentation/hwmon/{nct7802 => nct7802.rst} (100%)
> rename Documentation/hwmon/{nct7904 => nct7904.rst} (100%)
> rename Documentation/hwmon/{npcm750-pwm-fan => npcm750-pwm-fan.rst} (100%)
> rename Documentation/hwmon/{nsa320 => nsa320.rst} (100%)
> rename Documentation/hwmon/{ntc_thermistor => ntc_thermistor.rst} (100%)
> rename Documentation/hwmon/{occ => occ.rst} (100%)
> rename Documentation/hwmon/{pc87360 => pc87360.rst} (100%)
> rename Documentation/hwmon/{pc87427 => pc87427.rst} (100%)
> rename Documentation/hwmon/{pcf8591 => pcf8591.rst} (100%)
> rename Documentation/hwmon/{pmbus-core => pmbus-core.rst} (100%)
> rename Documentation/hwmon/{pmbus => pmbus.rst} (100%)
> rename Documentation/hwmon/{powr1220 => powr1220.rst} (100%)
> rename Documentation/hwmon/{pwm-fan => pwm-fan.rst} (100%)
> rename Documentation/hwmon/{raspberrypi-hwmon => raspberrypi-hwmon.rst} (100%)
> rename Documentation/hwmon/{sch5627 => sch5627.rst} (100%)
> rename Documentation/hwmon/{sch5636 => sch5636.rst} (100%)
> rename Documentation/hwmon/{scpi-hwmon => scpi-hwmon.rst} (100%)
> rename Documentation/hwmon/{sht15 => sht15.rst} (100%)
> rename Documentation/hwmon/{sht21 => sht21.rst} (100%)
> rename Documentation/hwmon/{sht3x => sht3x.rst} (100%)
> rename Documentation/hwmon/{shtc1 => shtc1.rst} (100%)
> rename Documentation/hwmon/{sis5595 => sis5595.rst} (100%)
> rename Documentation/hwmon/{smm665 => smm665.rst} (100%)
> rename Documentation/hwmon/{smsc47b397 => smsc47b397.rst} (100%)
> rename Documentation/hwmon/{smsc47m1 => smsc47m1.rst} (100%)
> rename Documentation/hwmon/{smsc47m192 => smsc47m192.rst} (100%)
> rename Documentation/hwmon/{submitting-patches => submitting-patches.rst} (98%)
> rename Documentation/hwmon/{sysfs-interface => sysfs-interface.rst} (100%)
> rename Documentation/hwmon/{tc654 => tc654.rst} (100%)
> rename Documentation/hwmon/{tc74 => tc74.rst} (100%)
> rename Documentation/hwmon/{thmc50 => thmc50.rst} (100%)
> rename Documentation/hwmon/{tmp102 => tmp102.rst} (93%)
> rename Documentation/hwmon/{tmp103 => tmp103.rst} (92%)
> rename Documentation/hwmon/{tmp108 => tmp108.rst} (95%)
> rename Documentation/hwmon/{tmp401 => tmp401.rst} (97%)
> rename Documentation/hwmon/{tmp421 => tmp421.rst} (100%)
> rename Documentation/hwmon/{tps40422 => tps40422.rst} (96%)
> rename Documentation/hwmon/{twl4030-madc-hwmon => twl4030-madc-hwmon.rst} (100%)
> rename Documentation/hwmon/{ucd9000 => ucd9000.rst} (97%)
> rename Documentation/hwmon/{ucd9200 => ucd9200.rst} (97%)
> rename Documentation/hwmon/{userspace-tools => userspace-tools.rst} (100%)
> rename Documentation/hwmon/{vexpress => vexpress.rst} (100%)
For the vexpress part:
Acked-by: Liviu Dudau <liviu.dudau@arm.com>
Best regards,
Liviu
> rename Documentation/hwmon/{via686a => via686a.rst} (100%)
> rename Documentation/hwmon/{vt1211 => vt1211.rst} (100%)
> rename Documentation/hwmon/{w83627ehf => w83627ehf.rst} (100%)
> rename Documentation/hwmon/{w83627hf => w83627hf.rst} (100%)
> rename Documentation/hwmon/{w83773g => w83773g.rst} (100%)
> rename Documentation/hwmon/{w83781d => w83781d.rst} (100%)
> rename Documentation/hwmon/{w83791d => w83791d.rst} (99%)
> rename Documentation/hwmon/{w83792d => w83792d.rst} (100%)
> rename Documentation/hwmon/{w83793 => w83793.rst} (100%)
> rename Documentation/hwmon/{w83795 => w83795.rst} (100%)
> rename Documentation/hwmon/{w83l785ts => w83l785ts.rst} (100%)
> rename Documentation/hwmon/{w83l786ng => w83l786ng.rst} (100%)
> rename Documentation/hwmon/{wm831x => wm831x.rst} (100%)
> rename Documentation/hwmon/{wm8350 => wm8350.rst} (100%)
> rename Documentation/hwmon/{xgene-hwmon => xgene-hwmon.rst} (100%)
> rename Documentation/hwmon/{zl6100 => zl6100.rst} (98%)
>
> diff --git a/Documentation/devicetree/bindings/hwmon/g762.txt b/Documentation/devicetree/bindings/hwmon/g762.txt
> index 25cc6d8ee575..6d154c4923de 100644
> --- a/Documentation/devicetree/bindings/hwmon/g762.txt
> +++ b/Documentation/devicetree/bindings/hwmon/g762.txt
> @@ -21,7 +21,7 @@ If an optional property is not set in .dts file, then current value is kept
> unmodified (e.g. u-boot installed value).
>
> Additional information on operational parameters for the device is available
> -in Documentation/hwmon/g762. A detailed datasheet for the device is available
> +in Documentation/hwmon/g762.rst. A detailed datasheet for the device is available
> at http://natisbad.org/NAS/refs/GMT_EDS-762_763-080710-0.2.pdf.
>
> Example g762 node:
> diff --git a/Documentation/hwmon/ab8500 b/Documentation/hwmon/ab8500.rst
> similarity index 86%
> rename from Documentation/hwmon/ab8500
> rename to Documentation/hwmon/ab8500.rst
> index d87c61151239..33f93a9cec04 100644
> --- a/Documentation/hwmon/ab8500
> +++ b/Documentation/hwmon/ab8500.rst
> @@ -18,7 +18,7 @@ Authors:
> Description
> -----------
>
> -See also Documentation/hwmon/abx500. This is the ST-Ericsson AB8500 specific
> +See also Documentation/hwmon/abx500.rst. This is the ST-Ericsson AB8500 specific
> driver.
>
> Currently only the AB8500 internal sensor and one external sensor for battery
> diff --git a/Documentation/hwmon/abituguru-datasheet b/Documentation/hwmon/abituguru-datasheet.rst
> similarity index 100%
> rename from Documentation/hwmon/abituguru-datasheet
> rename to Documentation/hwmon/abituguru-datasheet.rst
> diff --git a/Documentation/hwmon/abituguru b/Documentation/hwmon/abituguru.rst
> similarity index 100%
> rename from Documentation/hwmon/abituguru
> rename to Documentation/hwmon/abituguru.rst
> diff --git a/Documentation/hwmon/abituguru3 b/Documentation/hwmon/abituguru3.rst
> similarity index 100%
> rename from Documentation/hwmon/abituguru3
> rename to Documentation/hwmon/abituguru3.rst
> diff --git a/Documentation/hwmon/abx500 b/Documentation/hwmon/abx500.rst
> similarity index 100%
> rename from Documentation/hwmon/abx500
> rename to Documentation/hwmon/abx500.rst
> diff --git a/Documentation/hwmon/acpi_power_meter b/Documentation/hwmon/acpi_power_meter.rst
> similarity index 97%
> rename from Documentation/hwmon/acpi_power_meter
> rename to Documentation/hwmon/acpi_power_meter.rst
> index 7665ca6ba957..4a0941ade0ca 100644
> --- a/Documentation/hwmon/acpi_power_meter
> +++ b/Documentation/hwmon/acpi_power_meter.rst
> @@ -21,7 +21,7 @@ the ACPI 4.0 spec (Chapter 10.4). These devices have a simple set of
> features--a power meter that returns average power use over a configurable
> interval, an optional capping mechanism, and a couple of trip points. The
> sysfs interface conforms with the specification outlined in the "Power" section
> -of Documentation/hwmon/sysfs-interface.
> +of Documentation/hwmon/sysfs-interface.rst.
>
> Special Features
> ----------------
> diff --git a/Documentation/hwmon/ad7314 b/Documentation/hwmon/ad7314.rst
> similarity index 100%
> rename from Documentation/hwmon/ad7314
> rename to Documentation/hwmon/ad7314.rst
> diff --git a/Documentation/hwmon/adc128d818 b/Documentation/hwmon/adc128d818.rst
> similarity index 100%
> rename from Documentation/hwmon/adc128d818
> rename to Documentation/hwmon/adc128d818.rst
> diff --git a/Documentation/hwmon/adm1021 b/Documentation/hwmon/adm1021.rst
> similarity index 100%
> rename from Documentation/hwmon/adm1021
> rename to Documentation/hwmon/adm1021.rst
> diff --git a/Documentation/hwmon/adm1025 b/Documentation/hwmon/adm1025.rst
> similarity index 100%
> rename from Documentation/hwmon/adm1025
> rename to Documentation/hwmon/adm1025.rst
> diff --git a/Documentation/hwmon/adm1026 b/Documentation/hwmon/adm1026.rst
> similarity index 100%
> rename from Documentation/hwmon/adm1026
> rename to Documentation/hwmon/adm1026.rst
> diff --git a/Documentation/hwmon/adm1031 b/Documentation/hwmon/adm1031.rst
> similarity index 100%
> rename from Documentation/hwmon/adm1031
> rename to Documentation/hwmon/adm1031.rst
> diff --git a/Documentation/hwmon/adm1275 b/Documentation/hwmon/adm1275.rst
> similarity index 97%
> rename from Documentation/hwmon/adm1275
> rename to Documentation/hwmon/adm1275.rst
> index 5c5860011d6e..9a1913e5b4d9 100644
> --- a/Documentation/hwmon/adm1275
> +++ b/Documentation/hwmon/adm1275.rst
> @@ -68,7 +68,7 @@ integrated 12 bit analog-to-digital converter (ADC), accessed using a
> PMBus interface.
>
> The driver is a client driver to the core PMBus driver. Please see
> -Documentation/hwmon/pmbus for details on PMBus client drivers.
> +Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
>
>
> Usage Notes
> @@ -90,7 +90,7 @@ Platform data support
> ---------------------
>
> The driver supports standard PMBus driver platform data. Please see
> -Documentation/hwmon/pmbus for details.
> +Documentation/hwmon/pmbus.rst for details.
>
>
> Sysfs entries
> diff --git a/Documentation/hwmon/adm9240 b/Documentation/hwmon/adm9240.rst
> similarity index 100%
> rename from Documentation/hwmon/adm9240
> rename to Documentation/hwmon/adm9240.rst
> diff --git a/Documentation/hwmon/ads1015 b/Documentation/hwmon/ads1015.rst
> similarity index 100%
> rename from Documentation/hwmon/ads1015
> rename to Documentation/hwmon/ads1015.rst
> diff --git a/Documentation/hwmon/ads7828 b/Documentation/hwmon/ads7828.rst
> similarity index 100%
> rename from Documentation/hwmon/ads7828
> rename to Documentation/hwmon/ads7828.rst
> diff --git a/Documentation/hwmon/adt7410 b/Documentation/hwmon/adt7410.rst
> similarity index 100%
> rename from Documentation/hwmon/adt7410
> rename to Documentation/hwmon/adt7410.rst
> diff --git a/Documentation/hwmon/adt7411 b/Documentation/hwmon/adt7411.rst
> similarity index 100%
> rename from Documentation/hwmon/adt7411
> rename to Documentation/hwmon/adt7411.rst
> diff --git a/Documentation/hwmon/adt7462 b/Documentation/hwmon/adt7462.rst
> similarity index 100%
> rename from Documentation/hwmon/adt7462
> rename to Documentation/hwmon/adt7462.rst
> diff --git a/Documentation/hwmon/adt7470 b/Documentation/hwmon/adt7470.rst
> similarity index 100%
> rename from Documentation/hwmon/adt7470
> rename to Documentation/hwmon/adt7470.rst
> diff --git a/Documentation/hwmon/adt7475 b/Documentation/hwmon/adt7475.rst
> similarity index 100%
> rename from Documentation/hwmon/adt7475
> rename to Documentation/hwmon/adt7475.rst
> diff --git a/Documentation/hwmon/amc6821 b/Documentation/hwmon/amc6821.rst
> similarity index 100%
> rename from Documentation/hwmon/amc6821
> rename to Documentation/hwmon/amc6821.rst
> diff --git a/Documentation/hwmon/asb100 b/Documentation/hwmon/asb100.rst
> similarity index 100%
> rename from Documentation/hwmon/asb100
> rename to Documentation/hwmon/asb100.rst
> diff --git a/Documentation/hwmon/asc7621 b/Documentation/hwmon/asc7621.rst
> similarity index 100%
> rename from Documentation/hwmon/asc7621
> rename to Documentation/hwmon/asc7621.rst
> diff --git a/Documentation/hwmon/aspeed-pwm-tacho b/Documentation/hwmon/aspeed-pwm-tacho.rst
> similarity index 100%
> rename from Documentation/hwmon/aspeed-pwm-tacho
> rename to Documentation/hwmon/aspeed-pwm-tacho.rst
> diff --git a/Documentation/hwmon/coretemp b/Documentation/hwmon/coretemp.rst
> similarity index 100%
> rename from Documentation/hwmon/coretemp
> rename to Documentation/hwmon/coretemp.rst
> diff --git a/Documentation/hwmon/da9052 b/Documentation/hwmon/da9052.rst
> similarity index 100%
> rename from Documentation/hwmon/da9052
> rename to Documentation/hwmon/da9052.rst
> diff --git a/Documentation/hwmon/da9055 b/Documentation/hwmon/da9055.rst
> similarity index 100%
> rename from Documentation/hwmon/da9055
> rename to Documentation/hwmon/da9055.rst
> diff --git a/Documentation/hwmon/dme1737 b/Documentation/hwmon/dme1737.rst
> similarity index 100%
> rename from Documentation/hwmon/dme1737
> rename to Documentation/hwmon/dme1737.rst
> diff --git a/Documentation/hwmon/ds1621 b/Documentation/hwmon/ds1621.rst
> similarity index 100%
> rename from Documentation/hwmon/ds1621
> rename to Documentation/hwmon/ds1621.rst
> diff --git a/Documentation/hwmon/ds620 b/Documentation/hwmon/ds620.rst
> similarity index 100%
> rename from Documentation/hwmon/ds620
> rename to Documentation/hwmon/ds620.rst
> diff --git a/Documentation/hwmon/emc1403 b/Documentation/hwmon/emc1403.rst
> similarity index 100%
> rename from Documentation/hwmon/emc1403
> rename to Documentation/hwmon/emc1403.rst
> diff --git a/Documentation/hwmon/emc2103 b/Documentation/hwmon/emc2103.rst
> similarity index 100%
> rename from Documentation/hwmon/emc2103
> rename to Documentation/hwmon/emc2103.rst
> diff --git a/Documentation/hwmon/emc6w201 b/Documentation/hwmon/emc6w201.rst
> similarity index 100%
> rename from Documentation/hwmon/emc6w201
> rename to Documentation/hwmon/emc6w201.rst
> diff --git a/Documentation/hwmon/f71805f b/Documentation/hwmon/f71805f.rst
> similarity index 100%
> rename from Documentation/hwmon/f71805f
> rename to Documentation/hwmon/f71805f.rst
> diff --git a/Documentation/hwmon/f71882fg b/Documentation/hwmon/f71882fg.rst
> similarity index 100%
> rename from Documentation/hwmon/f71882fg
> rename to Documentation/hwmon/f71882fg.rst
> diff --git a/Documentation/hwmon/fam15h_power b/Documentation/hwmon/fam15h_power.rst
> similarity index 100%
> rename from Documentation/hwmon/fam15h_power
> rename to Documentation/hwmon/fam15h_power.rst
> diff --git a/Documentation/hwmon/ftsteutates b/Documentation/hwmon/ftsteutates.rst
> similarity index 100%
> rename from Documentation/hwmon/ftsteutates
> rename to Documentation/hwmon/ftsteutates.rst
> diff --git a/Documentation/hwmon/g760a b/Documentation/hwmon/g760a.rst
> similarity index 100%
> rename from Documentation/hwmon/g760a
> rename to Documentation/hwmon/g760a.rst
> diff --git a/Documentation/hwmon/g762 b/Documentation/hwmon/g762.rst
> similarity index 97%
> rename from Documentation/hwmon/g762
> rename to Documentation/hwmon/g762.rst
> index 54574e26df21..0371b3365c48 100644
> --- a/Documentation/hwmon/g762
> +++ b/Documentation/hwmon/g762.rst
> @@ -7,7 +7,7 @@ modes - PWM or DC - are supported by the device.
>
> For additional information, a detailed datasheet is available at
> http://natisbad.org/NAS/ref/GMT_EDS-762_763-080710-0.2.pdf. sysfs
> -bindings are described in Documentation/hwmon/sysfs-interface.
> +bindings are described in Documentation/hwmon/sysfs-interface.rst.
>
> The following entries are available to the user in a subdirectory of
> /sys/bus/i2c/drivers/g762/ to control the operation of the device.
> diff --git a/Documentation/hwmon/gl518sm b/Documentation/hwmon/gl518sm.rst
> similarity index 100%
> rename from Documentation/hwmon/gl518sm
> rename to Documentation/hwmon/gl518sm.rst
> diff --git a/Documentation/hwmon/hih6130 b/Documentation/hwmon/hih6130.rst
> similarity index 100%
> rename from Documentation/hwmon/hih6130
> rename to Documentation/hwmon/hih6130.rst
> diff --git a/Documentation/hwmon/hwmon-kernel-api.txt b/Documentation/hwmon/hwmon-kernel-api.rst
> similarity index 99%
> rename from Documentation/hwmon/hwmon-kernel-api.txt
> rename to Documentation/hwmon/hwmon-kernel-api.rst
> index b56343f5c2c4..5766bee64153 100644
> --- a/Documentation/hwmon/hwmon-kernel-api.txt
> +++ b/Documentation/hwmon/hwmon-kernel-api.rst
> @@ -12,10 +12,10 @@ drivers that want to use the hardware monitoring framework.
> This document does not describe what a hardware monitoring (hwmon) Driver or
> Device is. It also does not describe the API which can be used by user space
> to communicate with a hardware monitoring device. If you want to know this
> -then please read the following file: Documentation/hwmon/sysfs-interface.
> +then please read the following file: Documentation/hwmon/sysfs-interface.rst.
>
> For additional guidelines on how to write and improve hwmon drivers, please
> -also read Documentation/hwmon/submitting-patches.
> +also read Documentation/hwmon/submitting-patches.rst.
>
> The API
> -------
> diff --git a/Documentation/hwmon/ibm-cffps b/Documentation/hwmon/ibm-cffps.rst
> similarity index 100%
> rename from Documentation/hwmon/ibm-cffps
> rename to Documentation/hwmon/ibm-cffps.rst
> diff --git a/Documentation/hwmon/ibmaem b/Documentation/hwmon/ibmaem.rst
> similarity index 100%
> rename from Documentation/hwmon/ibmaem
> rename to Documentation/hwmon/ibmaem.rst
> diff --git a/Documentation/hwmon/ibmpowernv b/Documentation/hwmon/ibmpowernv.rst
> similarity index 100%
> rename from Documentation/hwmon/ibmpowernv
> rename to Documentation/hwmon/ibmpowernv.rst
> diff --git a/Documentation/hwmon/ina209 b/Documentation/hwmon/ina209.rst
> similarity index 100%
> rename from Documentation/hwmon/ina209
> rename to Documentation/hwmon/ina209.rst
> diff --git a/Documentation/hwmon/ina2xx b/Documentation/hwmon/ina2xx.rst
> similarity index 97%
> rename from Documentation/hwmon/ina2xx
> rename to Documentation/hwmon/ina2xx.rst
> index 95badf9c396f..94b9a260c518 100644
> --- a/Documentation/hwmon/ina2xx
> +++ b/Documentation/hwmon/ina2xx.rst
> @@ -78,7 +78,7 @@ refer to the Documentation/devicetree/bindings/hwmon/ina2xx.txt for bindings
> if the device tree is used.
>
> Additionally ina226 supports update_interval attribute as described in
> -Documentation/hwmon/sysfs-interface. Internally the interval is the sum of
> +Documentation/hwmon/sysfs-interface.rst. Internally the interval is the sum of
> bus and shunt voltage conversion times multiplied by the averaging rate. We
> don't touch the conversion times and only modify the number of averages. The
> lower limit of the update_interval is 2 ms, the upper limit is 2253 ms.
> diff --git a/Documentation/hwmon/ina3221 b/Documentation/hwmon/ina3221.rst
> similarity index 100%
> rename from Documentation/hwmon/ina3221
> rename to Documentation/hwmon/ina3221.rst
> diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst
> new file mode 100644
> index 000000000000..893804414510
> --- /dev/null
> +++ b/Documentation/hwmon/index.rst
> @@ -0,0 +1,179 @@
> +=========================
> +Linux Hardware Monitoring
> +=========================
> +
> +.. toctree::
> + :maxdepth: 1
> +
> + hwmon-kernel-api.rst
> + pmbus-core.rst
> + submitting-patches.rst
> + sysfs-interface.rst
> + userspace-tools.rst
> +
> +Hardware Monitoring Kernel Drivers
> +==================================
> +
> +.. toctree::
> + :maxdepth: 1
> +
> + ab8500.rst
> + abituguru.rst
> + abituguru3.rst
> + abx500.rst
> + acpi_power_meter.rst
> + ad7314.rst
> + adc128d818.rst
> + adm1021.rst
> + adm1025.rst
> + adm1026.rst
> + adm1031.rst
> + adm1275.rst
> + adm9240.rst
> + ads1015.rst
> + ads7828.rst
> + adt7410.rst
> + adt7411.rst
> + adt7462.rst
> + adt7470.rst
> + adt7475.rst
> + amc6821.rst
> + asb100.rst
> + asc7621.rst
> + aspeed-pwm-tacho.rst
> + coretemp.rst
> + da9052.rst
> + da9055.rst
> + dme1737.rst
> + ds1621.rst
> + ds620.rst
> + emc1403.rst
> + emc2103.rst
> + emc6w201.rst
> + f71805f.rst
> + f71882fg.rst
> + fam15h_power.rst
> + ftsteutates.rst
> + g760a.rst
> + g762.rst
> + gl518sm.rst
> + hih6130.rst
> + ibmaem.rst
> + ibm-cffps.rst
> + ibmpowernv.rst
> + ina209.rst
> + ina2xx.rst
> + ina3221.rst
> + ir35221.rst
> + it87.rst
> + jc42.rst
> + k10temp.rst
> + k8temp.rst
> + lineage-pem.rst
> + lm25066.rst
> + lm63.rst
> + lm70.rst
> + lm73.rst
> + lm75.rst
> + lm77.rst
> + lm78.rst
> + lm80.rst
> + lm83.rst
> + lm85.rst
> + lm87.rst
> + lm90.rst
> + lm92.rst
> + lm93.rst
> + lm95234.rst
> + lm95245.rst
> + ltc2945.rst
> + ltc2978.rst
> + ltc2990.rst
> + ltc3815.rst
> + ltc4151.rst
> + ltc4215.rst
> + ltc4245.rst
> + ltc4260.rst
> + ltc4261.rst
> + max16064.rst
> + max16065.rst
> + max1619.rst
> + max1668.rst
> + max197.rst
> + max20751.rst
> + max31722.rst
> + max31785.rst
> + max31790.rst
> + max34440.rst
> + max6639.rst
> + max6642.rst
> + max6650.rst
> + max6697.rst
> + max8688.rst
> + mc13783-adc.rst
> + mcp3021.rst
> + menf21bmc.rst
> + mlxreg-fan.rst
> + nct6683.rst
> + nct6775.rst
> + nct7802.rst
> + nct7904.rst
> + npcm750-pwm-fan.rst
> + nsa320.rst
> + ntc_thermistor.rst
> + occ.rst
> + pc87360.rst
> + pc87427.rst
> + pcf8591.rst
> + pmbus.rst
> + powr1220.rst
> + pwm-fan.rst
> + raspberrypi-hwmon.rst
> + sch5627.rst
> + sch5636.rst
> + scpi-hwmon.rst
> + sht15.rst
> + sht21.rst
> + sht3x.rst
> + shtc1.rst
> + sis5595.rst
> + smm665.rst
> + smsc47b397.rst
> + smsc47m192.rst
> + smsc47m1.rst
> + tc654.rst
> + tc74.rst
> + thmc50.rst
> + tmp102.rst
> + tmp103.rst
> + tmp108.rst
> + tmp401.rst
> + tmp421.rst
> + tps40422.rst
> + twl4030-madc-hwmon.rst
> + ucd9000.rst
> + ucd9200.rst
> + vexpress.rst
> + via686a.rst
> + vt1211.rst
> + w83627ehf.rst
> + w83627hf.rst
> + w83773g.rst
> + w83781d.rst
> + w83791d.rst
> + w83792d.rst
> + w83793.rst
> + w83795.rst
> + w83l785ts.rst
> + w83l786ng.rst
> + wm831x.rst
> + wm8350.rst
> + xgene-hwmon.rst
> + zl6100.rst
> +
> +.. only:: subproject and html
> +
> + Indices
> + =======
> +
> + * :ref:`genindex`
> diff --git a/Documentation/hwmon/ir35221 b/Documentation/hwmon/ir35221.rst
> similarity index 100%
> rename from Documentation/hwmon/ir35221
> rename to Documentation/hwmon/ir35221.rst
> diff --git a/Documentation/hwmon/it87 b/Documentation/hwmon/it87.rst
> similarity index 100%
> rename from Documentation/hwmon/it87
> rename to Documentation/hwmon/it87.rst
> diff --git a/Documentation/hwmon/jc42 b/Documentation/hwmon/jc42.rst
> similarity index 100%
> rename from Documentation/hwmon/jc42
> rename to Documentation/hwmon/jc42.rst
> diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp.rst
> similarity index 100%
> rename from Documentation/hwmon/k10temp
> rename to Documentation/hwmon/k10temp.rst
> diff --git a/Documentation/hwmon/k8temp b/Documentation/hwmon/k8temp.rst
> similarity index 100%
> rename from Documentation/hwmon/k8temp
> rename to Documentation/hwmon/k8temp.rst
> diff --git a/Documentation/hwmon/lineage-pem b/Documentation/hwmon/lineage-pem.rst
> similarity index 100%
> rename from Documentation/hwmon/lineage-pem
> rename to Documentation/hwmon/lineage-pem.rst
> diff --git a/Documentation/hwmon/lm25066 b/Documentation/hwmon/lm25066.rst
> similarity index 97%
> rename from Documentation/hwmon/lm25066
> rename to Documentation/hwmon/lm25066.rst
> index 60b7f2722931..da15e3094c8c 100644
> --- a/Documentation/hwmon/lm25066
> +++ b/Documentation/hwmon/lm25066.rst
> @@ -69,7 +69,7 @@ LM25066, LM5064, and LM5066/LM5066I Power Management, Monitoring,
> Control, and Protection ICs.
>
> The driver is a client driver to the core PMBus driver. Please see
> -Documentation/hwmon/pmbus for details on PMBus client drivers.
> +Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
>
>
> Usage Notes
> diff --git a/Documentation/hwmon/lm63 b/Documentation/hwmon/lm63.rst
> similarity index 100%
> rename from Documentation/hwmon/lm63
> rename to Documentation/hwmon/lm63.rst
> diff --git a/Documentation/hwmon/lm70 b/Documentation/hwmon/lm70.rst
> similarity index 100%
> rename from Documentation/hwmon/lm70
> rename to Documentation/hwmon/lm70.rst
> diff --git a/Documentation/hwmon/lm73 b/Documentation/hwmon/lm73.rst
> similarity index 100%
> rename from Documentation/hwmon/lm73
> rename to Documentation/hwmon/lm73.rst
> diff --git a/Documentation/hwmon/lm75 b/Documentation/hwmon/lm75.rst
> similarity index 100%
> rename from Documentation/hwmon/lm75
> rename to Documentation/hwmon/lm75.rst
> diff --git a/Documentation/hwmon/lm77 b/Documentation/hwmon/lm77.rst
> similarity index 100%
> rename from Documentation/hwmon/lm77
> rename to Documentation/hwmon/lm77.rst
> diff --git a/Documentation/hwmon/lm78 b/Documentation/hwmon/lm78.rst
> similarity index 100%
> rename from Documentation/hwmon/lm78
> rename to Documentation/hwmon/lm78.rst
> diff --git a/Documentation/hwmon/lm80 b/Documentation/hwmon/lm80.rst
> similarity index 100%
> rename from Documentation/hwmon/lm80
> rename to Documentation/hwmon/lm80.rst
> diff --git a/Documentation/hwmon/lm83 b/Documentation/hwmon/lm83.rst
> similarity index 100%
> rename from Documentation/hwmon/lm83
> rename to Documentation/hwmon/lm83.rst
> diff --git a/Documentation/hwmon/lm85 b/Documentation/hwmon/lm85.rst
> similarity index 100%
> rename from Documentation/hwmon/lm85
> rename to Documentation/hwmon/lm85.rst
> diff --git a/Documentation/hwmon/lm87 b/Documentation/hwmon/lm87.rst
> similarity index 100%
> rename from Documentation/hwmon/lm87
> rename to Documentation/hwmon/lm87.rst
> diff --git a/Documentation/hwmon/lm90 b/Documentation/hwmon/lm90.rst
> similarity index 100%
> rename from Documentation/hwmon/lm90
> rename to Documentation/hwmon/lm90.rst
> diff --git a/Documentation/hwmon/lm92 b/Documentation/hwmon/lm92.rst
> similarity index 100%
> rename from Documentation/hwmon/lm92
> rename to Documentation/hwmon/lm92.rst
> diff --git a/Documentation/hwmon/lm93 b/Documentation/hwmon/lm93.rst
> similarity index 100%
> rename from Documentation/hwmon/lm93
> rename to Documentation/hwmon/lm93.rst
> diff --git a/Documentation/hwmon/lm95234 b/Documentation/hwmon/lm95234.rst
> similarity index 100%
> rename from Documentation/hwmon/lm95234
> rename to Documentation/hwmon/lm95234.rst
> diff --git a/Documentation/hwmon/lm95245 b/Documentation/hwmon/lm95245.rst
> similarity index 100%
> rename from Documentation/hwmon/lm95245
> rename to Documentation/hwmon/lm95245.rst
> diff --git a/Documentation/hwmon/ltc2945 b/Documentation/hwmon/ltc2945.rst
> similarity index 100%
> rename from Documentation/hwmon/ltc2945
> rename to Documentation/hwmon/ltc2945.rst
> diff --git a/Documentation/hwmon/ltc2978 b/Documentation/hwmon/ltc2978.rst
> similarity index 100%
> rename from Documentation/hwmon/ltc2978
> rename to Documentation/hwmon/ltc2978.rst
> diff --git a/Documentation/hwmon/ltc2990 b/Documentation/hwmon/ltc2990.rst
> similarity index 100%
> rename from Documentation/hwmon/ltc2990
> rename to Documentation/hwmon/ltc2990.rst
> diff --git a/Documentation/hwmon/ltc3815 b/Documentation/hwmon/ltc3815.rst
> similarity index 100%
> rename from Documentation/hwmon/ltc3815
> rename to Documentation/hwmon/ltc3815.rst
> diff --git a/Documentation/hwmon/ltc4151 b/Documentation/hwmon/ltc4151.rst
> similarity index 100%
> rename from Documentation/hwmon/ltc4151
> rename to Documentation/hwmon/ltc4151.rst
> diff --git a/Documentation/hwmon/ltc4215 b/Documentation/hwmon/ltc4215.rst
> similarity index 100%
> rename from Documentation/hwmon/ltc4215
> rename to Documentation/hwmon/ltc4215.rst
> diff --git a/Documentation/hwmon/ltc4245 b/Documentation/hwmon/ltc4245.rst
> similarity index 100%
> rename from Documentation/hwmon/ltc4245
> rename to Documentation/hwmon/ltc4245.rst
> diff --git a/Documentation/hwmon/ltc4260 b/Documentation/hwmon/ltc4260.rst
> similarity index 100%
> rename from Documentation/hwmon/ltc4260
> rename to Documentation/hwmon/ltc4260.rst
> diff --git a/Documentation/hwmon/ltc4261 b/Documentation/hwmon/ltc4261.rst
> similarity index 100%
> rename from Documentation/hwmon/ltc4261
> rename to Documentation/hwmon/ltc4261.rst
> diff --git a/Documentation/hwmon/max16064 b/Documentation/hwmon/max16064.rst
> similarity index 96%
> rename from Documentation/hwmon/max16064
> rename to Documentation/hwmon/max16064.rst
> index 61ec679dc477..6d5e9538991f 100644
> --- a/Documentation/hwmon/max16064
> +++ b/Documentation/hwmon/max16064.rst
> @@ -21,7 +21,7 @@ This driver supports hardware monitoring for Maxim MAX16064 Quad Power-Supply
> Controller with Active-Voltage Output Control and PMBus Interface.
>
> The driver is a client driver to the core PMBus driver.
> -Please see Documentation/hwmon/pmbus for details on PMBus client drivers.
> +Please see Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
>
>
> Usage Notes
> diff --git a/Documentation/hwmon/max16065 b/Documentation/hwmon/max16065.rst
> similarity index 100%
> rename from Documentation/hwmon/max16065
> rename to Documentation/hwmon/max16065.rst
> diff --git a/Documentation/hwmon/max1619 b/Documentation/hwmon/max1619.rst
> similarity index 100%
> rename from Documentation/hwmon/max1619
> rename to Documentation/hwmon/max1619.rst
> diff --git a/Documentation/hwmon/max1668 b/Documentation/hwmon/max1668.rst
> similarity index 100%
> rename from Documentation/hwmon/max1668
> rename to Documentation/hwmon/max1668.rst
> diff --git a/Documentation/hwmon/max197 b/Documentation/hwmon/max197.rst
> similarity index 100%
> rename from Documentation/hwmon/max197
> rename to Documentation/hwmon/max197.rst
> diff --git a/Documentation/hwmon/max20751 b/Documentation/hwmon/max20751.rst
> similarity index 96%
> rename from Documentation/hwmon/max20751
> rename to Documentation/hwmon/max20751.rst
> index d546695900ef..aa4469be6674 100644
> --- a/Documentation/hwmon/max20751
> +++ b/Documentation/hwmon/max20751.rst
> @@ -23,7 +23,7 @@ This driver supports MAX20751 Multiphase Master with PMBus Interface
> and Internal Buck Converter.
>
> The driver is a client driver to the core PMBus driver.
> -Please see Documentation/hwmon/pmbus for details on PMBus client drivers.
> +Please see Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
>
>
> Usage Notes
> diff --git a/Documentation/hwmon/max31722 b/Documentation/hwmon/max31722.rst
> similarity index 100%
> rename from Documentation/hwmon/max31722
> rename to Documentation/hwmon/max31722.rst
> diff --git a/Documentation/hwmon/max31785 b/Documentation/hwmon/max31785.rst
> similarity index 100%
> rename from Documentation/hwmon/max31785
> rename to Documentation/hwmon/max31785.rst
> diff --git a/Documentation/hwmon/max31790 b/Documentation/hwmon/max31790.rst
> similarity index 100%
> rename from Documentation/hwmon/max31790
> rename to Documentation/hwmon/max31790.rst
> diff --git a/Documentation/hwmon/max34440 b/Documentation/hwmon/max34440.rst
> similarity index 98%
> rename from Documentation/hwmon/max34440
> rename to Documentation/hwmon/max34440.rst
> index 639838ef29fd..939138e12b02 100644
> --- a/Documentation/hwmon/max34440
> +++ b/Documentation/hwmon/max34440.rst
> @@ -76,7 +76,7 @@ based on GIN pins. The MAX34460 supports 12 voltage channels, and the MAX34461
> supports 16 voltage channels.
>
> The driver is a client driver to the core PMBus driver. Please see
> -Documentation/hwmon/pmbus for details on PMBus client drivers.
> +Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
>
>
> Usage Notes
> diff --git a/Documentation/hwmon/max6639 b/Documentation/hwmon/max6639.rst
> similarity index 100%
> rename from Documentation/hwmon/max6639
> rename to Documentation/hwmon/max6639.rst
> diff --git a/Documentation/hwmon/max6642 b/Documentation/hwmon/max6642.rst
> similarity index 100%
> rename from Documentation/hwmon/max6642
> rename to Documentation/hwmon/max6642.rst
> diff --git a/Documentation/hwmon/max6650 b/Documentation/hwmon/max6650.rst
> similarity index 100%
> rename from Documentation/hwmon/max6650
> rename to Documentation/hwmon/max6650.rst
> diff --git a/Documentation/hwmon/max6697 b/Documentation/hwmon/max6697.rst
> similarity index 100%
> rename from Documentation/hwmon/max6697
> rename to Documentation/hwmon/max6697.rst
> diff --git a/Documentation/hwmon/max8688 b/Documentation/hwmon/max8688.rst
> similarity index 97%
> rename from Documentation/hwmon/max8688
> rename to Documentation/hwmon/max8688.rst
> index 43da139234c1..009487759c61 100644
> --- a/Documentation/hwmon/max8688
> +++ b/Documentation/hwmon/max8688.rst
> @@ -21,7 +21,7 @@ This driver supports hardware monitoring for Maxim MAX8688 Digital Power-Supply
> Controller/Monitor with PMBus Interface.
>
> The driver is a client driver to the core PMBus driver. Please see
> -Documentation/hwmon/pmbus for details on PMBus client drivers.
> +Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
>
>
> Usage Notes
> diff --git a/Documentation/hwmon/mc13783-adc b/Documentation/hwmon/mc13783-adc.rst
> similarity index 100%
> rename from Documentation/hwmon/mc13783-adc
> rename to Documentation/hwmon/mc13783-adc.rst
> diff --git a/Documentation/hwmon/mcp3021 b/Documentation/hwmon/mcp3021.rst
> similarity index 100%
> rename from Documentation/hwmon/mcp3021
> rename to Documentation/hwmon/mcp3021.rst
> diff --git a/Documentation/hwmon/menf21bmc b/Documentation/hwmon/menf21bmc.rst
> similarity index 100%
> rename from Documentation/hwmon/menf21bmc
> rename to Documentation/hwmon/menf21bmc.rst
> diff --git a/Documentation/hwmon/mlxreg-fan b/Documentation/hwmon/mlxreg-fan.rst
> similarity index 100%
> rename from Documentation/hwmon/mlxreg-fan
> rename to Documentation/hwmon/mlxreg-fan.rst
> diff --git a/Documentation/hwmon/nct6683 b/Documentation/hwmon/nct6683.rst
> similarity index 100%
> rename from Documentation/hwmon/nct6683
> rename to Documentation/hwmon/nct6683.rst
> diff --git a/Documentation/hwmon/nct6775 b/Documentation/hwmon/nct6775.rst
> similarity index 100%
> rename from Documentation/hwmon/nct6775
> rename to Documentation/hwmon/nct6775.rst
> diff --git a/Documentation/hwmon/nct7802 b/Documentation/hwmon/nct7802.rst
> similarity index 100%
> rename from Documentation/hwmon/nct7802
> rename to Documentation/hwmon/nct7802.rst
> diff --git a/Documentation/hwmon/nct7904 b/Documentation/hwmon/nct7904.rst
> similarity index 100%
> rename from Documentation/hwmon/nct7904
> rename to Documentation/hwmon/nct7904.rst
> diff --git a/Documentation/hwmon/npcm750-pwm-fan b/Documentation/hwmon/npcm750-pwm-fan.rst
> similarity index 100%
> rename from Documentation/hwmon/npcm750-pwm-fan
> rename to Documentation/hwmon/npcm750-pwm-fan.rst
> diff --git a/Documentation/hwmon/nsa320 b/Documentation/hwmon/nsa320.rst
> similarity index 100%
> rename from Documentation/hwmon/nsa320
> rename to Documentation/hwmon/nsa320.rst
> diff --git a/Documentation/hwmon/ntc_thermistor b/Documentation/hwmon/ntc_thermistor.rst
> similarity index 100%
> rename from Documentation/hwmon/ntc_thermistor
> rename to Documentation/hwmon/ntc_thermistor.rst
> diff --git a/Documentation/hwmon/occ b/Documentation/hwmon/occ.rst
> similarity index 100%
> rename from Documentation/hwmon/occ
> rename to Documentation/hwmon/occ.rst
> diff --git a/Documentation/hwmon/pc87360 b/Documentation/hwmon/pc87360.rst
> similarity index 100%
> rename from Documentation/hwmon/pc87360
> rename to Documentation/hwmon/pc87360.rst
> diff --git a/Documentation/hwmon/pc87427 b/Documentation/hwmon/pc87427.rst
> similarity index 100%
> rename from Documentation/hwmon/pc87427
> rename to Documentation/hwmon/pc87427.rst
> diff --git a/Documentation/hwmon/pcf8591 b/Documentation/hwmon/pcf8591.rst
> similarity index 100%
> rename from Documentation/hwmon/pcf8591
> rename to Documentation/hwmon/pcf8591.rst
> diff --git a/Documentation/hwmon/pmbus-core b/Documentation/hwmon/pmbus-core.rst
> similarity index 100%
> rename from Documentation/hwmon/pmbus-core
> rename to Documentation/hwmon/pmbus-core.rst
> diff --git a/Documentation/hwmon/pmbus b/Documentation/hwmon/pmbus.rst
> similarity index 100%
> rename from Documentation/hwmon/pmbus
> rename to Documentation/hwmon/pmbus.rst
> diff --git a/Documentation/hwmon/powr1220 b/Documentation/hwmon/powr1220.rst
> similarity index 100%
> rename from Documentation/hwmon/powr1220
> rename to Documentation/hwmon/powr1220.rst
> diff --git a/Documentation/hwmon/pwm-fan b/Documentation/hwmon/pwm-fan.rst
> similarity index 100%
> rename from Documentation/hwmon/pwm-fan
> rename to Documentation/hwmon/pwm-fan.rst
> diff --git a/Documentation/hwmon/raspberrypi-hwmon b/Documentation/hwmon/raspberrypi-hwmon.rst
> similarity index 100%
> rename from Documentation/hwmon/raspberrypi-hwmon
> rename to Documentation/hwmon/raspberrypi-hwmon.rst
> diff --git a/Documentation/hwmon/sch5627 b/Documentation/hwmon/sch5627.rst
> similarity index 100%
> rename from Documentation/hwmon/sch5627
> rename to Documentation/hwmon/sch5627.rst
> diff --git a/Documentation/hwmon/sch5636 b/Documentation/hwmon/sch5636.rst
> similarity index 100%
> rename from Documentation/hwmon/sch5636
> rename to Documentation/hwmon/sch5636.rst
> diff --git a/Documentation/hwmon/scpi-hwmon b/Documentation/hwmon/scpi-hwmon.rst
> similarity index 100%
> rename from Documentation/hwmon/scpi-hwmon
> rename to Documentation/hwmon/scpi-hwmon.rst
> diff --git a/Documentation/hwmon/sht15 b/Documentation/hwmon/sht15.rst
> similarity index 100%
> rename from Documentation/hwmon/sht15
> rename to Documentation/hwmon/sht15.rst
> diff --git a/Documentation/hwmon/sht21 b/Documentation/hwmon/sht21.rst
> similarity index 100%
> rename from Documentation/hwmon/sht21
> rename to Documentation/hwmon/sht21.rst
> diff --git a/Documentation/hwmon/sht3x b/Documentation/hwmon/sht3x.rst
> similarity index 100%
> rename from Documentation/hwmon/sht3x
> rename to Documentation/hwmon/sht3x.rst
> diff --git a/Documentation/hwmon/shtc1 b/Documentation/hwmon/shtc1.rst
> similarity index 100%
> rename from Documentation/hwmon/shtc1
> rename to Documentation/hwmon/shtc1.rst
> diff --git a/Documentation/hwmon/sis5595 b/Documentation/hwmon/sis5595.rst
> similarity index 100%
> rename from Documentation/hwmon/sis5595
> rename to Documentation/hwmon/sis5595.rst
> diff --git a/Documentation/hwmon/smm665 b/Documentation/hwmon/smm665.rst
> similarity index 100%
> rename from Documentation/hwmon/smm665
> rename to Documentation/hwmon/smm665.rst
> diff --git a/Documentation/hwmon/smsc47b397 b/Documentation/hwmon/smsc47b397.rst
> similarity index 100%
> rename from Documentation/hwmon/smsc47b397
> rename to Documentation/hwmon/smsc47b397.rst
> diff --git a/Documentation/hwmon/smsc47m1 b/Documentation/hwmon/smsc47m1.rst
> similarity index 100%
> rename from Documentation/hwmon/smsc47m1
> rename to Documentation/hwmon/smsc47m1.rst
> diff --git a/Documentation/hwmon/smsc47m192 b/Documentation/hwmon/smsc47m192.rst
> similarity index 100%
> rename from Documentation/hwmon/smsc47m192
> rename to Documentation/hwmon/smsc47m192.rst
> diff --git a/Documentation/hwmon/submitting-patches b/Documentation/hwmon/submitting-patches.rst
> similarity index 98%
> rename from Documentation/hwmon/submitting-patches
> rename to Documentation/hwmon/submitting-patches.rst
> index 12540b7d9b50..f9796b9d9db6 100644
> --- a/Documentation/hwmon/submitting-patches
> +++ b/Documentation/hwmon/submitting-patches.rst
> @@ -39,7 +39,7 @@ increase the chances of your change being accepted.
> 2. Adding functionality to existing drivers
> -------------------------------------------
>
> -* Make sure the documentation in Documentation/hwmon/<driver_name> is up to
> +* Make sure the documentation in Documentation/hwmon/<driver_name>.rst is up to
> date.
>
> * Make sure the information in Kconfig is up to date.
> @@ -61,7 +61,7 @@ increase the chances of your change being accepted.
>
> * Consider adding yourself to MAINTAINERS.
>
> -* Document the driver in Documentation/hwmon/<driver_name>.
> +* Document the driver in Documentation/hwmon/<driver_name>.rst.
>
> * Add the driver to Kconfig and Makefile in alphabetical order.
>
> @@ -134,7 +134,7 @@ increase the chances of your change being accepted.
> non-standard attributes, or you believe you do, discuss it on the mailing list
> first. Either case, provide a detailed explanation why you need the
> non-standard attribute(s).
> - Standard attributes are specified in Documentation/hwmon/sysfs-interface.
> + Standard attributes are specified in Documentation/hwmon/sysfs-interface.rst.
>
> * When deciding which sysfs attributes to support, look at the chip's
> capabilities. While we do not expect your driver to support everything the
> diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface.rst
> similarity index 100%
> rename from Documentation/hwmon/sysfs-interface
> rename to Documentation/hwmon/sysfs-interface.rst
> diff --git a/Documentation/hwmon/tc654 b/Documentation/hwmon/tc654.rst
> similarity index 100%
> rename from Documentation/hwmon/tc654
> rename to Documentation/hwmon/tc654.rst
> diff --git a/Documentation/hwmon/tc74 b/Documentation/hwmon/tc74.rst
> similarity index 100%
> rename from Documentation/hwmon/tc74
> rename to Documentation/hwmon/tc74.rst
> diff --git a/Documentation/hwmon/thmc50 b/Documentation/hwmon/thmc50.rst
> similarity index 100%
> rename from Documentation/hwmon/thmc50
> rename to Documentation/hwmon/thmc50.rst
> diff --git a/Documentation/hwmon/tmp102 b/Documentation/hwmon/tmp102.rst
> similarity index 93%
> rename from Documentation/hwmon/tmp102
> rename to Documentation/hwmon/tmp102.rst
> index 5e34821df4ab..b1f585531a88 100644
> --- a/Documentation/hwmon/tmp102
> +++ b/Documentation/hwmon/tmp102.rst
> @@ -28,4 +28,4 @@ The TMP102 has a programmable update rate that can select between 8, 4, 1, and
> 0.5 Hz. (Currently the driver only supports the default of 4 Hz).
>
> The driver provides the common sysfs-interface for temperatures (see
> -Documentation/hwmon/sysfs-interface under Temperatures).
> +Documentation/hwmon/sysfs-interface.rst under Temperatures).
> diff --git a/Documentation/hwmon/tmp103 b/Documentation/hwmon/tmp103.rst
> similarity index 92%
> rename from Documentation/hwmon/tmp103
> rename to Documentation/hwmon/tmp103.rst
> index 7682a795e38c..15d25806d585 100644
> --- a/Documentation/hwmon/tmp103
> +++ b/Documentation/hwmon/tmp103.rst
> @@ -27,7 +27,7 @@ Resolution: 8 Bits
> Accuracy: ?1?C Typ (?10?C to +100?C)
>
> The driver provides the common sysfs-interface for temperatures (see
> -Documentation/hwmon/sysfs-interface under Temperatures).
> +Documentation/hwmon/sysfs-interface.rst under Temperatures).
>
> Please refer how to instantiate this driver:
> Documentation/i2c/instantiating-devices
> diff --git a/Documentation/hwmon/tmp108 b/Documentation/hwmon/tmp108.rst
> similarity index 95%
> rename from Documentation/hwmon/tmp108
> rename to Documentation/hwmon/tmp108.rst
> index 7e08b7ef1e2f..5f4266a16cb2 100644
> --- a/Documentation/hwmon/tmp108
> +++ b/Documentation/hwmon/tmp108.rst
> @@ -38,4 +38,4 @@ and then the device is shut down automatically. (This driver only supports
> continuous mode.)
>
> The driver provides the common sysfs-interface for temperatures (see
> -Documentation/hwmon/sysfs-interface under Temperatures).
> +Documentation/hwmon/sysfs-interface.rst under Temperatures).
> diff --git a/Documentation/hwmon/tmp401 b/Documentation/hwmon/tmp401.rst
> similarity index 97%
> rename from Documentation/hwmon/tmp401
> rename to Documentation/hwmon/tmp401.rst
> index bd865bbdb38d..6a05a0719bc7 100644
> --- a/Documentation/hwmon/tmp401
> +++ b/Documentation/hwmon/tmp401.rst
> @@ -68,7 +68,7 @@ supported by the driver so far, so using the default resolution of 0.5
> degree).
>
> The driver provides the common sysfs-interface for temperatures (see
> -Documentation/hwmon/sysfs-interface under Temperatures).
> +Documentation/hwmon/sysfs-interface.rst under Temperatures).
>
> The TMP411 and TMP431 chips are compatible with TMP401. TMP411 provides
> some additional features.
> diff --git a/Documentation/hwmon/tmp421 b/Documentation/hwmon/tmp421.rst
> similarity index 100%
> rename from Documentation/hwmon/tmp421
> rename to Documentation/hwmon/tmp421.rst
> diff --git a/Documentation/hwmon/tps40422 b/Documentation/hwmon/tps40422.rst
> similarity index 96%
> rename from Documentation/hwmon/tps40422
> rename to Documentation/hwmon/tps40422.rst
> index 359751eb5ed4..b691e30479dd 100644
> --- a/Documentation/hwmon/tps40422
> +++ b/Documentation/hwmon/tps40422.rst
> @@ -21,7 +21,7 @@ This driver supports TI TPS40422 Dual-Output or Two-Phase Synchronous Buck
> Controller with PMBus
>
> The driver is a client driver to the core PMBus driver.
> -Please see Documentation/hwmon/pmbus for details on PMBus client drivers.
> +Please see Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
>
>
> Usage Notes
> diff --git a/Documentation/hwmon/twl4030-madc-hwmon b/Documentation/hwmon/twl4030-madc-hwmon.rst
> similarity index 100%
> rename from Documentation/hwmon/twl4030-madc-hwmon
> rename to Documentation/hwmon/twl4030-madc-hwmon.rst
> diff --git a/Documentation/hwmon/ucd9000 b/Documentation/hwmon/ucd9000.rst
> similarity index 97%
> rename from Documentation/hwmon/ucd9000
> rename to Documentation/hwmon/ucd9000.rst
> index d69061b7312c..ebc4f2b3bfea 100644
> --- a/Documentation/hwmon/ucd9000
> +++ b/Documentation/hwmon/ucd9000.rst
> @@ -57,7 +57,7 @@ system-health monitor. The device integrates a 12-bit ADC for monitoring up to
> 13 power-supply voltage, current, or temperature inputs.
>
> This driver is a client driver to the core PMBus driver. Please see
> -Documentation/hwmon/pmbus for details on PMBus client drivers.
> +Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
>
>
> Usage Notes
> @@ -72,7 +72,7 @@ Platform data support
> ---------------------
>
> The driver supports standard PMBus driver platform data. Please see
> -Documentation/hwmon/pmbus for details.
> +Documentation/hwmon/pmbus.rst for details.
>
>
> Sysfs entries
> diff --git a/Documentation/hwmon/ucd9200 b/Documentation/hwmon/ucd9200.rst
> similarity index 97%
> rename from Documentation/hwmon/ucd9200
> rename to Documentation/hwmon/ucd9200.rst
> index 44eda4a579b6..b819dfd75f71 100644
> --- a/Documentation/hwmon/ucd9200
> +++ b/Documentation/hwmon/ucd9200.rst
> @@ -33,7 +33,7 @@ dedicated circuitry for DC/DC loop management with flash memory and a serial
> interface to support configuration, monitoring and management.
>
> This driver is a client driver to the core PMBus driver. Please see
> -Documentation/hwmon/pmbus for details on PMBus client drivers.
> +Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
>
>
> Usage Notes
> @@ -48,7 +48,7 @@ Platform data support
> ---------------------
>
> The driver supports standard PMBus driver platform data. Please see
> -Documentation/hwmon/pmbus for details.
> +Documentation/hwmon/pmbus.rst for details.
>
>
> Sysfs entries
> diff --git a/Documentation/hwmon/userspace-tools b/Documentation/hwmon/userspace-tools.rst
> similarity index 100%
> rename from Documentation/hwmon/userspace-tools
> rename to Documentation/hwmon/userspace-tools.rst
> diff --git a/Documentation/hwmon/vexpress b/Documentation/hwmon/vexpress.rst
> similarity index 100%
> rename from Documentation/hwmon/vexpress
> rename to Documentation/hwmon/vexpress.rst
> diff --git a/Documentation/hwmon/via686a b/Documentation/hwmon/via686a.rst
> similarity index 100%
> rename from Documentation/hwmon/via686a
> rename to Documentation/hwmon/via686a.rst
> diff --git a/Documentation/hwmon/vt1211 b/Documentation/hwmon/vt1211.rst
> similarity index 100%
> rename from Documentation/hwmon/vt1211
> rename to Documentation/hwmon/vt1211.rst
> diff --git a/Documentation/hwmon/w83627ehf b/Documentation/hwmon/w83627ehf.rst
> similarity index 100%
> rename from Documentation/hwmon/w83627ehf
> rename to Documentation/hwmon/w83627ehf.rst
> diff --git a/Documentation/hwmon/w83627hf b/Documentation/hwmon/w83627hf.rst
> similarity index 100%
> rename from Documentation/hwmon/w83627hf
> rename to Documentation/hwmon/w83627hf.rst
> diff --git a/Documentation/hwmon/w83773g b/Documentation/hwmon/w83773g.rst
> similarity index 100%
> rename from Documentation/hwmon/w83773g
> rename to Documentation/hwmon/w83773g.rst
> diff --git a/Documentation/hwmon/w83781d b/Documentation/hwmon/w83781d.rst
> similarity index 100%
> rename from Documentation/hwmon/w83781d
> rename to Documentation/hwmon/w83781d.rst
> diff --git a/Documentation/hwmon/w83791d b/Documentation/hwmon/w83791d.rst
> similarity index 99%
> rename from Documentation/hwmon/w83791d
> rename to Documentation/hwmon/w83791d.rst
> index a91f9e5fb0c6..3adaed39b157 100644
> --- a/Documentation/hwmon/w83791d
> +++ b/Documentation/hwmon/w83791d.rst
> @@ -102,7 +102,7 @@ This file is used for both legacy and new code.
>
> The sysfs interface to the beep bitmask has migrated from the original legacy
> method of a single sysfs beep_mask file to a newer method using multiple
> -`*_beep` files as described in `Documentation/hwmon/sysfs-interface`.
> +`*_beep` files as described in `Documentation/hwmon/sysfs-interface.rst`.
>
> A similar change has occurred for the bitmap corresponding to the alarms. The
> original legacy method used a single sysfs alarms file containing a bitmap
> diff --git a/Documentation/hwmon/w83792d b/Documentation/hwmon/w83792d.rst
> similarity index 100%
> rename from Documentation/hwmon/w83792d
> rename to Documentation/hwmon/w83792d.rst
> diff --git a/Documentation/hwmon/w83793 b/Documentation/hwmon/w83793.rst
> similarity index 100%
> rename from Documentation/hwmon/w83793
> rename to Documentation/hwmon/w83793.rst
> diff --git a/Documentation/hwmon/w83795 b/Documentation/hwmon/w83795.rst
> similarity index 100%
> rename from Documentation/hwmon/w83795
> rename to Documentation/hwmon/w83795.rst
> diff --git a/Documentation/hwmon/w83l785ts b/Documentation/hwmon/w83l785ts.rst
> similarity index 100%
> rename from Documentation/hwmon/w83l785ts
> rename to Documentation/hwmon/w83l785ts.rst
> diff --git a/Documentation/hwmon/w83l786ng b/Documentation/hwmon/w83l786ng.rst
> similarity index 100%
> rename from Documentation/hwmon/w83l786ng
> rename to Documentation/hwmon/w83l786ng.rst
> diff --git a/Documentation/hwmon/wm831x b/Documentation/hwmon/wm831x.rst
> similarity index 100%
> rename from Documentation/hwmon/wm831x
> rename to Documentation/hwmon/wm831x.rst
> diff --git a/Documentation/hwmon/wm8350 b/Documentation/hwmon/wm8350.rst
> similarity index 100%
> rename from Documentation/hwmon/wm8350
> rename to Documentation/hwmon/wm8350.rst
> diff --git a/Documentation/hwmon/xgene-hwmon b/Documentation/hwmon/xgene-hwmon.rst
> similarity index 100%
> rename from Documentation/hwmon/xgene-hwmon
> rename to Documentation/hwmon/xgene-hwmon.rst
> diff --git a/Documentation/hwmon/zl6100 b/Documentation/hwmon/zl6100.rst
> similarity index 98%
> rename from Documentation/hwmon/zl6100
> rename to Documentation/hwmon/zl6100.rst
> index 4029970bace4..41513bb7fe51 100644
> --- a/Documentation/hwmon/zl6100
> +++ b/Documentation/hwmon/zl6100.rst
> @@ -113,7 +113,7 @@ This driver supports hardware monitoring for Intersil / Zilker Labs ZL6100 and
> compatible digital DC-DC controllers.
>
> The driver is a client driver to the core PMBus driver. Please see
> -Documentation/hwmon/pmbus and Documentation.hwmon/pmbus-core for details
> +Documentation/hwmon/pmbus.rst and Documentation.hwmon/pmbus-core for details
> on PMBus client drivers.
>
>
> diff --git a/Documentation/index.rst b/Documentation/index.rst
> index 80a421cb935e..3a710dc24fc8 100644
> --- a/Documentation/index.rst
> +++ b/Documentation/index.rst
> @@ -83,6 +83,7 @@ needed).
> media/index
> networking/index
> input/index
> + hwmon/index
> gpu/index
> security/index
> sound/index
> diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt
> index 911399730c1c..c3fa500df92c 100644
> --- a/Documentation/thermal/sysfs-api.txt
> +++ b/Documentation/thermal/sysfs-api.txt
> @@ -316,7 +316,7 @@ ACPI thermal zones.
> |---temp[1-*]_input: The current temperature of thermal zone [1-*]
> |---temp[1-*]_critical: The critical trip point of thermal zone [1-*]
>
> -Please read Documentation/hwmon/sysfs-interface for additional information.
> +Please read Documentation/hwmon/sysfs-interface.rst for additional information.
>
> ***************************
> * Thermal zone attributes *
> diff --git a/MAINTAINERS b/MAINTAINERS
> index dc615cb76455..d258fb8e7e8e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -468,7 +468,7 @@ ADM1025 HARDWARE MONITOR DRIVER
> M: Jean Delvare <jdelvare@suse.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/adm1025
> +F: Documentation/hwmon/adm1025.rst
> F: drivers/hwmon/adm1025.c
>
> ADM1029 HARDWARE MONITOR DRIVER
> @@ -520,7 +520,7 @@ ADS1015 HARDWARE MONITOR DRIVER
> M: Dirk Eibach <eibach@gdsys.de>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/ads1015
> +F: Documentation/hwmon/ads1015.rst
> F: drivers/hwmon/ads1015.c
> F: include/linux/platform_data/ads1015.h
>
> @@ -533,7 +533,7 @@ ADT7475 HARDWARE MONITOR DRIVER
> M: Jean Delvare <jdelvare@suse.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/adt7475
> +F: Documentation/hwmon/adt7475.rst
> F: drivers/hwmon/adt7475.c
>
> ADVANSYS SCSI DRIVER
> @@ -764,7 +764,7 @@ AMD FAM15H PROCESSOR POWER MONITORING DRIVER
> M: Huang Rui <ray.huang@amd.com>
> L: linux-hwmon at vger.kernel.org
> S: Supported
> -F: Documentation/hwmon/fam15h_power
> +F: Documentation/hwmon/fam15h_power.rst
> F: drivers/hwmon/fam15h_power.c
>
> AMD FCH GPIO DRIVER
> @@ -2512,7 +2512,7 @@ ASC7621 HARDWARE MONITOR DRIVER
> M: George Joseph <george.joseph@fairview5.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/asc7621
> +F: Documentation/hwmon/asc7621.rst
> F: drivers/hwmon/asc7621.c
>
> ASPEED VIDEO ENGINE DRIVER
> @@ -4043,7 +4043,7 @@ CORETEMP HARDWARE MONITORING DRIVER
> M: Fenghua Yu <fenghua.yu@intel.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/coretemp
> +F: Documentation/hwmon/coretemp.rst
> F: drivers/hwmon/coretemp.c
>
> COSA/SRP SYNC SERIAL DRIVER
> @@ -4598,7 +4598,7 @@ DIALOG SEMICONDUCTOR DRIVERS
> M: Support Opensource <support.opensource@diasemi.com>
> W: http://www.dialog-semiconductor.com/products
> S: Supported
> -F: Documentation/hwmon/da90??
> +F: Documentation/hwmon/da90??.rst
> F: Documentation/devicetree/bindings/mfd/da90*.txt
> F: Documentation/devicetree/bindings/input/da90??-onkey.txt
> F: Documentation/devicetree/bindings/thermal/da90??-thermal.txt
> @@ -4749,7 +4749,7 @@ DME1737 HARDWARE MONITOR DRIVER
> M: Juerg Haefliger <juergh@gmail.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/dme1737
> +F: Documentation/hwmon/dme1737.rst
> F: drivers/hwmon/dme1737.c
>
> DMI/SMBIOS SUPPORT
> @@ -5935,7 +5935,7 @@ F71805F HARDWARE MONITORING DRIVER
> M: Jean Delvare <jdelvare@suse.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/f71805f
> +F: Documentation/hwmon/f71805f.rst
> F: drivers/hwmon/f71805f.c
>
> FADDR2LINE
> @@ -7618,7 +7618,7 @@ INA209 HARDWARE MONITOR DRIVER
> M: Guenter Roeck <linux@roeck-us.net>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/ina209
> +F: Documentation/hwmon/ina209.rst
> F: Documentation/devicetree/bindings/hwmon/ina2xx.txt
> F: drivers/hwmon/ina209.c
>
> @@ -7626,7 +7626,7 @@ INA2XX HARDWARE MONITOR DRIVER
> M: Guenter Roeck <linux@roeck-us.net>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/ina2xx
> +F: Documentation/hwmon/ina2xx.rst
> F: drivers/hwmon/ina2xx.c
> F: include/linux/platform_data/ina2xx.h
>
> @@ -8244,7 +8244,7 @@ IT87 HARDWARE MONITORING DRIVER
> M: Jean Delvare <jdelvare@suse.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/it87
> +F: Documentation/hwmon/it87.rst
> F: drivers/hwmon/it87.c
>
> IT913X MEDIA DRIVER
> @@ -8288,7 +8288,7 @@ M: Guenter Roeck <linux@roeck-us.net>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> F: drivers/hwmon/jc42.c
> -F: Documentation/hwmon/jc42
> +F: Documentation/hwmon/jc42.rst
>
> JFS FILESYSTEM
> M: Dave Kleikamp <shaggy@kernel.org>
> @@ -8336,14 +8336,14 @@ K10TEMP HARDWARE MONITORING DRIVER
> M: Clemens Ladisch <clemens@ladisch.de>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/k10temp
> +F: Documentation/hwmon/k10temp.rst
> F: drivers/hwmon/k10temp.c
>
> K8TEMP HARDWARE MONITORING DRIVER
> M: Rudolf Marek <r.marek@assembler.cz>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/k8temp
> +F: Documentation/hwmon/k8temp.rst
> F: drivers/hwmon/k8temp.c
>
> KASAN
> @@ -9034,21 +9034,21 @@ LM78 HARDWARE MONITOR DRIVER
> M: Jean Delvare <jdelvare@suse.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/lm78
> +F: Documentation/hwmon/lm78.rst
> F: drivers/hwmon/lm78.c
>
> LM83 HARDWARE MONITOR DRIVER
> M: Jean Delvare <jdelvare@suse.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/lm83
> +F: Documentation/hwmon/lm83.rst
> F: drivers/hwmon/lm83.c
>
> LM90 HARDWARE MONITOR DRIVER
> M: Jean Delvare <jdelvare@suse.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/lm90
> +F: Documentation/hwmon/lm90.rst
> F: Documentation/devicetree/bindings/hwmon/lm90.txt
> F: drivers/hwmon/lm90.c
> F: include/dt-bindings/thermal/lm90.h
> @@ -9057,7 +9057,7 @@ LM95234 HARDWARE MONITOR DRIVER
> M: Guenter Roeck <linux@roeck-us.net>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/lm95234
> +F: Documentation/hwmon/lm95234.rst
> F: drivers/hwmon/lm95234.c
>
> LME2510 MEDIA DRIVER
> @@ -9131,7 +9131,7 @@ LTC4261 HARDWARE MONITOR DRIVER
> M: Guenter Roeck <linux@roeck-us.net>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/ltc4261
> +F: Documentation/hwmon/ltc4261.rst
> F: drivers/hwmon/ltc4261.c
>
> LTC4306 I2C MULTIPLEXER DRIVER
> @@ -9362,7 +9362,7 @@ MAX16065 HARDWARE MONITOR DRIVER
> M: Guenter Roeck <linux@roeck-us.net>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/max16065
> +F: Documentation/hwmon/max16065.rst
> F: drivers/hwmon/max16065.c
>
> MAX2175 SDR TUNER DRIVER
> @@ -9378,14 +9378,14 @@ F: include/uapi/linux/max2175.h
> MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
> L: linux-hwmon at vger.kernel.org
> S: Orphan
> -F: Documentation/hwmon/max6650
> +F: Documentation/hwmon/max6650.rst
> F: drivers/hwmon/max6650.c
>
> MAX6697 HARDWARE MONITOR DRIVER
> M: Guenter Roeck <linux@roeck-us.net>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/max6697
> +F: Documentation/hwmon/max6697.rst
> F: Documentation/devicetree/bindings/hwmon/max6697.txt
> F: drivers/hwmon/max6697.c
> F: include/linux/platform_data/max6697.h
> @@ -10031,7 +10031,7 @@ F: drivers/mfd/menf21bmc.c
> F: drivers/watchdog/menf21bmc_wdt.c
> F: drivers/leds/leds-menf21bmc.c
> F: drivers/hwmon/menf21bmc_hwmon.c
> -F: Documentation/hwmon/menf21bmc
> +F: Documentation/hwmon/menf21bmc.rst
>
> MEN Z069 WATCHDOG DRIVER
> M: Johannes Thumshirn <jth@kernel.org>
> @@ -10659,7 +10659,7 @@ NCT6775 HARDWARE MONITOR DRIVER
> M: Guenter Roeck <linux@roeck-us.net>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/nct6775
> +F: Documentation/hwmon/nct6775.rst
> F: drivers/hwmon/nct6775.c
>
> NET_FAILOVER MODULE
> @@ -11753,7 +11753,7 @@ PC87360 HARDWARE MONITORING DRIVER
> M: Jim Cromie <jim.cromie@gmail.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/pc87360
> +F: Documentation/hwmon/pc87360.rst
> F: drivers/hwmon/pc87360.c
>
> PC8736x GPIO DRIVER
> @@ -11765,7 +11765,7 @@ PC87427 HARDWARE MONITORING DRIVER
> M: Jean Delvare <jdelvare@suse.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/pc87427
> +F: Documentation/hwmon/pc87427.rst
> F: drivers/hwmon/pc87427.c
>
> PCA9532 LED DRIVER
> @@ -12333,23 +12333,23 @@ S: Maintained
> F: Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
> F: Documentation/devicetree/bindings/hwmon/max31785.txt
> F: Documentation/devicetree/bindings/hwmon/ltc2978.txt
> -F: Documentation/hwmon/adm1275
> -F: Documentation/hwmon/ibm-cffps
> -F: Documentation/hwmon/ir35221
> -F: Documentation/hwmon/lm25066
> -F: Documentation/hwmon/ltc2978
> -F: Documentation/hwmon/ltc3815
> -F: Documentation/hwmon/max16064
> -F: Documentation/hwmon/max20751
> -F: Documentation/hwmon/max31785
> -F: Documentation/hwmon/max34440
> -F: Documentation/hwmon/max8688
> -F: Documentation/hwmon/pmbus
> -F: Documentation/hwmon/pmbus-core
> -F: Documentation/hwmon/tps40422
> -F: Documentation/hwmon/ucd9000
> -F: Documentation/hwmon/ucd9200
> -F: Documentation/hwmon/zl6100
> +F: Documentation/hwmon/adm1275.rst
> +F: Documentation/hwmon/ibm-cffps.rst
> +F: Documentation/hwmon/ir35221.rst
> +F: Documentation/hwmon/lm25066.rst
> +F: Documentation/hwmon/ltc2978.rst
> +F: Documentation/hwmon/ltc3815.rst
> +F: Documentation/hwmon/max16064.rst
> +F: Documentation/hwmon/max20751.rst
> +F: Documentation/hwmon/max31785.rst
> +F: Documentation/hwmon/max34440.rst
> +F: Documentation/hwmon/max8688.rst
> +F: Documentation/hwmon/pmbus.rst
> +F: Documentation/hwmon/pmbus-core.rst
> +F: Documentation/hwmon/tps40422.rst
> +F: Documentation/hwmon/ucd9000.rst
> +F: Documentation/hwmon/ucd9200.rst
> +F: Documentation/hwmon/zl6100.rst
> F: drivers/hwmon/pmbus/
> F: include/linux/pmbus.h
>
> @@ -12613,7 +12613,7 @@ M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> L: linux-hwmon at vger.kernel.org
> S: Supported
> F: Documentation/devicetree/bindings/hwmon/pwm-fan.txt
> -F: Documentation/hwmon/pwm-fan
> +F: Documentation/hwmon/pwm-fan.rst
> F: drivers/hwmon/pwm-fan.c
>
> PWM IR Transmitter
> @@ -14278,21 +14278,21 @@ SMM665 HARDWARE MONITOR DRIVER
> M: Guenter Roeck <linux@roeck-us.net>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/smm665
> +F: Documentation/hwmon/smm665.rst
> F: drivers/hwmon/smm665.c
>
> SMSC EMC2103 HARDWARE MONITOR DRIVER
> M: Steve Glendinning <steve.glendinning@shawell.net>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/emc2103
> +F: Documentation/hwmon/emc2103.rst
> F: drivers/hwmon/emc2103.c
>
> SMSC SCH5627 HARDWARE MONITOR DRIVER
> M: Hans de Goede <hdegoede@redhat.com>
> L: linux-hwmon at vger.kernel.org
> S: Supported
> -F: Documentation/hwmon/sch5627
> +F: Documentation/hwmon/sch5627.rst
> F: drivers/hwmon/sch5627.c
>
> SMSC UFX6000 and UFX7000 USB to VGA DRIVER
> @@ -14305,7 +14305,7 @@ SMSC47B397 HARDWARE MONITOR DRIVER
> M: Jean Delvare <jdelvare@suse.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/smsc47b397
> +F: Documentation/hwmon/smsc47b397.rst
> F: drivers/hwmon/smsc47b397.c
>
> SMSC911x ETHERNET DRIVER
> @@ -15650,7 +15650,7 @@ TMP401 HARDWARE MONITOR DRIVER
> M: Guenter Roeck <linux@roeck-us.net>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/tmp401
> +F: Documentation/hwmon/tmp401.rst
> F: drivers/hwmon/tmp401.c
>
> TMPFS (SHMEM FILESYSTEM)
> @@ -16675,7 +16675,7 @@ VT1211 HARDWARE MONITOR DRIVER
> M: Juerg Haefliger <juergh@gmail.com>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/vt1211
> +F: Documentation/hwmon/vt1211.rst
> F: drivers/hwmon/vt1211.c
>
> VT8231 HARDWARE MONITOR DRIVER
> @@ -16703,14 +16703,14 @@ W83791D HARDWARE MONITORING DRIVER
> M: Marc Hulsman <m.hulsman@tudelft.nl>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/w83791d
> +F: Documentation/hwmon/w83791d.rst
> F: drivers/hwmon/w83791d.c
>
> W83793 HARDWARE MONITORING DRIVER
> M: Rudolf Marek <r.marek@assembler.cz>
> L: linux-hwmon at vger.kernel.org
> S: Maintained
> -F: Documentation/hwmon/w83793
> +F: Documentation/hwmon/w83793.rst
> F: drivers/hwmon/w83793.c
>
> W83795 HARDWARE MONITORING DRIVER
> @@ -16819,7 +16819,7 @@ L: patches at opensource.cirrus.com
> T: git https://github.com/CirrusLogic/linux-drivers.git
> W: https://github.com/CirrusLogic/linux-drivers/wiki
> S: Supported
> -F: Documentation/hwmon/wm83??
> +F: Documentation/hwmon/wm83??.rst
> F: Documentation/devicetree/bindings/extcon/extcon-arizona.txt
> F: Documentation/devicetree/bindings/regulator/arizona-regulator.txt
> F: Documentation/devicetree/bindings/mfd/arizona.txt
> diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
> index 6f929bfa9fcd..74c6c95cb657 100644
> --- a/drivers/hwmon/Kconfig
> +++ b/drivers/hwmon/Kconfig
> @@ -17,7 +17,7 @@ menuconfig HWMON
>
> To find out which specific driver(s) you need, use the
> sensors-detect script from the lm_sensors package. Read
> - <file:Documentation/hwmon/userspace-tools> for details.
> + <file:Documentation/hwmon/userspace-tools.rst> for details.
>
> This support can also be built as a module. If so, the module
> will be called hwmon.
> @@ -59,7 +59,7 @@ config SENSORS_ABITUGURU
> chip can be found on Abit uGuru featuring motherboards (most modern
> Abit motherboards from before end 2005). For more info and a list
> of which motherboards have which revision see
> - Documentation/hwmon/abituguru
> + Documentation/hwmon/abituguru.rst
>
> This driver can also be built as a module. If so, the module
> will be called abituguru.
> @@ -73,7 +73,7 @@ config SENSORS_ABITUGURU3
> and their settings is supported. The third revision of the Abit
> uGuru chip can be found on recent Abit motherboards (since end
> 2005). For more info and a list of which motherboards have which
> - revision see Documentation/hwmon/abituguru3
> + revision see Documentation/hwmon/abituguru3.rst
>
> This driver can also be built as a module. If so, the module
> will be called abituguru3.
> @@ -643,7 +643,7 @@ config SENSORS_CORETEMP
> help
> If you say yes here you get support for the temperature
> sensor inside your CPU. Most of the family 6 CPUs
> - are supported. Check Documentation/hwmon/coretemp for details.
> + are supported. Check Documentation/hwmon/coretemp.rst for details.
>
> config SENSORS_IT87
> tristate "ITE IT87xx and compatibles"
> diff --git a/drivers/hwmon/ads7828.c b/drivers/hwmon/ads7828.c
> index 12c56d3783ed..545b635a104e 100644
> --- a/drivers/hwmon/ads7828.c
> +++ b/drivers/hwmon/ads7828.c
> @@ -8,7 +8,7 @@
> *
> * ADS7830 support, by Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
> *
> - * For further information, see the Documentation/hwmon/ads7828 file.
> + * For further information, see the Documentation/hwmon/ads7828.rst file.
> *
> * This program is free software; you can redistribute it and/or modify
> * it under the terms of the GNU General Public License as published by
> diff --git a/drivers/hwmon/max197.c b/drivers/hwmon/max197.c
> index 3d9e210beedf..dd6a35219a18 100644
> --- a/drivers/hwmon/max197.c
> +++ b/drivers/hwmon/max197.c
> @@ -8,7 +8,7 @@
> * it under the terms of the GNU General Public License version 2 as
> * published by the Free Software Foundation.
> *
> - * For further information, see the Documentation/hwmon/max197 file.
> + * For further information, see the Documentation/hwmon/max197.rst file.
> */
>
> #include <linux/kernel.h>
> diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
> index 39b41e35c2bf..7f4a63959730 100644
> --- a/drivers/hwmon/sht15.c
> +++ b/drivers/hwmon/sht15.c
> @@ -10,7 +10,7 @@
> *
> * Copyright (c) 2007 Wouter Horre
> *
> - * For further information, see the Documentation/hwmon/sht15 file.
> + * For further information, see the Documentation/hwmon/sht15.rst file.
> */
>
> #include <linux/interrupt.h>
> diff --git a/include/linux/platform_data/ads7828.h b/include/linux/platform_data/ads7828.h
> index 3245f45f9d77..a3370a007702 100644
> --- a/include/linux/platform_data/ads7828.h
> +++ b/include/linux/platform_data/ads7828.h
> @@ -4,7 +4,7 @@
> * Copyright (c) 2012 Savoir-faire Linux Inc.
> * Vivien Didelot <vivien.didelot@savoirfairelinux.com>
> *
> - * For further information, see the Documentation/hwmon/ads7828 file.
> + * For further information, see the Documentation/hwmon/ads7828.rst file.
> *
> * This program is free software; you can redistribute it and/or modify
> * it under the terms of the GNU General Public License version 2 as
> diff --git a/include/linux/platform_data/ds620.h b/include/linux/platform_data/ds620.h
> index 6ef58bb77e46..f0ce22a78bb8 100644
> --- a/include/linux/platform_data/ds620.h
> +++ b/include/linux/platform_data/ds620.h
> @@ -14,7 +14,7 @@ struct ds620_platform_data {
> * 1 = PO_LOW
> * 2 = PO_HIGH
> *
> - * (see Documentation/hwmon/ds620)
> + * (see Documentation/hwmon/ds620.rst)
> */
> int pomode;
> };
> diff --git a/include/linux/platform_data/ina2xx.h b/include/linux/platform_data/ina2xx.h
> index 9f0aa1b48c78..dde59fd3590f 100644
> --- a/include/linux/platform_data/ina2xx.h
> +++ b/include/linux/platform_data/ina2xx.h
> @@ -7,7 +7,7 @@
> * it under the terms of the GNU General Public License version 2 as
> * published by the Free Software Foundation.
> *
> - * For further information, see the Documentation/hwmon/ina2xx file.
> + * For further information, see the Documentation/hwmon/ina2xx.rst file.
> */
>
> /**
> diff --git a/include/linux/platform_data/max197.h b/include/linux/platform_data/max197.h
> index 8da8f94ee15c..2bbd0919bc89 100644
> --- a/include/linux/platform_data/max197.h
> +++ b/include/linux/platform_data/max197.h
> @@ -8,7 +8,7 @@
> * it under the terms of the GNU General Public License version 2 as
> * published by the Free Software Foundation.
> *
> - * For further information, see the Documentation/hwmon/max197 file.
> + * For further information, see the Documentation/hwmon/max197.rst file.
> */
>
> #ifndef _PDATA_MAX197_H
> diff --git a/include/linux/platform_data/ntc_thermistor.h b/include/linux/platform_data/ntc_thermistor.h
> index ee03d429742b..5fa115d3ea4b 100644
> --- a/include/linux/platform_data/ntc_thermistor.h
> +++ b/include/linux/platform_data/ntc_thermistor.h
> @@ -42,7 +42,7 @@ struct ntc_thermistor_platform_data {
> * read_uV()
> *
> * How to setup pullup_ohm, pulldown_ohm, and connect is
> - * described at Documentation/hwmon/ntc_thermistor
> + * described at Documentation/hwmon/ntc_thermistor.rst
> *
> * pullup/down_ohm: 0 for infinite / not-connected
> *
> --
> 2.20.1
>
--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
?\_(?)_/?
^ permalink raw reply
* [PATCH 4/5] clk: Aspeed: Setup video engine clocking
From: Joel Stanley @ 2019-04-11 2:50 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <1554229504-5661-5-git-send-email-eajames@linux.ibm.com>
On Tue, 2 Apr 2019 at 18:25, Eddie James <eajames@linux.ibm.com> wrote:
>
> Add eclk mux and clock divider table. Also change the video engine reset
> to the correct clock; it was previously on the video capture but needs
> to be on the video engine clock.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Stephen, Eddie and I have worked together on this change and I am
happy with it now.
Cheers,
Joel
> ---
> drivers/clk/clk-aspeed.c | 42 +++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 39 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c
> index 5961367..42b4df6 100644
> --- a/drivers/clk/clk-aspeed.c
> +++ b/drivers/clk/clk-aspeed.c
> @@ -87,10 +87,10 @@ struct aspeed_clk_gate {
> /* TODO: ask Aspeed about the actual parent data */
> static const struct aspeed_gate_data aspeed_gates[] = {
> /* clk rst name parent flags */
> - [ASPEED_CLK_GATE_ECLK] = { 0, -1, "eclk-gate", "eclk", 0 }, /* Video Engine */
> + [ASPEED_CLK_GATE_ECLK] = { 0, 6, "eclk-gate", "eclk", 0 }, /* Video Engine */
> [ASPEED_CLK_GATE_GCLK] = { 1, 7, "gclk-gate", NULL, 0 }, /* 2D engine */
> [ASPEED_CLK_GATE_MCLK] = { 2, -1, "mclk-gate", "mpll", CLK_IS_CRITICAL }, /* SDRAM */
> - [ASPEED_CLK_GATE_VCLK] = { 3, 6, "vclk-gate", NULL, 0 }, /* Video Capture */
> + [ASPEED_CLK_GATE_VCLK] = { 3, -1, "vclk-gate", NULL, 0 }, /* Video Capture */
> [ASPEED_CLK_GATE_BCLK] = { 4, 8, "bclk-gate", "bclk", CLK_IS_CRITICAL }, /* PCIe/PCI */
> [ASPEED_CLK_GATE_DCLK] = { 5, -1, "dclk-gate", NULL, CLK_IS_CRITICAL }, /* DAC */
> [ASPEED_CLK_GATE_REFCLK] = { 6, -1, "refclk-gate", "clkin", CLK_IS_CRITICAL },
> @@ -113,6 +113,24 @@ struct aspeed_clk_gate {
> [ASPEED_CLK_GATE_LHCCLK] = { 28, -1, "lhclk-gate", "lhclk", 0 }, /* LPC master/LPC+ */
> };
>
> +static const char * const eclk_parent_names[] = {
> + "mpll",
> + "hpll",
> + "dpll",
> +};
> +
> +static const struct clk_div_table ast2500_eclk_div_table[] = {
> + { 0x0, 2 },
> + { 0x1, 2 },
> + { 0x2, 3 },
> + { 0x3, 4 },
> + { 0x4, 5 },
> + { 0x5, 6 },
> + { 0x6, 7 },
> + { 0x7, 8 },
> + { 0 }
> +};
> +
> static const struct clk_div_table ast2500_mac_div_table[] = {
> { 0x0, 4 }, /* Yep, really. Aspeed confirmed this is correct */
> { 0x1, 4 },
> @@ -192,18 +210,21 @@ static struct clk_hw *aspeed_ast2500_calc_pll(const char *name, u32 val)
>
> struct aspeed_clk_soc_data {
> const struct clk_div_table *div_table;
> + const struct clk_div_table *eclk_div_table;
> const struct clk_div_table *mac_div_table;
> struct clk_hw *(*calc_pll)(const char *name, u32 val);
> };
>
> static const struct aspeed_clk_soc_data ast2500_data = {
> .div_table = ast2500_div_table,
> + .eclk_div_table = ast2500_eclk_div_table,
> .mac_div_table = ast2500_mac_div_table,
> .calc_pll = aspeed_ast2500_calc_pll,
> };
>
> static const struct aspeed_clk_soc_data ast2400_data = {
> .div_table = ast2400_div_table,
> + .eclk_div_table = ast2400_div_table,
> .mac_div_table = ast2400_div_table,
> .calc_pll = aspeed_ast2400_calc_pll,
> };
> @@ -522,6 +543,22 @@ static int aspeed_clk_probe(struct platform_device *pdev)
> return PTR_ERR(hw);
> aspeed_clk_data->hws[ASPEED_CLK_24M] = hw;
>
> + hw = clk_hw_register_mux(dev, "eclk-mux", eclk_parent_names,
> + ARRAY_SIZE(eclk_parent_names), 0,
> + scu_base + ASPEED_CLK_SELECTION, 2, 0x3, 0,
> + &aspeed_clk_lock);
> + if (IS_ERR(hw))
> + return PTR_ERR(hw);
> + aspeed_clk_data->hws[ASPEED_CLK_ECLK_MUX] = hw;
> +
> + hw = clk_hw_register_divider_table(dev, "eclk", "eclk-mux", 0,
> + scu_base + ASPEED_CLK_SELECTION, 28,
> + 3, 0, soc_data->eclk_div_table,
> + &aspeed_clk_lock);
> + if (IS_ERR(hw))
> + return PTR_ERR(hw);
> + aspeed_clk_data->hws[ASPEED_CLK_ECLK] = hw;
> +
> /*
> * TODO: There are a number of clocks that not included in this driver
> * as more information is required:
> @@ -531,7 +568,6 @@ static int aspeed_clk_probe(struct platform_device *pdev)
> * RGMII
> * RMII
> * UART[1..5] clock source mux
> - * Video Engine (ECLK) mux and clock divider
> */
>
> for (i = 0; i < ARRAY_SIZE(aspeed_gates); i++) {
> --
> 1.8.3.1
>
^ permalink raw reply
* [PATCH 1/5] media: platform: Aspeed: Remove use of reset line
From: Joel Stanley @ 2019-04-11 2:49 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <1554229504-5661-2-git-send-email-eajames@linux.ibm.com>
On Tue, 2 Apr 2019 at 18:25, Eddie James <eajames@linux.ibm.com> wrote:
>
> The reset line is toggled by enabling the clocks, so it's not necessary
> to manually toggle the reset as well.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
^ permalink raw reply
* [PATCH 1/5] media: platform: Aspeed: Remove use of reset line
From: Joel Stanley @ 2019-04-11 2:48 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <1554229478-5621-2-git-send-email-eajames@linux.ibm.com>
On Tue, 2 Apr 2019 at 18:24, Eddie James <eajames@linux.ibm.com> wrote:
>
> The reset line is toggled by enabling the clocks, so it's not necessary
> to manually toggle the reset as well.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
^ permalink raw reply
* Re: [PATCH v2 10/21] docs: hwmon: aspeed-pwm-tacho: convert to ReST format
From: Andrew Jeffery @ 2019-04-11 0:27 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <2088d3de719397153639c5afdce53b73fe75603a.1554923967.git.mchehab+samsung@kernel.org>
On Thu, 11 Apr 2019, at 04:54, Mauro Carvalho Chehab wrote:
> Convert aspeed-pwm-tacho to ReST format, in order to allow it to
> be parsed by Sphinx.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Acked-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> Documentation/hwmon/aspeed-pwm-tacho | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/hwmon/aspeed-pwm-tacho
> b/Documentation/hwmon/aspeed-pwm-tacho
> index 7cfb34977460..6dcec845fbc7 100644
> --- a/Documentation/hwmon/aspeed-pwm-tacho
> +++ b/Documentation/hwmon/aspeed-pwm-tacho
> @@ -15,8 +15,10 @@ controller supports up to 16 tachometer inputs.
>
> The driver provides the following sensor accesses in sysfs:
>
> +=============== ======= =====================================================
> fanX_input ro provide current fan rotation value in RPM as reported
> by the fan to the device.
>
> pwmX rw get or set PWM fan control value. This is an integer
> value between 0(off) and 255(full speed).
> +=============== ======= =====================================================
> --
> 2.20.1
>
>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox