Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: keystone-k2hk: Move keystone_dsp_gpio to under device-state-control

The keystone_irq node describes a device that is a member of the device
state control module address space. As such, it should not be a member
of soc0 bus but instead a sub-node of device-state-control.

This move also fixes warnings about not having a reg property. Now
that this is a sub-node of device-state-control, a syscon type node,
we add this reg property but relative to the syscon base, this way
when the dt-binding/driver are updated we can drop the non-standard
gpio,syscon-dev property completely and simply use get_resource() in
the driver.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>

authored by

Andrew F. Davis and committed by
Santosh Shilimkar
40ce21e2 80570ce8

+57 -47
+57 -47
arch/arm/boot/dts/keystone-k2hk.dtsi
··· 87 87 }; 88 88 }; 89 89 90 - dspgpio0: keystone_dsp_gpio@2620240 { 91 - compatible = "ti,keystone-dsp-gpio"; 92 - gpio-controller; 93 - #gpio-cells = <2>; 94 - gpio,syscon-dev = <&devctrl 0x240>; 95 - }; 90 + devctrl: device-state-control@2620000 { 91 + dspgpio0: keystone_dsp_gpio@240 { 92 + compatible = "ti,keystone-dsp-gpio"; 93 + reg = <0x240 0x4>; 94 + gpio-controller; 95 + #gpio-cells = <2>; 96 + gpio,syscon-dev = <&devctrl 0x240>; 97 + }; 96 98 97 - dspgpio1: keystone_dsp_gpio@2620244 { 98 - compatible = "ti,keystone-dsp-gpio"; 99 - gpio-controller; 100 - #gpio-cells = <2>; 101 - gpio,syscon-dev = <&devctrl 0x244>; 102 - }; 99 + dspgpio1: keystone_dsp_gpio@244 { 100 + compatible = "ti,keystone-dsp-gpio"; 101 + reg = <0x244 0x4>; 102 + gpio-controller; 103 + #gpio-cells = <2>; 104 + gpio,syscon-dev = <&devctrl 0x244>; 105 + }; 103 106 104 - dspgpio2: keystone_dsp_gpio@2620248 { 105 - compatible = "ti,keystone-dsp-gpio"; 106 - gpio-controller; 107 - #gpio-cells = <2>; 108 - gpio,syscon-dev = <&devctrl 0x248>; 109 - }; 107 + dspgpio2: keystone_dsp_gpio@248 { 108 + compatible = "ti,keystone-dsp-gpio"; 109 + reg = <0x248 0x4>; 110 + gpio-controller; 111 + #gpio-cells = <2>; 112 + gpio,syscon-dev = <&devctrl 0x248>; 113 + }; 110 114 111 - dspgpio3: keystone_dsp_gpio@262024c { 112 - compatible = "ti,keystone-dsp-gpio"; 113 - gpio-controller; 114 - #gpio-cells = <2>; 115 - gpio,syscon-dev = <&devctrl 0x24c>; 116 - }; 115 + dspgpio3: keystone_dsp_gpio@24c { 116 + compatible = "ti,keystone-dsp-gpio"; 117 + reg = <0x24c 0x4>; 118 + gpio-controller; 119 + #gpio-cells = <2>; 120 + gpio,syscon-dev = <&devctrl 0x24c>; 121 + }; 117 122 118 - dspgpio4: keystone_dsp_gpio@2620250 { 119 - compatible = "ti,keystone-dsp-gpio"; 120 - gpio-controller; 121 - #gpio-cells = <2>; 122 - gpio,syscon-dev = <&devctrl 0x250>; 123 - }; 123 + dspgpio4: keystone_dsp_gpio@250 { 124 + compatible = "ti,keystone-dsp-gpio"; 125 + reg = <0x250 0x4>; 126 + gpio-controller; 127 + #gpio-cells = <2>; 128 + gpio,syscon-dev = <&devctrl 0x250>; 129 + }; 124 130 125 - dspgpio5: keystone_dsp_gpio@2620254 { 126 - compatible = "ti,keystone-dsp-gpio"; 127 - gpio-controller; 128 - #gpio-cells = <2>; 129 - gpio,syscon-dev = <&devctrl 0x254>; 130 - }; 131 + dspgpio5: keystone_dsp_gpio@254 { 132 + compatible = "ti,keystone-dsp-gpio"; 133 + reg = <0x254 0x4>; 134 + gpio-controller; 135 + #gpio-cells = <2>; 136 + gpio,syscon-dev = <&devctrl 0x254>; 137 + }; 131 138 132 - dspgpio6: keystone_dsp_gpio@2620258 { 133 - compatible = "ti,keystone-dsp-gpio"; 134 - gpio-controller; 135 - #gpio-cells = <2>; 136 - gpio,syscon-dev = <&devctrl 0x258>; 137 - }; 139 + dspgpio6: keystone_dsp_gpio@258 { 140 + compatible = "ti,keystone-dsp-gpio"; 141 + reg = <0x258 0x4>; 142 + gpio-controller; 143 + #gpio-cells = <2>; 144 + gpio,syscon-dev = <&devctrl 0x258>; 145 + }; 138 146 139 - dspgpio7: keystone_dsp_gpio@262025c { 140 - compatible = "ti,keystone-dsp-gpio"; 141 - gpio-controller; 142 - #gpio-cells = <2>; 143 - gpio,syscon-dev = <&devctrl 0x25c>; 147 + dspgpio7: keystone_dsp_gpio@25c { 148 + compatible = "ti,keystone-dsp-gpio"; 149 + reg = <0x25c 0x4>; 150 + gpio-controller; 151 + #gpio-cells = <2>; 152 + gpio,syscon-dev = <&devctrl 0x25c>; 153 + }; 144 154 }; 145 155 146 156 dsp0: dsp@10800000 {