| Message ID | 20171220032328.30584-1-joel@jms.id.au |
|---|---|
| Headers | show |
| Series | ARM: dts: aspeed: updates and new machines | expand |
On Wed, Dec 20, 2017 at 1:53 PM, Joel Stanley <joel@jms.id.au> wrote: > This series of device tree patches for the ASPEED BMC machines > moves all systems to use the soon to be merged clk driver, and > updates machines to use all of the drivers we have upstream. > > v3: Address review from Rob and Cedric > - Move aspeed-gpio.h usage out into the patches where use of the GPIO > is added > - Clarify that the aspeed-clock.h patch will be merged as part of > the device tree tree. This is to ensure we don't depend on the clk > tree for building. Arnd, Michael, Stephen; how do we resolve this? We need the dt-bindings header to be present for both the clk driver and the device tree to build. The clk driver is not (yet - soon I hope?) merged by Michael and Stephen. I am about to commit the device tree changes that will go through the ARM SoC tree. Cheers, Joel -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Dec 20, 2017 at 4:37 AM, Joel Stanley <joel@jms.id.au> wrote: > On Wed, Dec 20, 2017 at 1:53 PM, Joel Stanley <joel@jms.id.au> wrote: >> This series of device tree patches for the ASPEED BMC machines >> moves all systems to use the soon to be merged clk driver, and >> updates machines to use all of the drivers we have upstream. >> >> v3: Address review from Rob and Cedric >> - Move aspeed-gpio.h usage out into the patches where use of the GPIO >> is added >> - Clarify that the aspeed-clock.h patch will be merged as part of >> the device tree tree. This is to ensure we don't depend on the clk >> tree for building. > > Arnd, Michael, Stephen; how do we resolve this? We need the > dt-bindings header to be present for both the clk driver and the > device tree to build. > > The clk driver is not (yet - soon I hope?) merged by Michael and > Stephen. I am about to commit the device tree changes that will go > through the ARM SoC tree. There are several options: - avoid the use of the header and redefine the binding to have a clear mapping between hardware clock lines and the numeric representation. This works better for some SoCs than others, YMMV. - Don't use the constants in the dts files for now, but use the numbers directly, and update the dts files for the next merge window - merge only one side for 4.16, either the driver or the dts files, and follow up with the other one in 4.17 - make one shared git branch that contains only the headers and base both the driver and the dts files on that branch so you get a single shared commit ID. I'm fine with any of the above, please pick whatever suits you best. Arnd -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Dec 20, 2017 at 01:53:10PM +1030, Joel Stanley wrote: > These are used to by the device tree to map pin numbers to constants > required by the GPIO bindings. > > Signed-off-by: Joel Stanley <joel@jms.id.au> > -- > v3: > - Remove dtsi includes from this patch, they will come later > --- > include/dt-bindings/gpio/aspeed-gpio.h | 49 ++++++++++++++++++++++++++++++++++ > 1 file changed, 49 insertions(+) > create mode 100644 include/dt-bindings/gpio/aspeed-gpio.h Reviewed-by: Rob Herring <robh@kernel.org> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
This series of device tree patches for the ASPEED BMC machines moves all systems to use the soon to be merged clk driver, and updates machines to use all of the drivers we have upstream. v3: Address review from Rob and Cedric - Move aspeed-gpio.h usage out into the patches where use of the GPIO is added - Clarify that the aspeed-clock.h patch will be merged as part of the device tree tree. This is to ensure we don't depend on the clk tree for building. - Fix duplicate flash controller nodes in Romulus v2: Address review from Arnd - Remove NUM_CLKS from dt header - Send VUART patch as a fix, drop it from this series - Add reasoning for breaking old kernel in the 'proper clock references' patch In addition it adds three new OpenBMC systems that have been developed in the OpenBMC kernel tree over the past year: two Power9 OpenPower systems, and a port by Google to a Quanta x86 server. I have boot tested these on Romulus and Palmetto, as well as boot tested all device trees in Qemu. Please review the boards you are familiar with. I will merge these in to the ASPEED ARM SoC tree for inclusion in 4.16. Andrew Jeffery (1): ARM: dts: aspeed: Add LPC and child devices Joel Stanley (16): dt-bindings: clock: Add ASPEED constants dt-bindings: gpio: Add ASPEED constants ARM: dts: aspeed: Add proper clock references ARM: dts: aspeed: Add MAC clocks ARM: dts: aspeed: Add watchdog clocks ARM: dts: aspeed: Add flash controller clocks ARM: dts: aspeed: Add clock phandle to GPIO ARM: dts: aspeed: Add PWM and tachometer node ARM: dts: aspeed: Add LPC Snoop device ARM: dts: aspeed: Remove skeleton.dtsi ARM: dts: aspeed: Update license headers ARM: dts: Add OpenBMC flash layout ARM: dts: aspeed: Sort ASPEED entries in makefile ARM: dts: aspeed: Add Witherspoon BMC machine ARM: dts: aspeed-romulus: Update Romulus system ARM: dts: aspeed-plametto: Add flash layout Rick Altherr (1): ARM: dts: aspeed: Add Qanta Q71L BMC machine Xo Wang (1): ARM: dts: aspeed: Add Ingrasys Zaius BMC machine arch/arm/boot/dts/Makefile | 8 +- arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 3 +- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 157 ++++++- arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 548 +++++++++++++++++++++++ arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 426 ++++++++++++++++++ arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 458 +++++++++++++++++++ arch/arm/boot/dts/aspeed-g4.dtsi | 163 ++++--- arch/arm/boot/dts/aspeed-g5.dtsi | 154 ++++--- arch/arm/boot/dts/openbmc-flash-layout.dtsi | 32 ++ include/dt-bindings/clock/aspeed-clock.h | 52 +++ include/dt-bindings/gpio/aspeed-gpio.h | 49 ++ 12 files changed, 1905 insertions(+), 147 deletions(-) create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts create mode 100644 arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts create mode 100644 arch/arm/boot/dts/openbmc-flash-layout.dtsi create mode 100644 include/dt-bindings/clock/aspeed-clock.h create mode 100644 include/dt-bindings/gpio/aspeed-gpio.h -- 2.15.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html