| Message ID | 20170402133304.56824-2-icenowy@aosc.io (mailing list archive) |
|---|---|
| State | RFC, archived |
| Headers | show |
On Sun, Apr 02, 2017 at 09:33:01PM +0800, Icenowy Zheng wrote: > Allwinner H3 features a thermal sensor like the one in A33, but has its > register re-arranged, the clock divider moved to CCU (originally the > clock divider is in ADC) and added a pair of bus clock and reset. > > Update the binding document to cover H3. > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > --- > .../devicetree/bindings/mfd/sun4i-gpadc.txt | 23 ++++++++++++++++++++-- > 1 file changed, 21 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt b/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt > index badff3611a98..7753133ca0ff 100644 > --- a/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt > +++ b/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt > @@ -4,12 +4,20 @@ The Allwinner SoCs all have an ADC that can also act as a thermal sensor > and sometimes as a touchscreen controller. > > Required properties: > - - compatible: "allwinner,sun8i-a33-ths", > + - compatible: must contain one of the following compatibles: > + - "allwinner,sun8i-a33-ths" > + - "allwinner,sun8i-h3-ths" > - reg: mmio address range of the chip, > - #thermal-sensor-cells: shall be 0, > - #io-channel-cells: shall be 0, > > -Example: > +Required properties for the following compatibles: > + - "allwinner,sun8i-h3-ths" > + - clocks: the bus clock and the input clock of the ADC, > + - clock-names: should be "bus" and "ths", I guess mod instead of ths would be more consistent. Maxime
在 2017年04月03日 17:15, Maxime Ripard 写道: > On Sun, Apr 02, 2017 at 09:33:01PM +0800, Icenowy Zheng wrote: >> Allwinner H3 features a thermal sensor like the one in A33, but has its >> register re-arranged, the clock divider moved to CCU (originally the >> clock divider is in ADC) and added a pair of bus clock and reset. >> >> Update the binding document to cover H3. >> >> Signed-off-by: Icenowy Zheng <icenowy@aosc.io> >> --- >> .../devicetree/bindings/mfd/sun4i-gpadc.txt | 23 ++++++++++++++++++++-- >> 1 file changed, 21 insertions(+), 2 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt b/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt >> index badff3611a98..7753133ca0ff 100644 >> --- a/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt >> +++ b/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt >> @@ -4,12 +4,20 @@ The Allwinner SoCs all have an ADC that can also act as a thermal sensor >> and sometimes as a touchscreen controller. >> >> Required properties: >> - - compatible: "allwinner,sun8i-a33-ths", >> + - compatible: must contain one of the following compatibles: >> + - "allwinner,sun8i-a33-ths" >> + - "allwinner,sun8i-h3-ths" >> - reg: mmio address range of the chip, >> - #thermal-sensor-cells: shall be 0, >> - #io-channel-cells: shall be 0, >> >> -Example: >> +Required properties for the following compatibles: >> + - "allwinner,sun8i-h3-ths" >> + - clocks: the bus clock and the input clock of the ADC, >> + - clock-names: should be "bus" and "ths", > > I guess mod instead of ths would be more consistent. In fact I will prefer "sample" here if not "ths", as it's used for the sampling, not like other mod clocks, which controls all the IP block's logic. > > Maxime >
On Mon, Apr 03, 2017 at 05:31:11PM +0800, Icenowy Zheng wrote: > > > 在 2017年04月03日 17:15, Maxime Ripard 写道: > > On Sun, Apr 02, 2017 at 09:33:01PM +0800, Icenowy Zheng wrote: > > > Allwinner H3 features a thermal sensor like the one in A33, but has its > > > register re-arranged, the clock divider moved to CCU (originally the > > > clock divider is in ADC) and added a pair of bus clock and reset. > > > > > > Update the binding document to cover H3. > > > > > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > > > --- > > > .../devicetree/bindings/mfd/sun4i-gpadc.txt | 23 ++++++++++++++++++++-- > > > 1 file changed, 21 insertions(+), 2 deletions(-) > > > > > > diff --git a/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt b/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt > > > index badff3611a98..7753133ca0ff 100644 > > > --- a/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt > > > +++ b/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt > > > @@ -4,12 +4,20 @@ The Allwinner SoCs all have an ADC that can also act as a thermal sensor > > > and sometimes as a touchscreen controller. > > > > > > Required properties: > > > - - compatible: "allwinner,sun8i-a33-ths", > > > + - compatible: must contain one of the following compatibles: > > > + - "allwinner,sun8i-a33-ths" > > > + - "allwinner,sun8i-h3-ths" > > > - reg: mmio address range of the chip, > > > - #thermal-sensor-cells: shall be 0, > > > - #io-channel-cells: shall be 0, > > > > > > -Example: > > > +Required properties for the following compatibles: > > > + - "allwinner,sun8i-h3-ths" > > > + - clocks: the bus clock and the input clock of the ADC, > > > + - clock-names: should be "bus" and "ths", > > > > I guess mod instead of ths would be more consistent. > > In fact I will prefer "sample" here if not "ths", as it's used > for the sampling, not like other mod clocks, which controls > all the IP block's logic. All the other mod clocks control some sort of sampling. The audio mod clocks will be used to sample data in capture, same thing for NAND, MMC, SPI, etc. Please remain consistent. Maxime
On Sun, Apr 02, 2017 at 09:33:01PM +0800, Icenowy Zheng wrote: > Allwinner H3 features a thermal sensor like the one in A33, but has its > register re-arranged, the clock divider moved to CCU (originally the > clock divider is in ADC) and added a pair of bus clock and reset. > > Update the binding document to cover H3. > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > --- > .../devicetree/bindings/mfd/sun4i-gpadc.txt | 23 ++++++++++++++++++++-- > 1 file changed, 21 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt b/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt > index badff3611a98..7753133ca0ff 100644 > --- a/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt > +++ b/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt > @@ -4,12 +4,20 @@ The Allwinner SoCs all have an ADC that can also act as a thermal sensor > and sometimes as a touchscreen controller. > > Required properties: > - - compatible: "allwinner,sun8i-a33-ths", > + - compatible: must contain one of the following compatibles: > + - "allwinner,sun8i-a33-ths" > + - "allwinner,sun8i-h3-ths" > - reg: mmio address range of the chip, > - #thermal-sensor-cells: shall be 0, > - #io-channel-cells: shall be 0, > > -Example: > +Required properties for the following compatibles: > + - "allwinner,sun8i-h3-ths" > + - clocks: the bus clock and the input clock of the ADC, > + - clock-names: should be "bus" and "ths", > + - resets: the bus reset of the ADC, > + > +Example for A33: > ths: ths@01c25000 { > compatible = "allwinner,sun8i-a33-ths"; > reg = <0x01c25000 0x100>; > @@ -17,6 +25,17 @@ Example: > #io-channel-cells = <0>; > }; > > +Example for H3: > + ths: ths@01c25000 { adc@... And drop the leading 0. > + compatible = "allwinner,sun8i-h3-ths"; > + reg = <0x01c25000 0x100>; > + clocks = <&ccu CLK_BUS_THS>, <&ccu CLK_THS>; > + clock-names = "bus", "ths"; > + resets = <&ccu RST_BUS_THS>; > + #thermal-sensor-cells = <0>; > + #io-channel-cells = <0>; > + }; > + > sun4i, sun5i and sun6i SoCs are also supported via the older binding: > > sun4i resistive touchscreen controller > -- > 2.12.2 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Tue, Apr 4, 2017 at 10:02 AM, Icenowy Zheng <icenowy@aosc.io> wrote: > > > 在 2017年04月04日 22:47, Rob Herring 写道: >> >> On Sun, Apr 02, 2017 at 09:33:01PM +0800, Icenowy Zheng wrote: >>> >>> Allwinner H3 features a thermal sensor like the one in A33, but has its >>> register re-arranged, the clock divider moved to CCU (originally the >>> clock divider is in ADC) and added a pair of bus clock and reset. >>> >>> Update the binding document to cover H3. >>> >>> Signed-off-by: Icenowy Zheng <icenowy@aosc.io> >>> --- >>> .../devicetree/bindings/mfd/sun4i-gpadc.txt | 23 >>> ++++++++++++++++++++-- >>> 1 file changed, 21 insertions(+), 2 deletions(-) >>> >>> diff --git a/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt >>> b/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt >>> index badff3611a98..7753133ca0ff 100644 >>> --- a/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt >>> +++ b/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt >>> @@ -4,12 +4,20 @@ The Allwinner SoCs all have an ADC that can also act as >>> a thermal sensor >>> and sometimes as a touchscreen controller. >>> >>> Required properties: >>> - - compatible: "allwinner,sun8i-a33-ths", >>> + - compatible: must contain one of the following compatibles: >>> + - "allwinner,sun8i-a33-ths" >>> + - "allwinner,sun8i-h3-ths" >>> - reg: mmio address range of the chip, >>> - #thermal-sensor-cells: shall be 0, >>> - #io-channel-cells: shall be 0, >>> >>> -Example: >>> +Required properties for the following compatibles: >>> + - "allwinner,sun8i-h3-ths" >>> + - clocks: the bus clock and the input clock of the ADC, >>> + - clock-names: should be "bus" and "ths", >>> + - resets: the bus reset of the ADC, >>> + >>> +Example for A33: >>> ths: ths@01c25000 { >>> compatible = "allwinner,sun8i-a33-ths"; >>> reg = <0x01c25000 0x100>; >>> @@ -17,6 +25,17 @@ Example: >>> #io-channel-cells = <0>; >>> }; >>> >>> +Example for H3: >>> + ths: ths@01c25000 { >> >> >> adc@... > > > It's a thermal sensor, so I think call it THS is more appropriate > here. It's implemented as an ADC driver just because the internal > code reusing of Linux. From device tree binding view I choose to > call it ths. There's numerous occurrences in this file and the filename that call it an ADC. Furthermore, node names are supposed to be generic, not part #'s or whatever you decide to make up. So pick from adc or temperature-sensor as those are the standard names . Rob
diff --git a/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt b/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt index badff3611a98..7753133ca0ff 100644 --- a/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt +++ b/Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt @@ -4,12 +4,20 @@ The Allwinner SoCs all have an ADC that can also act as a thermal sensor and sometimes as a touchscreen controller. Required properties: - - compatible: "allwinner,sun8i-a33-ths", + - compatible: must contain one of the following compatibles: + - "allwinner,sun8i-a33-ths" + - "allwinner,sun8i-h3-ths" - reg: mmio address range of the chip, - #thermal-sensor-cells: shall be 0, - #io-channel-cells: shall be 0, -Example: +Required properties for the following compatibles: + - "allwinner,sun8i-h3-ths" + - clocks: the bus clock and the input clock of the ADC, + - clock-names: should be "bus" and "ths", + - resets: the bus reset of the ADC, + +Example for A33: ths: ths@01c25000 { compatible = "allwinner,sun8i-a33-ths"; reg = <0x01c25000 0x100>; @@ -17,6 +25,17 @@ Example: #io-channel-cells = <0>; }; +Example for H3: + ths: ths@01c25000 { + compatible = "allwinner,sun8i-h3-ths"; + reg = <0x01c25000 0x100>; + clocks = <&ccu CLK_BUS_THS>, <&ccu CLK_THS>; + clock-names = "bus", "ths"; + resets = <&ccu RST_BUS_THS>; + #thermal-sensor-cells = <0>; + #io-channel-cells = <0>; + }; + sun4i, sun5i and sun6i SoCs are also supported via the older binding: sun4i resistive touchscreen controller
Allwinner H3 features a thermal sensor like the one in A33, but has its register re-arranged, the clock divider moved to CCU (originally the clock divider is in ADC) and added a pair of bus clock and reset. Update the binding document to cover H3. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> --- .../devicetree/bindings/mfd/sun4i-gpadc.txt | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)