| Message ID | 20171201012452.27086-5-yixun.lan@amlogic.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
Yixun Lan <yixun.lan@amlogic.com> writes: > From: Qiufang Dai <qiufang.dai@amlogic.com> > > Try to add Hiubus DT info, and also enable clock DT info > for the Amlogic's Meson-AXG SoC. > > Acked-by: Rob Herring <robh@kernel.org> > Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com> > Signed-off-by: Yixun Lan <yixun.lan@amlogic.com> > --- > arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > index b932a784b02a..36a2e98338a8 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > @@ -7,6 +7,7 @@ > #include <dt-bindings/gpio/gpio.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/interrupt-controller/arm-gic.h> > +#include <dt-bindings/clock/axg-clkc.h> This #include will cause an unnessary dependency from the amlogic tree to the clock tree even though this patch is not currently using any of the #defines from that header. It will simplify the dependencies if you drop this #include from this patch. In my comment on the cover letter, I suggested adding a patch that also switches the UART over to the new clock provider. That is the patch that should add this #include, since it will actually need #defines from the header. Doing it in that order means that we could merge this patch independently of the clock driver, and then merge the UART switch-over patch only after the driver (and headers) are merged. Kevin
On 12/07/17 08:50, Kevin Hilman wrote: > Yixun Lan <yixun.lan@amlogic.com> writes: > >> From: Qiufang Dai <qiufang.dai@amlogic.com> >> >> Try to add Hiubus DT info, and also enable clock DT info >> for the Amlogic's Meson-AXG SoC. >> >> Acked-by: Rob Herring <robh@kernel.org> >> Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com> >> Signed-off-by: Yixun Lan <yixun.lan@amlogic.com> >> --- >> arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 15 +++++++++++++++ >> 1 file changed, 15 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >> index b932a784b02a..36a2e98338a8 100644 >> --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >> +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >> @@ -7,6 +7,7 @@ >> #include <dt-bindings/gpio/gpio.h> >> #include <dt-bindings/interrupt-controller/irq.h> >> #include <dt-bindings/interrupt-controller/arm-gic.h> >> +#include <dt-bindings/clock/axg-clkc.h> > > This #include will cause an unnessary dependency from the amlogic tree > to the clock tree even though this patch is not currently using any of > the #defines from that header. It will simplify the dependencies if you > drop this #include from this patch. > > In my comment on the cover letter, I suggested adding a patch that also > switches the UART over to the new clock provider. That is the patch > that should add this #include, since it will actually need #defines from > the header. > ok, make sense > Doing it in that order means that we could merge this patch > independently of the clock driver, and then merge the UART switch-over > patch only after the driver (and headers) are merged. I was planing to add UART DT part as separately patches (including the UARt's pinctrl part information) but as follow your suggestion, I could split the UART's clock DT info into separate patch, and send along with this series. > > Kevin > > . >
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index b932a784b02a..36a2e98338a8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -7,6 +7,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/clock/axg-clkc.h> / { compatible = "amlogic,meson-axg"; @@ -148,6 +149,20 @@ #address-cells = <0>; }; + hiubus: hiubus@ff63c000 { + compatible = "simple-bus"; + reg = <0x0 0xff63c000 0x0 0x1c00>; + #address-cells = <2>; + #size-cells = <2>; + ranges = <0x0 0x0 0x0 0xff63c000 0x0 0x1c00>; + + clkc: clock-controller@0 { + compatible = "amlogic,axg-clkc"; + #clock-cells = <1>; + reg = <0x0 0x0 0x0 0x320>; + }; + }; + mailbox: mailbox@ff63dc00 { compatible = "amlogic,meson-gx-mhu", "amlogic,meson-gxbb-mhu"; reg = <0 0xff63dc00 0 0x400>;