| Message ID | 20170202183008.23500-5-krzk@kernel.org |
|---|---|
| State | New |
| Headers | show |
On Thursday, February 2, 2017 8:30:08 PM CET Krzysztof Kozlowski wrote: > arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 34 +++ > arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 34 +++ > arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 49 +++- > arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 302 +++++++++++---------- > arch/arm64/boot/dts/exynos/exynos7.dtsi | 34 +++ > drivers/clk/samsung/clk-exynos5433.c | 8 +- > include/dt-bindings/clock/exynos5433.h | 5 +- > include/dt-bindings/pinctrl/samsung.h | 8 + > It seems a drivers/clk change slipped in there in addition to the header changes. We are trying to keep the next/dt branches free of driver changes, are you able to rework the branch without this? Sorry for the late request. Arnd
On Thu, Feb 09, 2017 at 04:19:57PM +0100, Arnd Bergmann wrote: > On Thursday, February 2, 2017 8:30:08 PM CET Krzysztof Kozlowski wrote: > > arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 34 +++ > > arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 34 +++ > > arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 49 +++- > > arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 302 +++++++++++---------- > > arch/arm64/boot/dts/exynos/exynos7.dtsi | 34 +++ > > drivers/clk/samsung/clk-exynos5433.c | 8 +- > > include/dt-bindings/clock/exynos5433.h | 5 +- > > include/dt-bindings/pinctrl/samsung.h | 8 + > > > > It seems a drivers/clk change slipped in there in addition to the header changes. > We are trying to keep the next/dt branches free of driver changes, are you > able to rework the branch without this? +Cc Sylwester, This came from clk tree from Sylwester. It contains two changes in clocks: 1. Mew clock ID - we need only the header but Sylwester provided also the source file change, 2. Update of frequency (used in DTS as assigned clock rate) - this is strictly source file change and we need it. Overall, rework would not be trivial and it would involve Sylwester. I think it is better to stay with this as is. I will remember the policy for future dependencies. Best regards, Krzysztof
On 02/09/2017 07:56 PM, Krzysztof Kozlowski wrote: > On Thu, Feb 09, 2017 at 04:19:57PM +0100, Arnd Bergmann wrote: >> On Thursday, February 2, 2017 8:30:08 PM CET Krzysztof Kozlowski wrote: >>> arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 34 +++ >>> arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 34 +++ >>> arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 49 +++- >>> arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 302 +++++++++++---------- >>> arch/arm64/boot/dts/exynos/exynos7.dtsi | 34 +++ >>> drivers/clk/samsung/clk-exynos5433.c | 8 +- >>> include/dt-bindings/clock/exynos5433.h | 5 +- >>> include/dt-bindings/pinctrl/samsung.h | 8 + >>> >> It seems a drivers/clk change slipped in there in addition to the header changes. >> We are trying to keep the next/dt branches free of driver changes, are you >> able to rework the branch without this? > > +Cc Sylwester, > > This came from clk tree from Sylwester. It contains two changes in > clocks: > 1. Mew clock ID - we need only the header but Sylwester provided also > the source file change, That's a one patch made so there is no runtime regression. If we stick to the next/dt branches being clean of driver changes I'm afraid we need to be prepared for the bisection breaks. > 2. Update of frequency (used in DTS as assigned clock rate) - this > is strictly source file change and we need it. > > Overall, rework would not be trivial and it would involve Sylwester. > I think it is better to stay with this as is. I will remember the policy > for future dependencies. The clk changes are already pulled into clk tree, we would get conflicts with commits that are already in the clock tree if the branch is reworked now. This might not be a big issue but bisection would be broken for sure. I'll also try to keep in future include/dt-bindings changes separate.
On Fri, Feb 10, 2017 at 12:30:48PM +0100, Sylwester Nawrocki wrote: > On 02/09/2017 07:56 PM, Krzysztof Kozlowski wrote: > > On Thu, Feb 09, 2017 at 04:19:57PM +0100, Arnd Bergmann wrote: > >> On Thursday, February 2, 2017 8:30:08 PM CET Krzysztof Kozlowski wrote: > >>> arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 34 +++ > >>> arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 34 +++ > >>> arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 49 +++- > >>> arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 302 +++++++++++---------- > >>> arch/arm64/boot/dts/exynos/exynos7.dtsi | 34 +++ > >>> drivers/clk/samsung/clk-exynos5433.c | 8 +- > >>> include/dt-bindings/clock/exynos5433.h | 5 +- > >>> include/dt-bindings/pinctrl/samsung.h | 8 + > >>> > >> It seems a drivers/clk change slipped in there in addition to the header changes. > >> We are trying to keep the next/dt branches free of driver changes, are you > >> able to rework the branch without this? > > > > +Cc Sylwester, > > > > This came from clk tree from Sylwester. It contains two changes in > > clocks: > > 1. Mew clock ID - we need only the header but Sylwester provided also > > the source file change, > > That's a one patch made so there is no runtime regression. If we stick > to the next/dt branches being clean of driver changes I'm afraid we need > to be prepared for the bisection breaks. > > > 2. Update of frequency (used in DTS as assigned clock rate) - this > > is strictly source file change and we need it. > > > > Overall, rework would not be trivial and it would involve Sylwester. > > I think it is better to stay with this as is. I will remember the policy > > for future dependencies. > > The clk changes are already pulled into clk tree, we would get conflicts > with commits that are already in the clock tree if the branch is reworked > now. This might not be a big issue but bisection would be broken for sure. > > I'll also try to keep in future include/dt-bindings changes separate. Arnd, Any further comments? Are you going to pull it in? Best regards, Krzysztof
On Tue, Feb 14, 2017 at 5:52 PM, Krzysztof Kozlowski <krzk@kernel.org> wrote: > On Fri, Feb 10, 2017 at 12:30:48PM +0100, Sylwester Nawrocki wrote: >> On 02/09/2017 07:56 PM, Krzysztof Kozlowski wrote: >> > On Thu, Feb 09, 2017 at 04:19:57PM +0100, Arnd Bergmann wrote: >> >> > 2. Update of frequency (used in DTS as assigned clock rate) - this >> > is strictly source file change and we need it. >> > >> > Overall, rework would not be trivial and it would involve Sylwester. >> > I think it is better to stay with this as is. I will remember the policy >> > for future dependencies. >> >> The clk changes are already pulled into clk tree, we would get conflicts >> with commits that are already in the clock tree if the branch is reworked >> now. This might not be a big issue but bisection would be broken for sure. >> >> I'll also try to keep in future include/dt-bindings changes separate. > > Arnd, > > Any further comments? Are you going to pull it in? Sorry, I haven't had a chance to discuss with Olof how we want to proceed. I've pulled it into a next/late branch for now, which is similar to what we did in the past, and we may or may not send it after the other pull requests. There is one other platform that has a similar problem and I'll pull that in the same branch, while all the others have been able to rework their trees to avoid it for 4.11. Arnd
Hi, This includes clk-v4.11-samsung-dphy tag from Sylwester (clock) and a pinctrl header acked by Linus pinctrl header. The header goes through my tree but I provided a separate tag also for Linus. On top of previous pull request. Best regards, Krzysztof The following changes since commit 7547162ac351483df3641f64e99e10be329dd6a2: arm64: dts: exynos: Add clocks to Exynos5433 LPASS module (2017-01-26 22:04:20 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt64-4.11-3 for you to fetch changes up to 6629490aa027a8af3160e63cffcddc97c1602c96: arm64: dts: exynos: Add regulators for Vbus and Vbus-Boost (2017-02-02 19:54:05 +0200) ---------------------------------------------------------------- Samsung DeviceTree ARM64 update for v4.11, third round: 1. Add necessary initial configuration for clocks of display subsystem. Till now it worked mostly thanks to bootloader. 2. Use macro definitions instead of hard-coded values for pinctrl on Exynos7. 3. Enable USB 3.0 (DWC3) on Exynos7. ---------------------------------------------------------------- Krzysztof Kozlowski (2): Merge tag 'clk-v4.11-samsung-dphy' of git://linuxtv.org/snawrocki/samsung into next/dt64 Merge tag 'samsung-pinctrl-4.11' into next/dt64 Marek Szyprowski (3): clk: samsung: exynos5433: Add IDs for PHYCLK_MIPIDPHY0_* clocks clk: samsung: exynos5433: Add data for 250MHz and 278MHz PLL rates arm64: dts: exynos: Add initial configuration for DISP clocks for TM2/TM2e Pankaj Dubey (2): pinctrl: dt-bindings: samsung: Add Exynos7 specific pinctrl macro definitions arm64: dts: exynos: Use macros for pinctrl configuration on Exynos7 Vivek Gautam (2): arm64: dts: exynos: Add USB 3.0 controller node for Exynos7 arm64: dts: exynos: Add regulators for Vbus and Vbus-Boost .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 12 - arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 34 +++ arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 34 +++ arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 49 +++- arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 302 +++++++++++---------- arch/arm64/boot/dts/exynos/exynos7.dtsi | 34 +++ drivers/clk/samsung/clk-exynos5433.c | 8 +- include/dt-bindings/clock/exynos5433.h | 5 +- include/dt-bindings/pinctrl/samsung.h | 8 + 9 files changed, 319 insertions(+), 167 deletions(-)