ST-Ericsson Device Tree patches
This is the previous pull request with a couple of patches appended:
The following changes since commit 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64:
Linux 3.7-rc3 (2012-10-28 12:24:48 -0700)
are available in the git repository at:
git://git.linaro.org/people/ljones/linux-3.0-ux500.git ste-dt-for-next
for you to fetch changes up to cece5c4009355323c6f453ef6814e7dd85a0f896:
ARM: ux500: Describe UART platform registering issues more accurately (2012-11-20 16:10:47 +0000)
----------------------------------------------------------------
Lee Jones (38):
ARM: ux500: Move regulator-name properties out to board DTS files
ARM: ux500: Fix initialisation order for UIBs
ARM: ux500: Elaborate on SDI device node names in Device Tree
ARM: ux500: Add SDI (MMC) support to the HREF Device Tree
ARM: ux500: Correct Snowball's external SD/MMC slot's bus width
ARM: ux500: Create a DTS hierarchy for ST-Ericsson's HREF boards
ARM: ux500: Create a Device Tree for early HREFs
ARM: ux500: Add support for gpio-keys and Proximity Sensor for HREF
ARM: ux500: Remove platform specific device registration when DT is enabled
ARM: ux500: Move all Device Tree booting into cpu-db8500
ARM: ux500: Strip out duplicate touch screen platform information
Documentation: Detail permitted DT properties for the BU21013 Touch Screen
ARM: ux500: Create a new Device Tree include file for boards supporting STUIBs
ARM: ux500: Stop calling the UIB init function when using Device Tree
ARM: ux500: Add all bu21013 touch screen components to supported Device Trees
ARM: ux500: Stop informing the regulator subsystem that we have full constraints
ARM: ux500: Apply a Device Tree node for the STMPE MFD
ARM: ux500: Supply the STMPE keypad Device Tree node to the STUIB DT
ARM: ux500: Remove unused board compatible string
ARM: ux500: Add skeleton DTS file for the u9540
ARM: ux500: Add support for ST-Ericsson's u9540 SoC
ARM: ux500: Add UART support to the u9540 Device Tree
ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree
ARM: ux500: Enable all MMC devices on the u9540 when booting with DT
ARM: ux500: Rename references to the ccu9540 dev board accordingly
ARM: ux500: Remove duplicate DT_MACHINE_START - make u8500 for generic
ARM: ux500: List DT compatibility using platform names rather than by board
ARM: ux500: Add node for the MMC GPIO regulator
ARM: ux500: Change the type of interrupt to something compatible
ARM: ux500: CONFIG: Enable GPIO Regulators
ARM: ux500: Convert DT_MACHINE_START to use SMP operations
ARM: ux500: Move regulator-name properties out to board DTS files
ARM: ux500: Add SDI (MMC) support to the HREF Device Tree
ARM: ux500: Add skeleton DTS file for the u9540
ARM: ux500: Add UART support to the u9540 Device Tree
ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree
ARM: ux500: Enable all MMC devices on the u9540 when booting with DT
ARM: ux500: Describe UART platform registering issues more accurately
.../bindings/input/touchscreen/bu21013.txt | 28 ++ arch/arm/boot/dts/ccu9540.dts | 72 ++++++ arch/arm/boot/dts/dbx5x0.dtsi | 57 ++-- arch/arm/boot/dts/href.dtsi | 273 ++++++++++++++++++++ arch/arm/boot/dts/hrefprev60.dts | 41 +++ arch/arm/boot/dts/hrefv60plus.dts | 217 ++++++++++++---- arch/arm/boot/dts/snowball.dts | 140 +++++++++- arch/arm/boot/dts/stuib.dtsi | 78 ++++++ arch/arm/boot/dts/u9540.dts | 72 ++++++ arch/arm/configs/u8500_defconfig | 1 + arch/arm/mach-ux500/board-mop500-stuib.c | 22 +- arch/arm/mach-ux500/board-mop500.c | 146 +---------- arch/arm/mach-ux500/board-mop500.h | 8 +- arch/arm/mach-ux500/cpu-db8500.c | 107 +++++++- arch/arm/mach-ux500/cpu.c | 3 + 15 files changed, 1005 insertions(+), 260 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/touchscreen/bu21013.txt create mode 100644 arch/arm/boot/dts/ccu9540.dts create mode 100644 arch/arm/boot/dts/href.dtsi create mode 100644 arch/arm/boot/dts/hrefprev60.dts create mode 100644 arch/arm/boot/dts/stuib.dtsi create mode 100644 arch/arm/boot/dts/u9540.dts
Signature · 4 lines
Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Quoted 9 lines · Lee Jones
This is the previous pull request with a couple of patches appended:
The following changes since commit
8f0d8163b50e01f398b14bcd4dc039ac5ab18d64:Linux 3.7-rc3 (2012-10-28 12:24:48 -0700)
are available in the git repository at:
git://git.linaro.org/people/ljones/linux-3.0-ux500.gitste-dt-for-next
Pulled in as new head of ux500/dt and merged into next/dt. Thanks!
-Olof
Arnd, Olof,
The previous pull request had some duplicate patches in, which have now been removed. Please remove the previous branch and replace it with this one.
Kind regards,
Lee
-------------------------------------------------------------------------
The following changes since commit 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64:
Linux 3.7-rc3 (2012-10-28 12:24:48 -0700)
are available in the git repository at:
git://git.linaro.org/people/ljones/linux-3.0-ux500.git ste-dt-for-next
for you to fetch changes up to ad4281e33c0e8420eb53bc8966e14a726af63e3e:
ARM: dts: add missing ux500 device trees (2012-11-26 15:49:02 +0000)
----------------------------------------------------------------
Fabio Baltieri (1):
ARM: dts: add missing ux500 device trees
Lee Jones (35):
ARM: ux500: Move regulator-name properties out to board DTS files
ARM: ux500: Fix initialisation order for UIBs
ARM: ux500: Elaborate on SDI device node names in Device Tree
ARM: ux500: Add SDI (MMC) support to the HREF Device Tree
ARM: ux500: Correct Snowball's external SD/MMC slot's bus width
ARM: ux500: Create a DTS hierarchy for ST-Ericsson's HREF boards
ARM: ux500: Create a Device Tree for early HREFs
ARM: ux500: Add support for gpio-keys and Proximity Sensor for HREF
ARM: ux500: Remove platform specific device registration when DT is enabled
ARM: ux500: Move all Device Tree booting into cpu-db8500
ARM: ux500: Strip out duplicate touch screen platform information
Documentation: Detail permitted DT properties for the BU21013 Touch Screen
ARM: ux500: Create a new Device Tree include file for boards supporting STUIBs
ARM: ux500: Stop calling the UIB init function when using Device Tree
ARM: ux500: Add all bu21013 touch screen components to supported Device Trees
ARM: ux500: Stop informing the regulator subsystem that we have full constraints
ARM: ux500: Apply a Device Tree node for the STMPE MFD
ARM: ux500: Supply the STMPE keypad Device Tree node to the STUIB DT
ARM: ux500: Remove unused board compatible string
ARM: ux500: Add skeleton DTS file for the u9540
ARM: ux500: Add support for ST-Ericsson's u9540 SoC
ARM: ux500: Add UART support to the u9540 Device Tree
ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree
ARM: ux500: Enable all MMC devices on the u9540 when booting with DT
ARM: ux500: Rename references to the ccu9540 dev board accordingly
ARM: ux500: Remove duplicate DT_MACHINE_START - make u8500 for generic
ARM: ux500: List DT compatibility using platform names rather than by board
ARM: ux500: Add node for the MMC GPIO regulator
ARM: ux500: Change the type of interrupt to something compatible
ARM: ux500: CONFIG: Enable GPIO Regulators
ARM: ux500: Convert DT_MACHINE_START to use SMP operations
ARM: ux500: Describe UART platform registering issues more accurately
ARM: ux500: Disable the MMCI gpio-regulator by default
ARM: ux500: Move board specific GPIO info out to subordinate DTS files
ARM: ux500: Stop registering the PCM driver from platform code
.../bindings/input/touchscreen/bu21013.txt | 28 ++ arch/arm/boot/dts/Makefile | 5 +- arch/arm/boot/dts/ccu9540.dts | 72 ++++++ arch/arm/boot/dts/dbx5x0.dtsi | 57 ++-- arch/arm/boot/dts/href.dtsi | 273 ++++++++++++++++++++ arch/arm/boot/dts/hrefprev60.dts | 48 ++++ arch/arm/boot/dts/hrefv60plus.dts | 83 +----- arch/arm/boot/dts/snowball.dts | 140 +++++++++- arch/arm/boot/dts/stuib.dtsi | 78 ++++++ arch/arm/configs/u8500_defconfig | 1 + arch/arm/mach-ux500/board-mop500-audio.c | 16 -- arch/arm/mach-ux500/board-mop500-stuib.c | 22 +- arch/arm/mach-ux500/board-mop500.c | 146 +---------- arch/arm/mach-ux500/board-mop500.h | 10 +- arch/arm/mach-ux500/cpu-db8500.c | 107 +++++++- arch/arm/mach-ux500/cpu.c | 3 + 16 files changed, 789 insertions(+), 300 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/touchscreen/bu21013.txt create mode 100644 arch/arm/boot/dts/ccu9540.dts create mode 100644 arch/arm/boot/dts/href.dtsi create mode 100644 arch/arm/boot/dts/hrefprev60.dts create mode 100644 arch/arm/boot/dts/stuib.dtsi
Signature · 4 lines
Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Quoted 5 lines · Lee Jones
Arnd, Olof,
The previous pull request had some duplicate patches in, which have now been removed. Please remove the previous branch and replace it with this one.
Hi Lee,
There are quite a number of patches that got merged into next/dt after your series. If there are just a few duplicate patches, I would prefer to leave it there rather than replace and redo the merges on top, which has the potential of creating other history confusion if someone based another branch on top of next/dt without telling us.
If you still think we should replace that branch, please be more specific about what patches are affected.
Arnd
Quoted 7 lines · Arnd Bergmann
Quoted 5 lines · Lee Jones
Arnd, Olof,
The previous pull request had some duplicate patches in, which have now been removed. Please remove the previous branch and replace it with this one.
Quoted 7 lines
Hi Lee,
There are quite a number of patches that got merged into next/dt after your series. If there are just a few duplicate patches, I would prefer to leave it there rather than replace and redo the merges on top, which has the potential of creating other history confusion if someone based another branch on top of next/dt without telling us.
I'll give you the information and leave the decision up to you.
Quoted 2 lines
If you still think we should replace that branch, please be more specific about what patches are affected.
/* Patches that appear twice */
$ git log --format=%s v3.7-rc3..arm-soc/ux500/dt | sort | uniq -c | sort -r 2 ARM: ux500: Move regulator-name properties out to board DTS files 2 ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree 2 ARM: ux500: Enable all MMC devices on the u9540 when booting with DT 2 ARM: ux500: Add UART support to the u9540 Device Tree 2 ARM: ux500: Add skeleton DTS file for the u9540 2 ARM: ux500: Add SDI (MMC) support to the HREF Device Tree <snip>
Instead of cocking up your tree, would you like me to send another pull- request containing reverts for the second appearance of these patches?
Signature · 4 lines
Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
The following changes since commit 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64:
Linux 3.7-rc3 (2012-10-28 12:24:48 -0700)
are available in the git repository at:
git://git.linaro.org/people/ljones/linux-3.0-ux500.git ste-dt-for-next
for you to fetch changes up to e13316d60658aee7987b51025f342649baa33487:
ARM: ux500: Rename dbx500 cpufreq code to be more generic (2012-11-27 10:58:57 +0000)
----------------------------------------------------------------
Fabio Baltieri (1):
ARM: dts: add missing ux500 device trees
Lee Jones (42):
ARM: ux500: Move regulator-name properties out to board DTS files
ARM: ux500: Fix initialisation order for UIBs
ARM: ux500: Elaborate on SDI device node names in Device Tree
ARM: ux500: Add SDI (MMC) support to the HREF Device Tree
ARM: ux500: Correct Snowball's external SD/MMC slot's bus width
ARM: ux500: Create a DTS hierarchy for ST-Ericsson's HREF boards
ARM: ux500: Create a Device Tree for early HREFs
ARM: ux500: Add support for gpio-keys and Proximity Sensor for HREF
ARM: ux500: Remove platform specific device registration when DT is enabled
ARM: ux500: Move all Device Tree booting into cpu-db8500
ARM: ux500: Strip out duplicate touch screen platform information
Documentation: Detail permitted DT properties for the BU21013 Touch Screen
ARM: ux500: Create a new Device Tree include file for boards supporting STUIBs
ARM: ux500: Stop calling the UIB init function when using Device Tree
ARM: ux500: Add all bu21013 touch screen components to supported Device Trees
ARM: ux500: Stop informing the regulator subsystem that we have full constraints
ARM: ux500: Apply a Device Tree node for the STMPE MFD
ARM: ux500: Supply the STMPE keypad Device Tree node to the STUIB DT
ARM: ux500: Remove unused board compatible string
ARM: ux500: Add skeleton DTS file for the u9540
ARM: ux500: Add support for ST-Ericsson's u9540 SoC
ARM: ux500: Add UART support to the u9540 Device Tree
ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree
ARM: ux500: Enable all MMC devices on the u9540 when booting with DT
ARM: ux500: Rename references to the ccu9540 dev board accordingly
ARM: ux500: Remove duplicate DT_MACHINE_START - make u8500 for generic
ARM: ux500: List DT compatibility using platform names rather than by board
ARM: ux500: Add node for the MMC GPIO regulator
ARM: ux500: Change the type of interrupt to something compatible
ARM: ux500: CONFIG: Enable GPIO Regulators
ARM: ux500: Convert DT_MACHINE_START to use SMP operations
ARM: ux500: Move regulator-name properties out to board DTS files
ARM: ux500: Add SDI (MMC) support to the HREF Device Tree
ARM: ux500: Add skeleton DTS file for the u9540
ARM: ux500: Add UART support to the u9540 Device Tree
ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree
ARM: ux500: Enable all MMC devices on the u9540 when booting with DT
ARM: ux500: Describe UART platform registering issues more accurately
ARM: ux500: Disable the MMCI gpio-regulator by default
ARM: ux500: Move board specific GPIO info out to subordinate DTS files
ARM: ux500: Stop registering the PCM driver from platform code
ARM: ux500: Rename dbx500 cpufreq code to be more generic
.../bindings/input/touchscreen/bu21013.txt | 28 ++ arch/arm/boot/dts/Makefile | 5 +- arch/arm/boot/dts/ccu9540.dts | 72 ++++++ arch/arm/boot/dts/dbx5x0.dtsi | 57 ++-- arch/arm/boot/dts/href.dtsi | 273 ++++++++++++++++++++ arch/arm/boot/dts/hrefprev60.dts | 48 ++++ arch/arm/boot/dts/hrefv60plus.dts | 217 ++++++++++++---- arch/arm/boot/dts/snowball.dts | 140 +++++++++- arch/arm/boot/dts/stuib.dtsi | 78 ++++++ arch/arm/boot/dts/u9540.dts | 72 ++++++ arch/arm/configs/u8500_defconfig | 1 + arch/arm/mach-ux500/board-mop500-audio.c | 16 -- arch/arm/mach-ux500/board-mop500-stuib.c | 22 +- arch/arm/mach-ux500/board-mop500.c | 146 +---------- arch/arm/mach-ux500/board-mop500.h | 10 +- arch/arm/mach-ux500/cpu-db8500.c | 111 +++++++- arch/arm/mach-ux500/cpu.c | 3 + 17 files changed, 1018 insertions(+), 281 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/touchscreen/bu21013.txt create mode 100644 arch/arm/boot/dts/ccu9540.dts create mode 100644 arch/arm/boot/dts/href.dtsi create mode 100644 arch/arm/boot/dts/hrefprev60.dts create mode 100644 arch/arm/boot/dts/stuib.dtsi create mode 100644 arch/arm/boot/dts/u9540.dts
Signature · 4 lines
Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Quoted 11 lines · Lee Jones
The following changes since commit
8f0d8163b50e01f398b14bcd4dc039ac5ab18d64:Linux 3.7-rc3 (2012-10-28 12:24:48 -0700)
are available in the git repository at:
git://git.linaro.org/people/ljones/linux-3.0-ux500.gitste-dt-for-nextfor you to fetch changes up to
e13316d60658aee7987b51025f342649baa33487:ARM: ux500: Rename dbx500 cpufreq code to be more generic (2012-11-27 10:58:57 +0000)
Pulled into next/dt and updated the ux500/dt branch to the latest head. Thanks!
Olof, just to clarify: there are 43 patches listed in the pull request, but there are actually just 5 patches that were not there before. As discussed with Lee on #linaro-kernel, this fixes a long-standing build error in for-next u8500_defconfig, but does not fix the problem of a couple of duplicate patch IDs that still have in the ux500/dt branch. I could not come up with a way that would actually improve the situation rather than introduce other problems.
Arnd